[nautilus-share] Use folder-remote icon



commit daf492e4d3ada4c9f6503b792f867f8bf3b90d8e
Author: Chow Loong Jin <hyperair gmail com>
Date:   Fri Jun 12 00:38:49 2009 +0800

    Use folder-remote icon
    
    stock_shared-by-me is deprecated and has a fallback icon which looks ugly.
    share-logo.png is a scaled version of that icon. Both are now dropped in favour
    of folder-remote which is provided for by the theme.
    
    fix.pl is dropped because we no longer need to prepend the path of the icon,
    and share-dialog.glade.in is now share-dialog.glade, since we no longer need to
    modify it for installation.

 Makefile.am                                        |    2 +-
 interfaces/Makefile.am                             |   14 +--------
 interfaces/fix.pl                                  |   31 --------------------
 .../{share-dialog.glade.in => share-dialog.glade}  |    3 +-
 pixmaps/.cvsignore                                 |    2 -
 pixmaps/Makefile.am                                |    4 --
 pixmaps/share-logo.png                             |  Bin 3606 -> 0 bytes
 src/nautilus-share.c                               |    2 +-
 8 files changed, 5 insertions(+), 53 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 5642043..857d7e9 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,2 +1,2 @@
-SUBDIRS = src pixmaps interfaces po
+SUBDIRS = src interfaces po
 EXTRA_DIST = intltool-update.in intltool-extract.in intltool-merge.in
diff --git a/interfaces/Makefile.am b/interfaces/Makefile.am
index e21799d..cb21a8e 100644
--- a/interfaces/Makefile.am
+++ b/interfaces/Makefile.am
@@ -1,13 +1 @@
-interfaces = \
-	share-dialog.glade
-
-interfaces_DATA = $(interfaces)
-
-EXTRA_DIST = \
-	$(interfaces:.glade=.glade.in)	\
-	fix.pl
-
-CLEANFILES = $(interfaces)
-
-$(interfaces): %.glade: %.glade.in
-	$(top_srcdir)/interfaces/fix.pl $(pixmapsdir) < $< > $@
+interfaces_DATA = share-dialog.glade
diff --git a/interfaces/share-dialog.glade.in b/interfaces/share-dialog.glade
similarity index 99%
rename from interfaces/share-dialog.glade.in
rename to interfaces/share-dialog.glade
index 2c1f5e4..50bcf2a 100644
--- a/interfaces/share-dialog.glade.in
+++ b/interfaces/share-dialog.glade
@@ -36,7 +36,8 @@
 	  <child>
 	    <widget class="GtkImage" id="logo_image">
 	      <property name="visible">True</property>
-	      <property name="pixbuf">share-logo.png</property>
+	      <property name="pixel_size">64</property>
+	      <property name="icon_name">folder-remote</property>
 	      <property name="xalign">0.5</property>
 	      <property name="yalign">0.5</property>
 	      <property name="xpad">0</property>
diff --git a/src/nautilus-share.c b/src/nautilus-share.c
index ffa2502..f8ae72b 100644
--- a/src/nautilus-share.c
+++ b/src/nautilus-share.c
@@ -1128,7 +1128,7 @@ nautilus_share_get_file_items (NautilusMenuProvider *provider,
   item = nautilus_menu_item_new ("NautilusShare::share",
 				 _("Sharing Options"),
 				 _("Share this Folder"),
-				 "stock_shared-by-me");
+				 "folder-remote");
   g_signal_connect (item, "activate",
 		    G_CALLBACK (share_this_folder_callback),
 		    fileinfo);



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