From: Xavier Claessens Date: Mon, 14 May 2007 14:03:11 +0000 (+0000) Subject: Add empathy icon stolen from cohoba. X-Git-Url: https://git.0d.be/?p=empathy.git;a=commitdiff_plain;h=3c081aef0881fd7d71dd327be0714a2346c454be Add empathy icon stolen from cohoba. 2006-05-14 Xavier Claessens * src/empathy-chat-main.c: * src/empathy-main.c: * configure.ac: * data/22x22/Makefile.am: * data/22x22/empathy.png: * data/48x48: * data/48x48/Makefile.am: * data/48x48/empathy.png: * data/32x32/Makefile.am: * data/32x32/empathy.png: * data/16x16/empathy.png: * data/16x16/Makefile.am: * data/scalable/empathy.svg: * data/scalable/Makefile.am: * data/Makefile.am: Add empathy icon stolen from cohoba. svn path=/trunk/; revision=63 --- diff --git a/ChangeLog b/ChangeLog index a032132e..357803d7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,21 @@ +2006-05-14 Xavier Claessens + + * src/empathy-chat-main.c: + * src/empathy-main.c: + * configure.ac: + * data/22x22/Makefile.am: + * data/22x22/empathy.png: + * data/48x48: + * data/48x48/Makefile.am: + * data/48x48/empathy.png: + * data/32x32/Makefile.am: + * data/32x32/empathy.png: + * data/16x16/empathy.png: + * data/16x16/Makefile.am: + * data/scalable/empathy.svg: + * data/scalable/Makefile.am: + * data/Makefile.am: Add empathy icon stolen from cohoba. + 2006-05-14 Xavier Claessens * src/empathy-chat-main.c: diff --git a/configure.ac b/configure.ac index 5667da1f..f301507a 100644 --- a/configure.ac +++ b/configure.ac @@ -88,6 +88,7 @@ AC_OUTPUT([ data/16x16/Makefile data/22x22/Makefile data/32x32/Makefile + data/48x48/Makefile data/scalable/Makefile po/Makefile.in libempathy/Makefile diff --git a/data/16x16/Makefile.am b/data/16x16/Makefile.am index b885d1c8..8d260618 100644 --- a/data/16x16/Makefile.am +++ b/data/16x16/Makefile.am @@ -1,5 +1,6 @@ icondir = $(datadir)/icons/hicolor/16x16/apps icon_DATA = \ + empathy.png \ empathy-available.png \ empathy-offline.png \ empathy-away.png \ diff --git a/data/16x16/empathy.png b/data/16x16/empathy.png new file mode 100644 index 00000000..3d400d8e Binary files /dev/null and b/data/16x16/empathy.png differ diff --git a/data/22x22/Makefile.am b/data/22x22/Makefile.am index 59242239..e552f6e5 100644 --- a/data/22x22/Makefile.am +++ b/data/22x22/Makefile.am @@ -1,5 +1,6 @@ icondir = $(datadir)/icons/hicolor/22x22/apps icon_DATA = \ + empathy.png \ empathy-proto-ekiga.png \ empathy-proto-google-talk.png \ empathy-proto-msn.png \ diff --git a/data/22x22/empathy.png b/data/22x22/empathy.png new file mode 100644 index 00000000..d3e89c91 Binary files /dev/null and b/data/22x22/empathy.png differ diff --git a/data/32x32/Makefile.am b/data/32x32/Makefile.am index 452abb03..1475e1ef 100644 --- a/data/32x32/Makefile.am +++ b/data/32x32/Makefile.am @@ -1,5 +1,6 @@ icondir = $(datadir)/icons/hicolor/32x32/apps icon_DATA = \ + empathy.png \ empathy-proto-ekiga.png \ empathy-proto-google-talk.png \ empathy-proto-msn.png \ diff --git a/data/32x32/empathy.png b/data/32x32/empathy.png new file mode 100644 index 00000000..9e29d7f4 Binary files /dev/null and b/data/32x32/empathy.png differ diff --git a/data/48x48/Makefile.am b/data/48x48/Makefile.am new file mode 100644 index 00000000..5c37938a --- /dev/null +++ b/data/48x48/Makefile.am @@ -0,0 +1,4 @@ +icondir = $(datadir)/icons/hicolor/48x48/apps +icon_DATA = \ + empathy.png +EXTRA_DIST = $(icon_DATA) diff --git a/data/48x48/empathy.png b/data/48x48/empathy.png new file mode 100644 index 00000000..753779a9 Binary files /dev/null and b/data/48x48/empathy.png differ diff --git a/data/Makefile.am b/data/Makefile.am index 0822f40e..093565c8 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS = 16x16 22x22 32x32 scalable +SUBDIRS = 16x16 22x22 32x32 48x48 scalable profiledir = $(datadir)/mission-control/profiles profile_DATA = \ diff --git a/data/scalable/Makefile.am b/data/scalable/Makefile.am index 3c535d04..6e144da5 100644 --- a/data/scalable/Makefile.am +++ b/data/scalable/Makefile.am @@ -1,5 +1,6 @@ icondir = $(datadir)/icons/hicolor/scalable/apps icon_DATA = \ + empathy.svg \ empathy-available.svg \ empathy-offline.svg \ empathy-away.svg \ diff --git a/data/scalable/empathy.svg b/data/scalable/empathy.svg new file mode 100755 index 00000000..875c0ef0 --- /dev/null +++ b/data/scalable/empathy.svg @@ -0,0 +1,261 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + diff --git a/src/empathy-chat-main.c b/src/empathy-chat-main.c index fedc9066..7750b0b3 100644 --- a/src/empathy-chat-main.c +++ b/src/empathy-chat-main.c @@ -185,6 +185,8 @@ main (int argc, char *argv[]) GNOME_PARAM_HUMAN_READABLE_NAME, PACKAGE_NAME, NULL); + gtk_window_set_default_icon_name ("empathy"); + if (g_getenv ("EMPATHY_DEBUG")) { debug_mode = TRUE; } diff --git a/src/empathy-main.c b/src/empathy-main.c index 0804fe81..a4961112 100644 --- a/src/empathy-main.c +++ b/src/empathy-main.c @@ -166,6 +166,8 @@ main (int argc, char *argv[]) GNOME_PARAM_HUMAN_READABLE_NAME, PACKAGE_NAME, NULL); + gtk_window_set_default_icon_name ("empathy"); + /* Setting up channel filter */ filter = empathy_filter_new (); g_signal_connect (filter, "new-channel",