[ekiga/ds-gtk-application] Pixmaps: Cleaned up the Ekiga icon.

[Damien Sandras <dsandras src gnome org>]

commit 528b061405ed301316a43d9b0526c7c71990ec74
Author: Damien Sandras <dsandras seconix com>
Date:   Mon Dec 15 18:06:38 2014 +0100

    Pixmaps: Cleaned up the Ekiga icon.

 lib/engine/gui/gtk-frontend/addressbook-window.cpp |    2 +-
 lib/engine/gui/gtk-frontend/call-window.cpp        |    2 +-
 lib/engine/gui/gtk-frontend/main_window.cpp        |    2 +-
 lib/engine/gui/gtk-frontend/preferences-window.cpp |    2 +-
 lib/gui/gmstockicons.c                             |    8 +----
 lib/gui/gmstockicons.h                             |    2 -
 .../ekiga.png => hicolor_apps_128x128_ekiga.png}   |  Bin 11034 -> 11034 bytes
 .../ekiga.png => hicolor_apps_16x16_ekiga.png}     |  Bin 882 -> 882 bytes
 .../ekiga.png => hicolor_apps_22x22_ekiga.png}     |  Bin 1407 -> 1407 bytes
 .../ekiga.png => hicolor_apps_24x24_ekiga.png}     |  Bin 1432 -> 1432 bytes
 .../ekiga.png => hicolor_apps_32x32_ekiga.png}     |  Bin 2178 -> 2178 bytes
 .../ekiga.png => hicolor_apps_48x48_ekiga.png}     |  Bin 3702 -> 3702 bytes
 .../ekiga.png => hicolor_apps_64x64_ekiga.png}     |  Bin 4989 -> 4989 bytes
 .../ekiga.png => hicolor_apps_72x72_ekiga.png}     |  Bin 4872 -> 4872 bytes
 pixmaps/Makefile.am                                |   35 +++++++++-----------
 15 files changed, 21 insertions(+), 32 deletions(-)
---
diff --git a/lib/engine/gui/gtk-frontend/addressbook-window.cpp 
b/lib/engine/gui/gtk-frontend/addressbook-window.cpp
index 6cdc170..1a310e4 100644
--- a/lib/engine/gui/gtk-frontend/addressbook-window.cpp
+++ b/lib/engine/gui/gtk-frontend/addressbook-window.cpp
@@ -760,7 +760,7 @@ addressbook_window_new (GmApplication *app)
   gtk_builder_add_from_string (self->priv->builder, win_menu, -1, NULL);
 
   gtk_window_set_position (GTK_WINDOW (self), GTK_WIN_POS_CENTER);
-  gtk_window_set_icon_name (GTK_WINDOW (self), GM_ICON_LOGO);
+  gtk_window_set_icon_name (GTK_WINDOW (self), PACKAGE_NAME);
 
   /* Accels */
   self->priv->accel = gtk_accel_group_new ();
diff --git a/lib/engine/gui/gtk-frontend/call-window.cpp b/lib/engine/gui/gtk-frontend/call-window.cpp
index 369706f..5444710 100644
--- a/lib/engine/gui/gtk-frontend/call-window.cpp
+++ b/lib/engine/gui/gtk-frontend/call-window.cpp
@@ -1509,7 +1509,7 @@ ekiga_call_window_init_gui (EkigaCallWindow *self)
   self->priv->call_panel_toolbar = gtk_header_bar_new ();
   gtk_header_bar_set_show_close_button (GTK_HEADER_BAR (self->priv->call_panel_toolbar), TRUE);
   gtk_window_set_titlebar (GTK_WINDOW (self), self->priv->call_panel_toolbar);
-  gtk_window_set_icon_name (GTK_WINDOW (self), GM_ICON_LOGO);
+  gtk_window_set_icon_name (GTK_WINDOW (self), PACKAGE_NAME);
   gtk_widget_show (self->priv->call_panel_toolbar);
 
   /* The info bar */
diff --git a/lib/engine/gui/gtk-frontend/main_window.cpp b/lib/engine/gui/gtk-frontend/main_window.cpp
index 8943218..8248da6 100644
--- a/lib/engine/gui/gtk-frontend/main_window.cpp
+++ b/lib/engine/gui/gtk-frontend/main_window.cpp
@@ -773,7 +773,7 @@ ekiga_main_window_init_gui (EkigaMainWindow *mw)
   GtkWidget *window_vbox;
   // FIXME ??? ekiga-settings.h
   gtk_window_set_title (GTK_WINDOW (mw), _("Ekiga Softphone"));
-  gtk_window_set_icon_name (GTK_WINDOW (mw), GM_ICON_LOGO);
+  gtk_window_set_icon_name (GTK_WINDOW (mw), PACKAGE_NAME);
 
   window_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
   gtk_container_add (GTK_CONTAINER (mw), window_vbox);
diff --git a/lib/engine/gui/gtk-frontend/preferences-window.cpp 
b/lib/engine/gui/gtk-frontend/preferences-window.cpp
index 85c464f..15c0ef4 100644
--- a/lib/engine/gui/gtk-frontend/preferences-window.cpp
+++ b/lib/engine/gui/gtk-frontend/preferences-window.cpp
@@ -1749,7 +1749,7 @@ preferences_window_new (GmApplication *app)
   gtk_header_bar_set_title (GTK_HEADER_BAR (headerbar), _("Preferences"));
   gtk_header_bar_set_subtitle (GTK_HEADER_BAR (headerbar), _("Edit your settings"));
   gtk_window_set_titlebar (GTK_WINDOW (self), headerbar);
-  gtk_window_set_icon_name (GTK_WINDOW (self), GM_ICON_LOGO);
+  gtk_window_set_icon_name (GTK_WINDOW (self), PACKAGE_NAME);
   gtk_widget_show (headerbar);
 
   box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
diff --git a/lib/gui/gmstockicons.c b/lib/gui/gmstockicons.c
index e4bcb42..7697681 100644
--- a/lib/gui/gmstockicons.c
+++ b/lib/gui/gmstockicons.c
@@ -63,13 +63,7 @@ gnomemeeting_stock_icons_init (void)
                { "im-message", 16, gm_im_message_16},
                { "im-message-new", 16, gm_im_message_new_16},
                { "whiteness", 16, gm_whiteness_16},
-               { "video-settings", 16, gm_video_settings_16 },
-               { GM_ICON_LOGO, 16, gm_logo_16_stock_data },
-               { GM_ICON_LOGO, 22, gm_logo_22_stock_data },
-               { GM_ICON_LOGO, 32, gm_logo_32_stock_data },
-               { GM_ICON_LOGO, 48, gm_logo_48_stock_data },
-               { GM_ICON_LOGO, 72, gm_logo_72_stock_data },
-               { "user-inacall", 16, gm_user_inacall_16 },
+               { "video-settings", 16, gm_video_settings_16 }
 
        };
 
diff --git a/lib/gui/gmstockicons.h b/lib/gui/gmstockicons.h
index 6749f23..ee10726 100644
--- a/lib/gui/gmstockicons.h
+++ b/lib/gui/gmstockicons.h
@@ -40,8 +40,6 @@
 G_BEGIN_DECLS
 
 /* Icon theme builtins */
-#define GM_ICON_LOGO                       PACKAGE_NAME
-
 void gnomemeeting_stock_icons_init (void);
 
 G_END_DECLS
diff --git a/pixmaps/Makefile.am b/pixmaps/Makefile.am
index 80793cc..ef60aca 100644
--- a/pixmaps/Makefile.am
+++ b/pixmaps/Makefile.am
@@ -4,24 +4,21 @@ pixmapdir = $(datadir)/pixmaps/@PACKAGE_NAME@
 pixmap_DATA = @PACKAGE_NAME -logo png 256x256/@PACKAGE_NAME -full-icon png
 
 theme_icons = \
-       gnome_actions_scalable_call-hold-symbolic.svg \
-       gnome_actions_scalable_call-transfer-symbolic.svg \
-       gnome_actions_scalable_call-transfer-symbolic-rtl.svg \
-        gnome_actions_16x16_phone-hang-up.png \
-        gnome_actions_16x16_phone-pick-up.png \
-        gnome_actions_24x24_phone-hang-up.png \
-        gnome_actions_24x24_phone-pick-up.png
-
-nobase_dist_icon_DATA = \
-       16x16/apps/@PACKAGE_NAME  png \
-       22x22/apps/@PACKAGE_NAME  png \
-       24x24/apps/@PACKAGE_NAME  png \
-       32x32/apps/@PACKAGE_NAME  png \
-       48x48/apps/@PACKAGE_NAME  png \
-       64x64/apps/@PACKAGE_NAME  png \
-       72x72/apps/@PACKAGE_NAME  png \
-       128x128/apps/@PACKAGE_NAME  png
-
+       gnome_actions_scalable_call-hold-symbolic.svg           \
+       gnome_actions_scalable_call-transfer-symbolic.svg       \
+       gnome_actions_scalable_call-transfer-symbolic-rtl.svg   \
+        gnome_actions_16x16_phone-hang-up.png                   \
+        gnome_actions_16x16_phone-pick-up.png                   \
+        gnome_actions_24x24_phone-hang-up.png                   \
+        gnome_actions_24x24_phone-pick-up.png                   \
+        hicolor_apps_16x16_ekiga.png                            \
+        hicolor_apps_22x22_ekiga.png                            \
+        hicolor_apps_24x24_ekiga.png                            \
+        hicolor_apps_32x32_ekiga.png                            \
+        hicolor_apps_48x48_ekiga.png                            \
+        hicolor_apps_64x64_ekiga.png                            \
+        hicolor_apps_72x72_ekiga.png                            \
+        hicolor_apps_128x128_ekiga.png
 
 DIST_IMAGES_FILES= \
        scalable/call-hold-symbolic.svg \
@@ -89,7 +86,7 @@ DISTCLEANFILES = inlines.h
 
 EXTRA_DIST= $(DIST_IMAGES_FILES) $(IMAGES_FILES) $(theme_icons)
 
-inlines.h: $(IMAGE_FILES) $(nobase_dist_icon_DATA) Makefile.am
+inlines.h: $(IMAGE_FILES) Makefile.am
        gdk-pixbuf-csource --raw --build-list $(IMAGES) > inlines.h
 
 install-data-hook: install-icons update-icon-cache