[Xfce4-commits] <thunar-volman:master> Fix build warnings without libnotify.

[Nick Schermer]

Updating branch refs/heads/master
         to 52e75173088bc07dbe41e69e7d9497bee6589623 (commit)
       from 9d94e23b61741ffbe30cbe2900173622d331b3c9 (commit)

commit 52e75173088bc07dbe41e69e7d9497bee6589623
Author: Nick Schermer <nick at xfce.org>
Date:   Wed Nov 3 17:27:45 2010 +0100

    Fix build warnings without libnotify.

 thunar-volman/main.c             |    4 +++-
 thunar-volman/tvm-block-device.c |   11 +++++++----
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/thunar-volman/main.c b/thunar-volman/main.c
index b502059..2256163 100644
--- a/thunar-volman/main.c
+++ b/thunar-volman/main.c
@@ -85,6 +85,9 @@ main (int    argc,
   GMainLoop     *loop = NULL;
   GError        *error = NULL;
   gint           exit_code = EXIT_SUCCESS;
+#ifdef HAVE_LIBNOTIFY
+  gchar         *spec_version = NULL;;
+#endif
 
   /* setup translation domain */
   xfce_textdomain (GETTEXT_PACKAGE, PACKAGE_LOCALE_DIR, "UTF-8");
@@ -109,7 +112,6 @@ main (int    argc,
        * displayed before. These versions also segfault when the 
        * ret_spec_version parameter of notify_get_server_info is 
        * NULL... */
-      gchar *spec_version = NULL;
       notify_get_server_info (NULL, NULL, NULL, &spec_version);
       g_free (spec_version);
     }
diff --git a/thunar-volman/tvm-block-device.c b/thunar-volman/tvm-block-device.c
index b5f73bf..56969ed 100644
--- a/thunar-volman/tvm-block-device.c
+++ b/thunar-volman/tvm-block-device.c
@@ -589,16 +589,19 @@ tvm_block_device_mounted (TvmContext *context,
                           GMount     *mount,
                           GError    **error)
 {
+  gboolean     success = FALSE;
+  GError      *err = NULL;
+  guint        n;
+#ifdef HAVE_LIBNOTIFY
   const gchar *summary;
   const gchar *icon;
   const gchar *volume_name;
   gboolean     is_cdrom;
   gboolean     is_dvd;
-  gboolean     success = FALSE;
-  GError      *err = NULL;
-  gchar       *decoded_name;
   gchar       *message;
-  guint        n;
+  gchar       *decoded_name;
+#endif
+
 
   g_return_if_fail (context != NULL);
   g_return_if_fail (G_IS_MOUNT (mount));