Merge lp:~3v1n0/nautilus/nautilus-3.8-location-xids into lp:~jbicha/nautilus/nautilus-3.8

Proposed by Marco Trevisan (Treviño)
Status: Merged
Merged at revision: 382
Proposed branch: lp:~3v1n0/nautilus/nautilus-3.8-location-xids
Merge into: lp:~jbicha/nautilus/nautilus-3.8
Diff against target: 157 lines (+44/-30)
3 files modified
debian/changelog (+4/-0)
debian/patches/19_unity_open_location_xid.patch (+39/-29)
debian/patches/series (+1/-1)
To merge this branch: bzr merge lp:~3v1n0/nautilus/nautilus-3.8-location-xids
Reviewer Review Type Date Requested Status
Jeremy Bicha Approve
Review via email: mp+168503@code.launchpad.net

Description of the change

Make 19_unity_open_location_xid.patch to apply again...

To post a comment you must log in.
Revision history for this message
Jeremy Bicha (jbicha) wrote :

Thanks, but this doesn't compile here on Saucy:

nautilus-freedesktop-dbus.c:233:1: error: conflicting types for 'nautilus_freedesktop_dbus_set_open_locations'
 nautilus_freedesktop_dbus_set_open_locations (NautilusFreedesktopDBus *fdb,
 ^
nautilus-freedesktop-dbus.c:224:1: note: previous definition of 'nautilus_freedesktop_dbus_set_open_locations' was here
 nautilus_freedesktop_dbus_set_open_locations (NautilusFreedesktopDBus *fdb,
 ^
make[4]: *** [nautilus-freedesktop-dbus.o] Error 1
make[4]: Leaving directory `/«PKGBUILDDIR»/src'

Could you also add a Description header to this patch so that someone coming to this later won't be as confused as I was about what the patch is for?

http://dep.debian.net/deps/dep3/

review: Needs Fixing
383. By Marco Trevisan (Treviño)

debian/patches/19_unity_open_location_xid.patch: fix compilation issue

384. By Marco Trevisan (Treviño)

19_unity_open_location_xid.patch: include a dep3 description

Revision history for this message
Marco Trevisan (Treviño) (3v1n0) wrote :

> Thanks, but this doesn't compile here on Saucy:
>
>
> nautilus-freedesktop-dbus.c:233:1: error: conflicting types for
> 'nautilus_freedesktop_dbus_set_open_locations'
> nautilus_freedesktop_dbus_set_open_locations (NautilusFreedesktopDBus *fdb,
> ^
> nautilus-freedesktop-dbus.c:224:1: note: previous definition of
> 'nautilus_freedesktop_dbus_set_open_locations' was here
> nautilus_freedesktop_dbus_set_open_locations (NautilusFreedesktopDBus *fdb,
> ^
> make[4]: *** [nautilus-freedesktop-dbus.o] Error 1
> make[4]: Leaving directory `/«PKGBUILDDIR»/src'

Ops, sorry... Wrongly applied the unworking patch, it should be fine now.

> Could you also add a Description header to this patch so that someone coming
> to this later won't be as confused as I was about what the patch is for?

Done.

Revision history for this message
Jeremy Bicha (jbicha) wrote :

Thanks!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2013-06-05 03:17:43 +0000
3+++ debian/changelog 2013-06-10 19:15:32 +0000
4@@ -35,6 +35,10 @@
5 [ Tim Lunn ]
6 * Add build-dep on gsettings-desktop-schemas
7
8+ [ Marco Trevisan (Treviño) ]
9+ * debian/patches:
10+ - 19_unity_open_location_xid.patch: updated to apply properly
11+
12 -- Jeremy Bicha <jbicha@ubuntu.com> Tue, 25 Dec 2012 13:50:48 -0500
13
14 nautilus (1:3.6.3-0ubuntu17) saucy; urgency=low
15
16=== modified file 'debian/patches/19_unity_open_location_xid.patch'
17--- debian/patches/19_unity_open_location_xid.patch 2013-03-27 18:56:42 +0000
18+++ debian/patches/19_unity_open_location_xid.patch 2013-06-10 19:15:32 +0000
19@@ -1,7 +1,15 @@
20+Description: Add a new dbus property to the nautilus'
21+ "org.freedesktop.FileManager1" dbus interface where it stores the lists of
22+ opened locations referenced by their parent nautilus window XID.
23+
24+Bug-Ubuntu: https://bugs.launchpad.net/unity/+bug/887449
25+Forwarded: no
26+Author: Marco Trevisan <marco@ubuntu.com>
27+
28 Index: nautilus/data/freedesktop-dbus-interfaces.xml
29 ===================================================================
30---- nautilus.orig/data/freedesktop-dbus-interfaces.xml 2013-03-27 15:18:14.620455679 +0100
31-+++ nautilus/data/freedesktop-dbus-interfaces.xml 2013-03-27 15:18:36.812457731 +0100
32+--- nautilus.orig/data/freedesktop-dbus-interfaces.xml 2013-06-10 21:00:24.913944953 +0200
33++++ nautilus/data/freedesktop-dbus-interfaces.xml 2013-06-10 21:00:24.905944954 +0200
34 @@ -33,5 +33,6 @@
35 <arg type='s' name='StartupId' direction='in'/>
36 </method>
37@@ -11,9 +19,9 @@
38 </node>
39 Index: nautilus/src/nautilus-application.c
40 ===================================================================
41---- nautilus.orig/src/nautilus-application.c 2013-03-27 14:24:02.345633000 +0100
42-+++ nautilus/src/nautilus-application.c 2013-03-27 17:22:49.598601760 +0100
43-@@ -1589,6 +1589,11 @@
44+--- nautilus.orig/src/nautilus-application.c 2013-06-10 21:00:24.913944953 +0200
45++++ nautilus/src/nautilus-application.c 2013-06-10 21:00:24.905944954 +0200
46+@@ -1672,6 +1672,11 @@
47
48 g_return_if_fail (NAUTILUS_IS_APPLICATION (app));
49
50@@ -25,7 +33,7 @@
51 for (l = gtk_application_get_windows (GTK_APPLICATION (app)); l; l = l->next) {
52 NautilusWindow *win = NAUTILUS_WINDOW (l->data);
53
54-@@ -1596,11 +1601,15 @@
55+@@ -1679,11 +1684,15 @@
56 continue;
57 }
58
59@@ -41,7 +49,7 @@
60 GList *found = g_list_find_custom (locations, uri, (GCompareFunc) g_strcmp0);
61
62 if (!found) {
63-@@ -1611,6 +1620,17 @@
64+@@ -1694,6 +1703,17 @@
65 }
66 }
67 }
68@@ -59,15 +67,16 @@
69 }
70
71 locations_array = g_new (gchar*, locations_size + 1);
72-@@ -1623,6 +1643,7 @@
73- locations_array[locations_size] = NULL;
74+@@ -1707,6 +1727,8 @@
75
76- nautilus_freedesktop_dbus_set_open_locations ((const gchar**) locations_array);
77-+ nautilus_freedesktop_dbus_set_open_locations_xids (g_variant_builder_end (&b));
78+ nautilus_freedesktop_dbus_set_open_locations (app->priv->fdb_manager,
79+ (const gchar**) locations_array);
80++ nautilus_freedesktop_dbus_set_open_locations_xids (app->priv->fdb_manager,
81++ g_variant_builder_end (&b));
82
83 g_free (locations_array);
84 g_list_free_full (locations, g_free);
85-@@ -1660,14 +1681,24 @@
86+@@ -1744,14 +1766,24 @@
87 }
88
89 static void
90@@ -94,7 +103,7 @@
91 }
92
93 static void
94-@@ -1685,8 +1716,11 @@
95+@@ -1769,8 +1801,11 @@
96 nautilus_previewer_call_close (previewer);
97 }
98
99@@ -110,31 +119,32 @@
100 static void
101 Index: nautilus/src/nautilus-freedesktop-dbus.c
102 ===================================================================
103---- nautilus.orig/src/nautilus-freedesktop-dbus.c 2013-03-27 14:24:02.345633000 +0100
104-+++ nautilus/src/nautilus-freedesktop-dbus.c 2013-03-27 14:37:39.224743813 +0100
105-@@ -303,6 +303,14 @@
106- nautilus_freedesktop_file_manager1_set_open_locations (singleton->skeleton, locations);
107+--- nautilus.orig/src/nautilus-freedesktop-dbus.c 2013-06-10 21:00:24.913944953 +0200
108++++ nautilus/src/nautilus-freedesktop-dbus.c 2013-06-10 21:01:11.485942497 +0200
109+@@ -229,6 +229,15 @@
110+ nautilus_freedesktop_file_manager1_set_open_locations (fdb->skeleton, locations);
111 }
112
113 +void
114-+nautilus_freedesktop_dbus_set_open_locations_xids (GVariant *locations)
115++nautilus_freedesktop_dbus_set_open_locations_xids (NautilusFreedesktopDBus *fdb,
116++ GVariant *locations)
117 +{
118-+ g_return_if_fail (singleton);
119++ g_return_if_fail (NAUTILUS_IS_FREEDESKTOP_DBUS (fdb));
120 +
121-+ nautilus_freedesktop_file_manager1_set_xubuntu_open_locations_xids (singleton->skeleton, locations);
122++ nautilus_freedesktop_file_manager1_set_xubuntu_open_locations_xids (fdb->skeleton, locations);
123 +}
124 +
125 /* Tries to own the org.freedesktop.FileManager1 service name */
126- void
127- nautilus_freedesktop_dbus_start (NautilusApplication *app)
128+ NautilusFreedesktopDBus *
129+ nautilus_freedesktop_dbus_new (void)
130 Index: nautilus/src/nautilus-freedesktop-dbus.h
131 ===================================================================
132---- nautilus.orig/src/nautilus-freedesktop-dbus.h 2013-03-27 14:24:02.345633000 +0100
133-+++ nautilus/src/nautilus-freedesktop-dbus.h 2013-03-27 15:17:59.012454136 +0100
134-@@ -28,5 +28,6 @@
135- void nautilus_freedesktop_dbus_start (NautilusApplication *app);
136- void nautilus_freedesktop_dbus_stop (void);
137- void nautilus_freedesktop_dbus_set_open_locations (const gchar **locations);
138-+void nautilus_freedesktop_dbus_set_open_locations_xids (GVariant *locations);
139+--- nautilus.orig/src/nautilus-freedesktop-dbus.h 2013-06-10 21:00:24.913944953 +0200
140++++ nautilus/src/nautilus-freedesktop-dbus.h 2013-06-10 21:00:24.909944954 +0200
141+@@ -48,5 +48,6 @@
142+ NautilusFreedesktopDBus * nautilus_freedesktop_dbus_new (void);
143+
144+ void nautilus_freedesktop_dbus_set_open_locations (NautilusFreedesktopDBus *fdb, const gchar **locations);
145++void nautilus_freedesktop_dbus_set_open_locations_xids (NautilusFreedesktopDBus *fdb, GVariant *locations);
146
147 #endif /* __NAUTILUS_FREEDESKTOP_DBUS_H__ */
148
149=== modified file 'debian/patches/series'
150--- debian/patches/series 2013-06-05 03:17:43 +0000
151+++ debian/patches/series 2013-06-10 19:15:32 +0000
152@@ -12,4 +12,4 @@
153 18_unity_icon_color.patch
154 zg_activity_logging.patch
155 dont_wrap_labels_after_dots.patch
156-#19_unity_open_location_xid.patch
157+19_unity_open_location_xid.patch

Subscribers

People subscribed via source and target branches