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

[Jason Smith]

[Jason Smith (jassmith)]

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

[David Barth (dbarth)]

review: Approve

=== modified file 'configure.ac'
--- configure.ac	2009-09-03 11:56:29 +0000
+++ configure.ac	2009-09-04 02:00:33 +0000
@@ -67,7 +67,7 @@
                   clutter-gtk-0.10 >= 0.10.0
                   clutter-x11-1.0 >= 1.0.0
                   clutk-0.2
-                  glib-2.0 >= 2.21
+                  glib-2.0 >= 2.20
                   gthread-2.0
                   gobject-2.0
                   gtk+-2.0

=== modified file 'src/nl-volumes-source.c'
--- src/nl-volumes-source.c	2009-08-11 13:34:04 +0000
+++ src/nl-volumes-source.c	2009-09-04 02:00:33 +0000
@@ -437,14 +437,22 @@
 on_volume_ejected (GVolume          *volume,
                    GAsyncResult     *res)
 {
+#if GLIB_MAJOR_VERSION == 2 && GLIB_MINOR_VERSION >= 21
   g_volume_eject_with_operation_finish (volume, res, NULL);
+#else
+  g_volume_eject_finish (volume, res, NULL);
+#endif
 }
 
 static void
 on_mount_unmounted (GMount           *mount,
                     GAsyncResult     *res)
 {
+#if GLIB_MAJOR_VERSION == 2 && GLIB_MINOR_VERSION >= 21
   g_mount_unmount_with_operation_finish (mount, res, NULL);
+#else
+  g_mount_unmount_finish (mount, res, NULL);
+#endif
 }
 
 static void
@@ -454,8 +462,13 @@
 
   if (g_volume_can_eject (volume))
     {
+#if GLIB_MAJOR_VERSION == 2 && GLIB_MINOR_VERSION >= 21
       g_volume_eject_with_operation (volume, 0, NULL, NULL,
                       (GAsyncReadyCallback)on_volume_ejected, NULL);
+#else
+      g_volume_eject (volume, 0, NULL,
+                      (GAsyncReadyCallback)on_volume_ejected, NULL);
+#endif
     }
   else
     {
@@ -463,8 +476,13 @@
 
       if (!mount)
         return;
+#if GLIB_MAJOR_VERSION == 2 && GLIB_MINOR_VERSION >= 21
       g_mount_unmount_with_operation (mount, 0, NULL, NULL,
                        (GAsyncReadyCallback)on_mount_unmounted, NULL);
+#else
+      g_mount_unmount (mount, 0, NULL,
+                       (GAsyncReadyCallback)on_mount_unmounted, NULL);
+#endif
     }
 }