Ubuntu One Client

Merge lp:~dobey/ubuntuone-client/o-lawd into lp:ubuntuone-client

  1. o-lawd
  2. Merge into trunk
Proposed by dobey
Status: Merged
Approved by: Natalia Bidart
Approved revision: 993
Merged at revision: 992
Proposed branch: lp:~dobey/ubuntuone-client/o-lawd
Merge into: lp:ubuntuone-client
Diff against target: 62 lines (+13/-6)
3 files modified
configure.ac (+5/-1)
gsd-plugin/Makefile.am (+0/-1)
gsd-plugin/gsd-ubuntuone.c (+8/-4)
To merge this branch: bzr merge lp:~dobey/ubuntuone-client/o-lawd
Reviewer Review Type Date Requested Status
Natalia Bidart (community) Approve
Eric Casteleijn (community) Approve
Review via email: mp+62004@code.launchpad.net

Commit message

Check what version of gnome-settings-daemon we're building against
If using 3.0, add a class_finalize method, used by the type registration
Remove the pointless REGISTER_PLUGIN define and usage

To post a comment you must log in.
Revision history for this message
Eric Casteleijn (thisfred) wrote :

Looks good.

review: Approve
Revision history for this message
Natalia Bidart (nataliabidart) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'configure.ac'
2--- configure.ac 2011-05-18 18:26:01 +0000
3+++ configure.ac 2011-05-23 17:34:51 +0000
4@@ -223,7 +223,11 @@
5 gio-2.0
6 gconf-2.0
7 )
8-
9+# Check if we are on gnome-settingsd-daemon 3.0 or newer
10+PKG_CHECK_EXISTS([gnome-settings-daemon >= 3.0],
11+ AC_DEFINE_UNQUOTED([HAVE_GSD_30], [1],
12+ [If using gnome-settings-daemon 3.0 or newer]),
13+ [])
14 AC_SUBST(SETTINGS_PLUGIN_CFLAGS)
15 AC_SUBST(SETTINGS_PLUGIN_LIBS)
16
17
18=== modified file 'gsd-plugin/Makefile.am'
19--- gsd-plugin/Makefile.am 2011-05-18 18:26:01 +0000
20+++ gsd-plugin/Makefile.am 2011-05-23 17:34:51 +0000
21@@ -10,7 +10,6 @@
22 libubuntuone_la_CPPFLAGS = \
23 -I$(top_srcdir)/gnome-settings-daemon \
24 -DGNOME_SETTINGS_LOCALEDIR=\""$(datadir)/locale"\" \
25- -DREGISTER_PLUGIN \
26 -DDELAYED_START_TIMEOUT=3000
27
28 libubuntuone_la_CFLAGS = \
29
30=== modified file 'gsd-plugin/gsd-ubuntuone.c'
31--- gsd-plugin/gsd-ubuntuone.c 2011-05-18 18:26:01 +0000
32+++ gsd-plugin/gsd-ubuntuone.c 2011-05-23 17:34:51 +0000
33@@ -29,14 +29,11 @@
34 #include "gnome-settings-daemon/gnome-settings-plugin.h"
35 #include "gsd-ubuntuone.h"
36
37-#ifdef REGISTER_PLUGIN
38 GNOME_SETTINGS_PLUGIN_REGISTER (GsdUbuntuOne, gsd_ubuntuone)
39-#else
40-G_DEFINE_TYPE (GsdUbuntuOne, gsd_ubuntuone, G_TYPE_OBJECT);
41-#endif
42
43 #define CHECKED_BOOKMARK_FILE_KEY "/apps/gnome_settings_daemon/plugins/ubuntuone/checked_bookmark_file"
44
45+
46 static void
47 bookmark_file_loaded (GObject *source, GAsyncResult *res, gpointer user_data)
48 {
49@@ -176,6 +173,13 @@
50 G_OBJECT_CLASS (gsd_ubuntuone_parent_class)->dispose (object);
51 }
52
53+#ifdef HAVE_GSD_30
54+static void
55+gsd_ubuntuone_class_finalize (GsdUbuntuOneClass *klass)
56+{
57+}
58+#endif
59+
60 static void
61 gsd_ubuntuone_class_init (GsdUbuntuOneClass *klass)
62 {

Subscribers

People subscribed via source and target branches