seahorse r2353 - in seahorse-plugins/trunk: . libseahorse pixmaps/22x22 pixmaps/48x48 pixmaps/scalable

[sadam svn gnome org]

Author: sadam
Date: Wed Aug 13 22:53:04 2008
New Revision: 2353
URL: http://svn.gnome.org/viewvc/seahorse?rev=2353&view=rev

Log:
2008-08-13  Adam Schreiber  <sadam clemson edu>
    
    * pixmaps/22x22/Makefile.am:
    * pixmaps/48x48/Makefile.am:
    * pixmaps/scalable/Makefile.am:
    * libseahorse/seahorse-widget.c:
    * libseahorse/seahorse-gtkstock.c:
    * libseahorse/seahorse-gtkstock.h: Icon makover.  Patch from Michael 
Monreal.
    Part of fixing bug #520114


Modified:
   seahorse-plugins/trunk/ChangeLog
   seahorse-plugins/trunk/libseahorse/seahorse-gtkstock.c
   seahorse-plugins/trunk/libseahorse/seahorse-gtkstock.h
   seahorse-plugins/trunk/libseahorse/seahorse-widget.c
   seahorse-plugins/trunk/pixmaps/22x22/Makefile.am
   seahorse-plugins/trunk/pixmaps/48x48/Makefile.am
   seahorse-plugins/trunk/pixmaps/scalable/Makefile.am

Modified: seahorse-plugins/trunk/libseahorse/seahorse-gtkstock.c
==============================================================================
--- seahorse-plugins/trunk/libseahorse/seahorse-gtkstock.c	(original)
+++ seahorse-plugins/trunk/libseahorse/seahorse-gtkstock.c	Wed Aug 13 22:53:04 2008
@@ -30,7 +30,6 @@
 #include "seahorse-gtkstock.h"
 
 static const gchar *seahorse_icons[] = {
-    SEAHORSE_STOCK_SEAHORSE,
     SEAHORSE_STOCK_KEY,
     SEAHORSE_STOCK_SECRET,
     SEAHORSE_STOCK_SIGN,

Modified: seahorse-plugins/trunk/libseahorse/seahorse-gtkstock.h
==============================================================================
--- seahorse-plugins/trunk/libseahorse/seahorse-gtkstock.h	(original)
+++ seahorse-plugins/trunk/libseahorse/seahorse-gtkstock.h	Wed Aug 13 22:53:04 2008
@@ -29,7 +29,6 @@
 #include <gtk/gtk.h>
 
 /* The default stock icons */
-#define SEAHORSE_STOCK_SEAHORSE     "seahorse"
 #define SEAHORSE_STOCK_KEY          "seahorse-key"
 #define SEAHORSE_STOCK_SECRET       "seahorse-key-personal"
 #define SEAHORSE_STOCK_SIGN         "seahorse-sign"

Modified: seahorse-plugins/trunk/libseahorse/seahorse-widget.c
==============================================================================
--- seahorse-plugins/trunk/libseahorse/seahorse-widget.c	(original)
+++ seahorse-plugins/trunk/libseahorse/seahorse-widget.c	Wed Aug 13 22:53:04 2008
@@ -148,7 +148,6 @@
 {
     SeahorseWidget *swidget;
     GtkWidget *w;
-    GdkPixbuf *pixbuf = NULL;
     char *path;
     
     swidget = SEAHORSE_WIDGET (object);
@@ -175,10 +174,7 @@
         glade_xml_set_toplevel (swidget->xml, GTK_WINDOW (w));
         glade_xml_ensure_accel (swidget->xml);
         
-        pixbuf = gtk_widget_render_icon (w, SEAHORSE_STOCK_SEAHORSE, 
-                                         (GtkIconSize)-1, NULL); 
-        gtk_window_set_icon (GTK_WINDOW (w), gdk_pixbuf_copy(pixbuf));
-        g_object_unref(pixbuf);
+        gtk_window_set_icon_name (GTK_WINDOW (w), "seahorse-preferences");
         break;
     }
 }

Modified: seahorse-plugins/trunk/pixmaps/22x22/Makefile.am
==============================================================================
--- seahorse-plugins/trunk/pixmaps/22x22/Makefile.am	(original)
+++ seahorse-plugins/trunk/pixmaps/22x22/Makefile.am	Wed Aug 13 22:53:04 2008
@@ -1,8 +1,6 @@
 
 icon22dir = $(datadir)/pixmaps/seahorse/22x22/
-icon22_DATA = seahorse.png \
-                seahorse-preferences.png \
-                seahorse-applet-encrypted.png \
+icon22_DATA = seahorse-applet-encrypted.png \
                 seahorse-applet-key.png \
                 seahorse-applet-signed.png \
                 seahorse-applet-text.png \
@@ -12,9 +10,7 @@
                 seahorse-sign-ok.png \
                 seahorse-sign-bad.png
 
-iconsrc = seahorse.svg \
-                seahorse-preferences.svg \
-                seahorse-applet-encrypted.svg \
+iconsrc = seahorse-applet-encrypted.svg \
                 seahorse-applet-key.svg \
                 seahorse-applet-signed.svg \
                 seahorse-applet-text.svg \
@@ -23,9 +19,5 @@
                 seahorse-sign.svg \
                 seahorse-sign-ok.svg \
                 seahorse-sign-bad.svg
-
-desktop_iconsdir   = $(datadir)/icons/hicolor/22x22/apps
-desktop_icons_DATA = seahorse.svg \
-                seahorse-preferences.svg
-                
+             
 EXTRA_DIST = $(iconsrc) $(icon22_DATA)

Modified: seahorse-plugins/trunk/pixmaps/48x48/Makefile.am
==============================================================================
--- seahorse-plugins/trunk/pixmaps/48x48/Makefile.am	(original)
+++ seahorse-plugins/trunk/pixmaps/48x48/Makefile.am	Wed Aug 13 22:53:04 2008
@@ -1,8 +1,6 @@
 
 icon48dir = $(datadir)/pixmaps/seahorse/48x48/
-icon48_DATA = seahorse.png \
-                seahorse-preferences.png \
-                seahorse-applet.png \
+icon48_DATA = seahorse-applet.png \
                 seahorse-applet-encrypted.png \
                 seahorse-applet-key.png \
                 seahorse-applet-signed.png \
@@ -14,13 +12,7 @@
                 seahorse-sign-ok.png \
                 seahorse-sign-unknown.png
 
-pixmapdir = $(datadir)/pixmaps/
-pixmap_DATA = seahorse.png \
-                seahorse-preferences.png
-
 desktop_iconsdir   = $(datadir)/icons/hicolor/48x48/apps
-desktop_icons_DATA = seahorse.png \
-                seahorse-preferences.png \
-                seahorse-applet.png
+desktop_icons_DATA = seahorse-applet.png
 
 EXTRA_DIST = $(icon48_DATA)

Modified: seahorse-plugins/trunk/pixmaps/scalable/Makefile.am
==============================================================================
--- seahorse-plugins/trunk/pixmaps/scalable/Makefile.am	(original)
+++ seahorse-plugins/trunk/pixmaps/scalable/Makefile.am	Wed Aug 13 22:53:04 2008
@@ -3,9 +3,7 @@
 pixmap_DATA = seahorse-applet.svg
 
 iconsvgdir = $(datadir)/pixmaps/seahorse/scalable/
-iconsvg_DATA = seahorse.svg \
-                seahorse-preferences.svg \
-                seahorse-applet.svg \
+iconsvg_DATA = seahorse-applet.svg \
                 seahorse-applet-encrypted.svg \
                 seahorse-applet-key.svg \
                 seahorse-applet-signed.svg \
@@ -22,9 +20,7 @@
                 seahorse-sign-unknown.svg
 
 desktop_iconsdir = $(datadir)/icons/hicolor/scalable/apps
-desktop_icons_DATA = seahorse.svg \
-                        seahorse-preferences.svg \
-                        seahorse-applet.svg
+desktop_icons_DATA = seahorse-applet.svg
 
 
 EXTRA_DIST = $(iconsvg_DATA)