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

[sadam svn gnome org]

Author: sadam
Date: Mon Sep  8 14:15:28 2008
New Revision: 2464
URL: http://svn.gnome.org/viewvc/seahorse?rev=2464&view=rev

Log:
2008-09-08  Adam Schreiber  <sadam clemson edu>

    * pixmaps/22x22/Makefile.am:
    * pixmaps/48x48/Makefile.am:
    * pixmaps/scalable/Makefile.am:
    * libseahorse/seahorse-notification.c: Change install directory so 
as not 
    to conflict with seahorse


Modified:
   seahorse-plugins/trunk/ChangeLog
   seahorse-plugins/trunk/libseahorse/seahorse-notification.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-notification.c
==============================================================================
--- seahorse-plugins/trunk/libseahorse/seahorse-notification.c	(original)
+++ seahorse-plugins/trunk/libseahorse/seahorse-notification.c	Mon Sep  8 14:15:28 2008
@@ -563,7 +563,7 @@
 
 /* Note that we can't use GTK stock here, as we hand these icons off 
    to other processes in the case of notifications */
-#define ICON_PREFIX     DATA_DIR "/pixmaps/seahorse/48x48/"
+#define ICON_PREFIX     DATA_DIR "/pixmaps/seahorse-plugins/48x48/"
 
 void
 seahorse_notify_import (guint keynum, gchar **keys)

Modified: seahorse-plugins/trunk/pixmaps/22x22/Makefile.am
==============================================================================
--- seahorse-plugins/trunk/pixmaps/22x22/Makefile.am	(original)
+++ seahorse-plugins/trunk/pixmaps/22x22/Makefile.am	Mon Sep  8 14:15:28 2008
@@ -1,5 +1,5 @@
 
-icon22dir = $(datadir)/pixmaps/seahorse/22x22/
+icon22dir = $(datadir)/pixmaps/seahorse-plugins/22x22/
 icon22_DATA = seahorse-applet-encrypted.png \
                 seahorse-applet-key.png \
                 seahorse-applet-signed.png \
@@ -10,7 +10,7 @@
                 seahorse-sign-ok.png \
                 seahorse-sign-bad.png
 
-iconsrc = seahorse-applet-encrypted.svg \
+iconsrc =       seahorse-applet-encrypted.svg \
                 seahorse-applet-key.svg \
                 seahorse-applet-signed.svg \
                 seahorse-applet-text.svg \

Modified: seahorse-plugins/trunk/pixmaps/48x48/Makefile.am
==============================================================================
--- seahorse-plugins/trunk/pixmaps/48x48/Makefile.am	(original)
+++ seahorse-plugins/trunk/pixmaps/48x48/Makefile.am	Mon Sep  8 14:15:28 2008
@@ -1,6 +1,6 @@
 
-icon48dir = $(datadir)/pixmaps/seahorse/48x48/
-icon48_DATA = seahorse-applet.png \
+icon48dir = $(datadir)/pixmaps/seahorse-plugins/48x48/
+icon48_DATA =   seahorse-applet.png \
                 seahorse-applet-encrypted.png \
                 seahorse-applet-key.png \
                 seahorse-applet-signed.png \

Modified: seahorse-plugins/trunk/pixmaps/scalable/Makefile.am
==============================================================================
--- seahorse-plugins/trunk/pixmaps/scalable/Makefile.am	(original)
+++ seahorse-plugins/trunk/pixmaps/scalable/Makefile.am	Mon Sep  8 14:15:28 2008
@@ -2,7 +2,7 @@
 pixmapdir = $(datadir)/pixmaps/
 pixmap_DATA = seahorse-applet.svg
 
-iconsvgdir = $(datadir)/pixmaps/seahorse/scalable/
+iconsvgdir = $(datadir)/pixmaps/seahorse-plugins/scalable/
 iconsvg_DATA = seahorse-applet.svg \
                 seahorse-applet-encrypted.svg \
                 seahorse-applet-key.svg \