Nautilus

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

  1. nautilus-3.8-location-xids
  2. Merge into 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 Bícha 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 Bícha (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
lp:~3v1n0/nautilus/nautilus-3.8-location-xids updated
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 Bícha (jbicha) wrote :

Thanks!

review: Approve

Preview Diff

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

Subscribers

People subscribed via source and target branches