diff options
author | Alberts Muktupāvels <alberts.muktupavels@gmail.com> | 2014-10-15 01:55:31 +0300 |
---|---|---|
committer | Marco Trevisan (Treviño) <mail@3v1n0.net> | 2014-10-21 14:40:29 -0400 |
commit | ff40806a86a55ba54dd2790836ee17c6303f592f (patch) | |
tree | e4eee89832c808f7f366e45804ca2574f714301a /libwnck | |
parent | 3dbe327d6f67d68db609f0c8aecd2bff82d1e67e (diff) | |
download | libwnck-ff40806a86a55ba54dd2790836ee17c6303f592f.tar.gz |
remove stock icons
Diffstat (limited to 'libwnck')
-rw-r--r-- | libwnck/Makefile.am | 7 | ||||
-rw-r--r-- | libwnck/private.h | 3 | ||||
-rw-r--r-- | libwnck/stock_delete.png | bin | 220 -> 0 bytes | |||
-rw-r--r-- | libwnck/stock_maximize.png | bin | 166 -> 0 bytes | |||
-rw-r--r-- | libwnck/stock_minimize.png | bin | 145 -> 0 bytes | |||
-rw-r--r-- | libwnck/util.c | 48 | ||||
-rw-r--r-- | libwnck/window-action-menu.c | 2 | ||||
-rw-r--r-- | libwnck/xutils.h | 4 |
8 files changed, 2 insertions, 62 deletions
diff --git a/libwnck/Makefile.am b/libwnck/Makefile.am index 0d4371c..4a105e6 100644 --- a/libwnck/Makefile.am +++ b/libwnck/Makefile.am @@ -150,12 +150,9 @@ wnck-enum-types.c: $(wnck_headers) --vtail " return type;\n}\n\n" \ $^ > $@ -inlinepixbufs_SOURCES = default_icon.png stock_delete.png stock_maximize.png stock_minimize.png +inlinepixbufs_SOURCES = default_icon.png inlinepixbufs_pairs = \ - default_icon_data $(srcdir)/default_icon.png \ - stock_delete_data $(srcdir)/stock_delete.png \ - stock_maximize_data $(srcdir)/stock_maximize.png \ - stock_minimize_data $(srcdir)/stock_minimize.png + default_icon_data $(srcdir)/default_icon.png inlinepixbufs.h: $(inlinepixbufs_SOURCES) $(AM_V_GEN)$(GDK_PIXBUF_CSOURCE) --raw --build-list $(inlinepixbufs_pairs) > $@ diff --git a/libwnck/private.h b/libwnck/private.h index 4406b5d..72cb545 100644 --- a/libwnck/private.h +++ b/libwnck/private.h @@ -144,9 +144,6 @@ void _wnck_pager_get_workspace_rect (WnckPager *pager, void _make_gtk_label_bold (GtkLabel *label); void _make_gtk_label_normal (GtkLabel *label); -void _wnck_stock_icons_init (void); - - G_END_DECLS #endif /* WNCK_PRIVATE_H */ diff --git a/libwnck/stock_delete.png b/libwnck/stock_delete.png Binary files differdeleted file mode 100644 index 429401c..0000000 --- a/libwnck/stock_delete.png +++ /dev/null diff --git a/libwnck/stock_maximize.png b/libwnck/stock_maximize.png Binary files differdeleted file mode 100644 index 6f10840..0000000 --- a/libwnck/stock_maximize.png +++ /dev/null diff --git a/libwnck/stock_minimize.png b/libwnck/stock_minimize.png Binary files differdeleted file mode 100644 index a22e3c4..0000000 --- a/libwnck/stock_minimize.png +++ /dev/null diff --git a/libwnck/util.c b/libwnck/util.c index 1408c22..01901b7 100644 --- a/libwnck/util.c +++ b/libwnck/util.c @@ -813,54 +813,6 @@ _wnck_get_default_display (void) return GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()); } -/* stock icon code Copyright (C) 2002 Jorn Baayen <jorn@nl.linux.org> */ -typedef struct -{ - char *stock_id; - const guint8 *icon_data; -} StockIcon; - -void -_wnck_stock_icons_init (void) -{ - GtkIconFactory *factory; - int i; - static gboolean done = FALSE; - - StockIcon items[] = - { - { WNCK_STOCK_DELETE, stock_delete_data }, - { WNCK_STOCK_MINIMIZE, stock_minimize_data }, - { WNCK_STOCK_MAXIMIZE, stock_maximize_data } - }; - - if (done) - return; - - done = TRUE; - - factory = gtk_icon_factory_new (); - gtk_icon_factory_add_default (factory); - - for (i = 0; i < (gint) G_N_ELEMENTS (items); i++) - { - GtkIconSet *icon_set; - GdkPixbuf *pixbuf; - - pixbuf = gdk_pixbuf_new_from_inline (-1, items[i].icon_data, - FALSE, - NULL); - - icon_set = gtk_icon_set_new_from_pixbuf (pixbuf); - gtk_icon_factory_add (factory, items[i].stock_id, icon_set); - gtk_icon_set_unref (icon_set); - - g_object_unref (G_OBJECT (pixbuf)); - } - - g_object_unref (G_OBJECT (factory)); -} - /** * wnck_shutdown: * diff --git a/libwnck/window-action-menu.c b/libwnck/window-action-menu.c index d44e84f..04b0a33 100644 --- a/libwnck/window-action-menu.c +++ b/libwnck/window-action-menu.c @@ -1109,8 +1109,6 @@ wnck_action_menu_class_init (WnckActionMenuClass *klass) { GObjectClass *object_class = G_OBJECT_CLASS (klass); - _wnck_stock_icons_init (); - g_type_class_add_private (klass, sizeof (WnckActionMenuPrivate)); object_class->constructor = wnck_action_menu_constructor; diff --git a/libwnck/xutils.h b/libwnck/xutils.h index 1b02ae4..6426d8d 100644 --- a/libwnck/xutils.h +++ b/libwnck/xutils.h @@ -30,10 +30,6 @@ G_BEGIN_DECLS -#define WNCK_STOCK_DELETE "wnck-stock-delete" -#define WNCK_STOCK_MAXIMIZE "wnck-stock-maximize" -#define WNCK_STOCK_MINIMIZE "wnck-stock-minimize" - #define WNCK_APP_WINDOW_EVENT_MASK (PropertyChangeMask | StructureNotifyMask) gboolean _wnck_get_cardinal (Screen *screen, |