GNOME.org
 

[ekiga/ds-gtk-application] Pixmaps: More cleanups.

commit 2d01f78ae6c3d22eec1f9ffdeb7b4404cd068a87
Author: Damien Sandras <dsandras seconix com>
Date:   Mon Dec 15 18:35:41 2014 +0100

    Pixmaps: More cleanups.
    
    Unused files were removed. Used files were converted into "theme" icons.
    Useless gmstockicons.h file has been removed.

 lib/Makefile.am                                    |    2 -
 lib/engine/gui/gtk-core/gtk-core.cpp               |    3 -
 lib/engine/gui/gtk-frontend/addressbook-window.cpp |    1 -
 lib/engine/gui/gtk-frontend/call-window.cpp        |    1 -
 lib/engine/gui/gtk-frontend/ekiga-app.cpp          |    1 -
 lib/engine/gui/gtk-frontend/main_window.cpp        |    1 -
 lib/engine/gui/gtk-frontend/preferences-window.cpp |    1 -
 lib/engine/gui/gtk-frontend/statusicon.cpp         |    2 -
 lib/gui/gmstockicons.c                             |   83 --
 lib/gui/gmstockicons.h                             |   47 -
 pixmaps/128x128/multimedia-headset.png             |  Bin 12120 -> 0 bytes
 pixmaps/128x128/multimedia-headset.svg             | 1412 --------------------
 pixmaps/16x16/audio-volume.png                     |  Bin 685 -> 0 bytes
 pixmaps/16x16/brightness.png                       |  Bin 356 -> 0 bytes
 pixmaps/16x16/color.png                            |  Bin 577 -> 0 bytes
 pixmaps/16x16/contrast.png                         |  Bin 625 -> 0 bytes
 pixmaps/16x16/im-message-new.png                   |  Bin 693 -> 0 bytes
 pixmaps/16x16/multimedia-headset.png               |  Bin 816 -> 0 bytes
 pixmaps/16x16/multimedia-headset.svg               |  345 -----
 pixmaps/16x16/video-settings.png                   |  Bin 920 -> 0 bytes
 pixmaps/16x16/whiteness.png                        |  Bin 358 -> 0 bytes
 pixmaps/22x22/multimedia-headset.png               |  Bin 1219 -> 0 bytes
 pixmaps/22x22/multimedia-headset.svg               |  407 ------
 pixmaps/256x256/multimedia-headset.png             |  Bin 31534 -> 0 bytes
 pixmaps/32x32/multimedia-headset.png               |  Bin 1884 -> 0 bytes
 pixmaps/32x32/multimedia-headset.svg               |  632 ---------
 pixmaps/48x48/multimedia-headset.png               |  Bin 3354 -> 0 bytes
 pixmaps/HOWTO                                      |   11 -
 pixmaps/Makefile.am                                |   76 +-
 pixmaps/{256x256 => }/ekiga-full-icon.png          |  Bin 28340 -> 28340 bytes
 .../gnome_actions_16x16_phone-hang-up.png          |  Bin 605 -> 605 bytes
 .../gnome_actions_16x16_phone-pick-up.png          |  Bin 695 -> 695 bytes
 .../gnome_actions_24x24_phone-hang-up.png          |  Bin 1149 -> 1149 bytes
 .../gnome_actions_24x24_phone-pick-up.png          |  Bin 1215 -> 1215 bytes
 .../gnome_actions_scalable_call-hold-symbolic.svg  |    0
 ...actions_scalable_call-transfer-symbolic-rtl.svg |    0
 ...ome_actions_scalable_call-transfer-symbolic.svg |    0
 ...ssage.png => gnome_status_16x16-im-message.png} |  Bin 510 -> 510 bytes
 ...all.png => gnome_status_16x16_user-inacall.png} |  Bin 676 -> 676 bytes
 .../{128x128 => }/hicolor_apps_128x128_ekiga.png   |  Bin 11034 -> 11034 bytes
 pixmaps/{16x16 => }/hicolor_apps_16x16_ekiga.png   |  Bin 882 -> 882 bytes
 pixmaps/{22x22 => }/hicolor_apps_22x22_ekiga.png   |  Bin 1407 -> 1407 bytes
 pixmaps/{24x24 => }/hicolor_apps_24x24_ekiga.png   |  Bin 1432 -> 1432 bytes
 pixmaps/{32x32 => }/hicolor_apps_32x32_ekiga.png   |  Bin 2178 -> 2178 bytes
 pixmaps/{48x48 => }/hicolor_apps_48x48_ekiga.png   |  Bin 3702 -> 3702 bytes
 pixmaps/{64x64 => }/hicolor_apps_64x64_ekiga.png   |  Bin 4989 -> 4989 bytes
 pixmaps/{72x72 => }/hicolor_apps_72x72_ekiga.png   |  Bin 4872 -> 4872 bytes
 pixmaps/scalable/multimedia-headset.svg            |  667 ---------
 48 files changed, 5 insertions(+), 3687 deletions(-)
---
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 7e10ba7..72f657b 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -127,8 +127,6 @@ libekiga_la_SOURCES += \
        gui/gm-info-bar.c \
        gui/gmwindow.c \
        gui/gmwindow.h \
-       gui/gmstockicons.c \
-       gui/gmstockicons.h \
        gui/gm-cell-renderer-expander.c \
        gui/gm-cell-renderer-expander.h \
        gui/gm-cell-renderer-bitext.c \
diff --git a/lib/engine/gui/gtk-core/gtk-core.cpp b/lib/engine/gui/gtk-core/gtk-core.cpp
index dae9f55..76bac45 100644
--- a/lib/engine/gui/gtk-core/gtk-core.cpp
+++ b/lib/engine/gui/gtk-core/gtk-core.cpp
@@ -33,11 +33,8 @@
  *
  */
 
-#include "gmstockicons.h"
-
 #include "gtk-core.h"
 
 Gtk::Core::Core ()
 {
-  gnomemeeting_stock_icons_init ();
 }
diff --git a/lib/engine/gui/gtk-frontend/addressbook-window.cpp 
b/lib/engine/gui/gtk-frontend/addressbook-window.cpp
index 1a310e4..00a6492 100644
--- a/lib/engine/gui/gtk-frontend/addressbook-window.cpp
+++ b/lib/engine/gui/gtk-frontend/addressbook-window.cpp
@@ -36,7 +36,6 @@
 #include <ptlib.h>
 
 #include "ekiga-settings.h"
-#include "gmstockicons.h"
 
 #include "addressbook-window.h"
 #include "book-view-gtk.h"
diff --git a/lib/engine/gui/gtk-frontend/call-window.cpp b/lib/engine/gui/gtk-frontend/call-window.cpp
index 24c151a..8c99f41 100644
--- a/lib/engine/gui/gtk-frontend/call-window.cpp
+++ b/lib/engine/gui/gtk-frontend/call-window.cpp
@@ -49,7 +49,6 @@
 #include "dialpad.h"
 
 #include "gmvideowidget.h"
-#include "gmstockicons.h"
 #include "gm-info-bar.h"
 #include "gactor-menu.h"
 #include "trigger.h"
diff --git a/lib/engine/gui/gtk-frontend/ekiga-app.cpp b/lib/engine/gui/gtk-frontend/ekiga-app.cpp
index 7fcec74..36cddc9 100644
--- a/lib/engine/gui/gtk-frontend/ekiga-app.cpp
+++ b/lib/engine/gui/gtk-frontend/ekiga-app.cpp
@@ -44,7 +44,6 @@
 #include "trigger.h"
 #include "form-dialog-gtk.h"
 #include "ekiga-app.h"
-#include "gmstockicons.h"
 #include "account-core.h"
 #include "chat-core.h"
 #include "contact-core.h"
diff --git a/lib/engine/gui/gtk-frontend/main_window.cpp b/lib/engine/gui/gtk-frontend/main_window.cpp
index 8248da6..9d6813e 100644
--- a/lib/engine/gui/gtk-frontend/main_window.cpp
+++ b/lib/engine/gui/gtk-frontend/main_window.cpp
@@ -45,7 +45,6 @@
 #include "statusmenu.h"
 #include "gm-entry.h"
 
-#include "gmstockicons.h"
 #include "menu-builder-tools.h"
 #include "menu-builder-gtk.h"
 #include "gm-info-bar.h"
diff --git a/lib/engine/gui/gtk-frontend/preferences-window.cpp 
b/lib/engine/gui/gtk-frontend/preferences-window.cpp
index 15c0ef4..17be036 100644
--- a/lib/engine/gui/gtk-frontend/preferences-window.cpp
+++ b/lib/engine/gui/gtk-frontend/preferences-window.cpp
@@ -42,7 +42,6 @@
 #include <glib/gi18n.h>
 #include <boost/tuple/tuple.hpp>
 
-#include "gmstockicons.h"
 #include "ekiga-settings.h"
 
 #include "preferences-window.h"
diff --git a/lib/engine/gui/gtk-frontend/statusicon.cpp b/lib/engine/gui/gtk-frontend/statusicon.cpp
index 096a92b..af32431 100644
--- a/lib/engine/gui/gtk-frontend/statusicon.cpp
+++ b/lib/engine/gui/gtk-frontend/statusicon.cpp
@@ -40,8 +40,6 @@
 
 #include "statusicon.h"
 
-#include "gmstockicons.h"
-
 #include "services.h"
 #include "ekiga-app.h"
 #include "call-core.h"
diff --git a/pixmaps/Makefile.am b/pixmaps/Makefile.am
index ef60aca..cc18608 100644
--- a/pixmaps/Makefile.am
+++ b/pixmaps/Makefile.am
@@ -1,7 +1,7 @@
 icondir = $(datadir)/icons/gnome
 pixmapdir = $(datadir)/pixmaps/@PACKAGE_NAME@
 
-pixmap_DATA = @PACKAGE_NAME -logo png 256x256/@PACKAGE_NAME -full-icon png
+more_icons = @PACKAGE_NAME -logo png 256x256/@PACKAGE_NAME -full-icon png
 
 theme_icons = \
        gnome_actions_scalable_call-hold-symbolic.svg           \
@@ -11,6 +11,8 @@ theme_icons = \
         gnome_actions_16x16_phone-pick-up.png                   \
         gnome_actions_24x24_phone-hang-up.png                   \
         gnome_actions_24x24_phone-pick-up.png                   \
+        gnome_status_16x16-im-message.png                       \
+        gnome_status_16x16_user-inacall.png                     \
         hicolor_apps_16x16_ekiga.png                            \
         hicolor_apps_22x22_ekiga.png                            \
         hicolor_apps_24x24_ekiga.png                            \
@@ -20,74 +22,7 @@ theme_icons = \
         hicolor_apps_72x72_ekiga.png                            \
         hicolor_apps_128x128_ekiga.png
 
-DIST_IMAGES_FILES= \
-       scalable/call-hold-symbolic.svg \
-       scalable/call-transfer-symbolic.svg \
-       scalable/call-transfer-symbolic-rtl.svg \
-       16x16/phone-hang-up.png \
-       16x16/phone-pick-up.png \
-       24x24/phone-hang-up.png \
-       24x24/phone-pick-up.png
-
-IMAGES_FILES= \
-       48x48/multimedia-headset.png \
-       22x22/multimedia-headset.png \
-       22x22/multimedia-headset.svg \
-       128x128/multimedia-headset.png \
-       128x128/multimedia-headset.svg \
-       16x16/multimedia-headset.png \
-       16x16/multimedia-headset.svg \
-       scalable/multimedia-headset.svg \
-       32x32/multimedia-headset.png \
-       32x32/multimedia-headset.svg \
-       256x256/multimedia-headset.png \
-       256x256/ekiga-full-icon.png \
-       16x16/audio-volume.png \
-       16x16/brightness.png \
-       16x16/color.png \
-       16x16/contrast.png \
-       16x16/im-message.png \
-       16x16/im-message-new.png \
-       16x16/user-inacall.png \
-       16x16/video-settings.png \
-       16x16/whiteness.png \
-       ekiga-logo.png \
-       scalable/call-hold-symbolic.svg \
-       scalable/call-transfer-symbolic.svg \
-       gm_powermeter_default_00.xpm \
-       gm_powermeter_default_01.xpm \
-       gm_powermeter_default_02.xpm \
-       gm_powermeter_default_03.xpm \
-       gm_powermeter_default_04.xpm \
-       icon.h
-
-
-IMAGES= \
-       gm_audio_volume_16 $(srcdir)/16x16/audio-volume.png \
-       gm_brightness_16 $(srcdir)/16x16/brightness.png \
-       gm_color_16 $(srcdir)/16x16/color.png \
-       gm_contrast_16 $(srcdir)/16x16/contrast.png \
-       gm_im_message_16 $(srcdir)/16x16/im-message.png \
-       gm_im_message_new_16 $(srcdir)/16x16/im-message-new.png \
-       gm_video_settings_16 $(srcdir)/16x16/video-settings.png \
-       gm_whiteness_16 $(srcdir)/16x16/whiteness.png \
-       gm_logo_16_stock_data $(srcdir)/16x16/apps/@PACKAGE_NAME  png \
-       gm_logo_22_stock_data $(srcdir)/22x22/apps/@PACKAGE_NAME  png \
-       gm_logo_24_stock_data $(srcdir)/24x24/apps/@PACKAGE_NAME  png \
-       gm_logo_32_stock_data $(srcdir)/32x32/apps/@PACKAGE_NAME  png \
-       gm_logo_48_stock_data $(srcdir)/48x48/apps/@PACKAGE_NAME  png \
-       gm_logo_72_stock_data $(srcdir)/72x72/apps/@PACKAGE_NAME  png \
-       gm_user_inacall_16 $(srcdir)/16x16/user-inacall.png
-
-
-noinst_DATA = inlines.h
-
-DISTCLEANFILES = inlines.h
-
-EXTRA_DIST= $(DIST_IMAGES_FILES) $(IMAGES_FILES) $(theme_icons)
-
-inlines.h: $(IMAGE_FILES) Makefile.am
-       gdk-pixbuf-csource --raw --build-list $(IMAGES) > inlines.h
+EXTRA_DIST= $(more_icons) $(theme_icons)
 
 install-data-hook: install-icons update-icon-cache
 
@@ -100,7 +35,7 @@ install-icons:
                SIZE=`echo $$icon | cut -d_ -f3`; \
                ICONFILE=`echo $$icon | cut -d_ -f4`; \
                mkdir -p $(DESTDIR)$(datadir)/icons/$$THEME/$$SIZE/$$CONTEXT; \
-               $(INSTALL_DATA) $(srcdir)/$$SIZE/$$icon 
$(DESTDIR)$(datadir)/icons/$$THEME/$$SIZE/$$CONTEXT/$$ICONFILE; \
+               $(INSTALL_DATA) $(srcdir)/$$icon 
$(DESTDIR)$(datadir)/icons/$$THEME/$$SIZE/$$CONTEXT/$$ICONFILE; \
        done;
 
 uninstall-icons:
@@ -123,4 +58,3 @@ update-icon-cache:
                echo "*** Icon cache not updated.  After (un)install, run this:"; \
                echo "***   $(gtk_update_icon_cache)"; \
        fi
-
diff --git a/pixmaps/scalable/gnome_actions_scalable_call-hold-symbolic.svg 
b/pixmaps/gnome_actions_scalable_call-hold-symbolic.svg
similarity index 100%
rename from pixmaps/scalable/gnome_actions_scalable_call-hold-symbolic.svg
rename to pixmaps/gnome_actions_scalable_call-hold-symbolic.svg
diff --git a/pixmaps/scalable/gnome_actions_scalable_call-transfer-symbolic-rtl.svg 
b/pixmaps/gnome_actions_scalable_call-transfer-symbolic-rtl.svg
similarity index 100%
rename from pixmaps/scalable/gnome_actions_scalable_call-transfer-symbolic-rtl.svg
rename to pixmaps/gnome_actions_scalable_call-transfer-symbolic-rtl.svg
diff --git a/pixmaps/scalable/gnome_actions_scalable_call-transfer-symbolic.svg 
b/pixmaps/gnome_actions_scalable_call-transfer-symbolic.svg
similarity index 100%
rename from pixmaps/scalable/gnome_actions_scalable_call-transfer-symbolic.svg
rename to pixmaps/gnome_actions_scalable_call-transfer-symbolic.svg
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]