[metacity] remove METACITY_STOCK_* and related things



commit 953db7544c1a7f8831ca0c2b653eb128b0b7a40d
Author: Alberts Muktupāvels <alberts muktupavels gmail com>
Date:   Wed Jun 4 19:23:03 2014 +0300

    remove METACITY_STOCK_* and related things

 src/Makefile.am        |    7 ++-----
 src/stock_delete.png   |  Bin 220 -> 0 bytes
 src/stock_maximize.png |  Bin 166 -> 0 bytes
 src/stock_minimize.png |  Bin 145 -> 0 bytes
 src/ui/menu.h          |    5 -----
 src/ui/ui.c            |   45 ---------------------------------------------
 6 files changed, 2 insertions(+), 55 deletions(-)
---
diff --git a/src/Makefile.am b/src/Makefile.am
index c650888..29a7de2 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -178,11 +178,8 @@ xml_DATA     = $(xml_in_files:.xml.in=.xml)
 
 @INTLTOOL_SCHEMAS_RULE@
 
-IMAGES=stock_maximize.png stock_minimize.png stock_delete.png window.png mini-window.png
-VARIABLES=stock_maximize_data $(srcdir)/stock_maximize.png \
-          stock_minimize_data $(srcdir)/stock_minimize.png \
-          stock_delete_data $(srcdir)/stock_delete.png \
-          mini_window_data $(srcdir)/mini-window.png \
+IMAGES=window.png mini-window.png
+VARIABLES=mini_window_data $(srcdir)/mini-window.png \
           window_data $(srcdir)/window.png
 
 BUILT_SOURCES = inlinepixbufs.h
diff --git a/src/ui/menu.h b/src/ui/menu.h
index c741afb..5faf443 100644
--- a/src/ui/menu.h
+++ b/src/ui/menu.h
@@ -25,11 +25,6 @@
 #include <gtk/gtk.h>
 #include "frames.h"
 
-/* Stock icons */
-#define METACITY_STOCK_DELETE   "metacity-delete"
-#define METACITY_STOCK_MINIMIZE "metacity-minimize"
-#define METACITY_STOCK_MAXIMIZE "metacity-maximize"
-
 struct _MetaWindowMenu
 {
   MetaFrames *frames;
diff --git a/src/ui/ui.c b/src/ui/ui.c
index 45d0575..38fe5b0 100644
--- a/src/ui/ui.c
+++ b/src/ui/ui.c
@@ -34,7 +34,6 @@
 #include <stdlib.h>
 #include <cairo-xlib.h>
 
-static void meta_stock_icons_init (void);
 static void meta_ui_accelerator_parse (const char      *accel,
                                        guint           *keysym,
                                        guint           *keycode,
@@ -69,8 +68,6 @@ meta_ui_init (int *argc, char ***argv)
 
   if (!gtk_init_check (argc, argv))
     meta_fatal ("Unable to open X display %s\n", XDisplayName (NULL));
-
-  meta_stock_icons_init ();
 }
 
 Display*
@@ -973,48 +970,6 @@ meta_ui_window_is_widget (MetaUI *ui,
     return FALSE;
 }
 
-/* stock icon code Copyright (C) 2002 Jorn Baayen <jorn nl linux org> */
-typedef struct
-{
-  char *stock_id;
-  const guint8 *icon_data;
-} MetaStockIcon;
-
-static void
-meta_stock_icons_init (void)
-{
-  GtkIconFactory *factory;
-  int i;
-
-  MetaStockIcon items[] =
-  {
-    { METACITY_STOCK_DELETE,   stock_delete_data   },
-    { METACITY_STOCK_MINIMIZE, stock_minimize_data },
-    { METACITY_STOCK_MAXIMIZE, stock_maximize_data }
-  };
-
-  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));
-}
-
 int
 meta_ui_get_drag_threshold (MetaUI *ui)
 {


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]