← Back to branch summary

~ubuntu-branches/ubuntu/raring/nautilus-share/raring

« back to all changes in this revision

Viewing changes to debian/patches/04_use_correct_icon.patch

  • Committer: Bazaar Package Importer
  • Author(s): Chow Loong Jin
  • Date: 2011-07-08 19:29:57 UTC
  • mfrom: (9.2.1 sid)
  • Revision ID: james.westby@ubuntu.com-20110708192957-smtwyhrxx463r06g
Tags: 0.7.3-1
http://bugs.debian.org/630248
* [216b642] Update watch URL
* [5935de3] Imported Upstream version 0.7.3 (Closes: #630248)
* [aee4fd0] Drop upstreamed patches
* [8b469c0] Refresh 02_install_missing_samba.patch
* [b3611df] Refresh 99_ltmain_as-needed.patch
* [a049722] Drop explicit libglib2.0-dev build-dep
* [63b282f] Move to dh7

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/04_use_correct_icon.patch
1
 
# Description: Use folder-remote icon in nautilus
2
 
# Origin: vendor
3
 
# Bug-Ubuntu: https://bugs.launchpad.net/bugs/209136
4
 
# Forwarded: yes
5
 
# Author: Sebastien Bacher <seb128@canonical.com>
6
 
# Reviewed-By: Chow Loong JIn <hyperair@ubuntu.com>
7
 
---
8
 
 
9
 
 Makefile.am                      |    2 +-
10
 
 Makefile.in                      |    2 +-
11
 
 interfaces/Makefile.am           |    2 +-
12
 
 interfaces/Makefile.in           |    2 +-
13
 
 interfaces/share-dialog.glade.in |    3 ++-
14
 
 src/nautilus-share.c             |    2 +-
15
 
 6 files changed, 7 insertions(+), 6 deletions(-)
16
 
 
17
 
 
18
 
diff --git a/Makefile.am b/Makefile.am
19
 
index 5642043..857d7e9 100644
20
 
--- a/Makefile.am
21
 
+++ b/Makefile.am
22
 
@@ -1,2 +1,2 @@
23
 
-SUBDIRS = src pixmaps interfaces po
24
 
+SUBDIRS = src interfaces po
25
 
 EXTRA_DIST = intltool-update.in intltool-extract.in intltool-merge.in
26
 
diff --git a/Makefile.in b/Makefile.in
27
 
index 2de0abe..aef5918 100644
28
 
--- a/Makefile.in
29
 
+++ b/Makefile.in
30
 
@@ -226,7 +226,7 @@ sbindir = @sbindir@
31
 
 sharedstatedir = @sharedstatedir@
32
 
 sysconfdir = @sysconfdir@
33
 
 target_alias = @target_alias@
34
 
-SUBDIRS = src pixmaps interfaces po
35
 
+SUBDIRS = src interfaces po
36
 
 EXTRA_DIST = intltool-update.in intltool-extract.in intltool-merge.in
37
 
 all: config.h
38
 
        $(MAKE) $(AM_MAKEFLAGS) all-recursive
39
 
diff --git a/interfaces/Makefile.am b/interfaces/Makefile.am
40
 
index e21799d..a403b47 100644
41
 
--- a/interfaces/Makefile.am
42
 
+++ b/interfaces/Makefile.am
43
 
@@ -10,4 +10,4 @@ EXTRA_DIST = \
44
 
 CLEANFILES = $(interfaces)
45
 
 
46
 
 $(interfaces): %.glade: %.glade.in
47
 
-       $(top_srcdir)/interfaces/fix.pl $(pixmapsdir) < $< > $@
48
 
+       cp $< $@
49
 
diff --git a/interfaces/Makefile.in b/interfaces/Makefile.in
50
 
index 8545583..efbb5b8 100644
51
 
--- a/interfaces/Makefile.in
52
 
+++ b/interfaces/Makefile.in
53
 
@@ -404,7 +404,7 @@ uninstall-am: uninstall-info-am uninstall-interfacesDATA
54
 
 
55
 
 
56
 
 $(interfaces): %.glade: %.glade.in
57
 
-       $(top_srcdir)/interfaces/fix.pl $(pixmapsdir) < $< > $@
58
 
+       cp $< $@
59
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
60
 
 # Otherwise a system limit (for SysV at least) may be exceeded.
61
 
 .NOEXPORT:
62
 
diff --git a/interfaces/share-dialog.glade.in b/interfaces/share-dialog.glade.in
63
 
index 2c1f5e4..50bcf2a 100644
64
 
--- a/interfaces/share-dialog.glade.in
65
 
+++ b/interfaces/share-dialog.glade.in
66
 
@@ -36,7 +36,8 @@
67
 
          <child>
68
 
            <widget class="GtkImage" id="logo_image">
69
 
              <property name="visible">True</property>
70
 
-             <property name="pixbuf">share-logo.png</property>
71
 
+             <property name="pixel_size">64</property>
72
 
+             <property name="icon_name">folder-remote</property>
73
 
              <property name="xalign">0.5</property>
74
 
              <property name="yalign">0.5</property>
75
 
              <property name="xpad">0</property>
76
 
diff --git a/src/nautilus-share.c b/src/nautilus-share.c
77
 
index be4dfd9..12afd34 100644
78
 
--- a/src/nautilus-share.c
79
 
+++ b/src/nautilus-share.c
80
 
@@ -1404,7 +1404,7 @@ nautilus_share_get_file_items (NautilusMenuProvider *provider,
81
 
   item = nautilus_menu_item_new ("NautilusShare::share",
82
 
                                 _("Sharing Options"),
83
 
                                 _("Share this Folder"),
84
 
-                                "stock_shared-by-me");
85
 
+                                "folder-remote");
86
 
   g_signal_connect (item, "activate",
87
 
                    G_CALLBACK (share_this_folder_callback),
88
 
                    fileinfo);