Ubuntu Netbook Remix Launcher

Merge lp://staging/~jassmith/netbook-remix-launcher/glib-fix into lp://staging/netbook-remix-launcher

  1. glib-fix
  2. Merge into trunk
Proposed by Jason Smith
Status: Merged
Merged at revision: not available
Proposed branch: lp://staging/~jassmith/netbook-remix-launcher/glib-fix
Merge into: lp://staging/netbook-remix-launcher
Diff against target: None lines
To merge this branch: bzr merge lp://staging/~jassmith/netbook-remix-launcher/glib-fix
Reviewer Review Type Date Requested Status
David Barth (community) Approve
Review via email: mp+11176@code.staging.launchpad.net
To post a comment you must log in.
Revision history for this message
Jason Smith (jassmith) wrote :

Makes netbook-launcher buildable on jaunty (and probably earlier, did not check to see how far back down the glib chain this goes now).

Revision history for this message
David Barth (dbarth) :
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 2009-09-03 11:56:29 +0000
3+++ configure.ac 2009-09-04 02:00:33 +0000
4@@ -67,7 +67,7 @@
5 clutter-gtk-0.10 >= 0.10.0
6 clutter-x11-1.0 >= 1.0.0
7 clutk-0.2
8- glib-2.0 >= 2.21
9+ glib-2.0 >= 2.20
10 gthread-2.0
11 gobject-2.0
12 gtk+-2.0
13
14=== modified file 'src/nl-volumes-source.c'
15--- src/nl-volumes-source.c 2009-08-11 13:34:04 +0000
16+++ src/nl-volumes-source.c 2009-09-04 02:00:33 +0000
17@@ -437,14 +437,22 @@
18 on_volume_ejected (GVolume *volume,
19 GAsyncResult *res)
20 {
21+#if GLIB_MAJOR_VERSION == 2 && GLIB_MINOR_VERSION >= 21
22 g_volume_eject_with_operation_finish (volume, res, NULL);
23+#else
24+ g_volume_eject_finish (volume, res, NULL);
25+#endif
26 }
27
28 static void
29 on_mount_unmounted (GMount *mount,
30 GAsyncResult *res)
31 {
32+#if GLIB_MAJOR_VERSION == 2 && GLIB_MINOR_VERSION >= 21
33 g_mount_unmount_with_operation_finish (mount, res, NULL);
34+#else
35+ g_mount_unmount_finish (mount, res, NULL);
36+#endif
37 }
38
39 static void
40@@ -454,8 +462,13 @@
41
42 if (g_volume_can_eject (volume))
43 {
44+#if GLIB_MAJOR_VERSION == 2 && GLIB_MINOR_VERSION >= 21
45 g_volume_eject_with_operation (volume, 0, NULL, NULL,
46 (GAsyncReadyCallback)on_volume_ejected, NULL);
47+#else
48+ g_volume_eject (volume, 0, NULL,
49+ (GAsyncReadyCallback)on_volume_ejected, NULL);
50+#endif
51 }
52 else
53 {
54@@ -463,8 +476,13 @@
55
56 if (!mount)
57 return;
58+#if GLIB_MAJOR_VERSION == 2 && GLIB_MINOR_VERSION >= 21
59 g_mount_unmount_with_operation (mount, 0, NULL, NULL,
60 (GAsyncReadyCallback)on_mount_unmounted, NULL);
61+#else
62+ g_mount_unmount (mount, 0, NULL,
63+ (GAsyncReadyCallback)on_mount_unmounted, NULL);
64+#endif
65 }
66 }
67

Subscribers

People subscribed via source and target branches