[notification-daemon] Require D-Bus > 0.78 and drop checks

[William Jon McCann <mccann src gnome org>]

commit 4ba9e6ac130051a885763fea48f9161d93b5f920
Author: William Jon McCann <jmccann redhat com>
Date:   Thu Jun 24 02:57:40 2010 -0400

    Require D-Bus > 0.78 and drop checks

 configure.ac        |    2 +-
 src/daemon/daemon.c |   22 ----------------------
 2 files changed, 1 insertions(+), 23 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 5fd5bbc..1e81200 100644
--- a/configure.ac
+++ b/configure.ac
@@ -90,7 +90,7 @@ dnl ---------------------------------------------------------------------------
 dnl Requirements for the daemon
 dnl ---------------------------------------------------------------------------
 REQ_GLIB_VERSION=$REQ_GTK_VERSION
-REQ_DBUS_VERSION=0.36
+REQ_DBUS_VERSION=0.78
 REQ_LIBCANBERRA_GTK_VERSION=0.4
 pkg_modules="
 	gtk+-2.0 >= $REQ_GTK_VERSION, \
diff --git a/src/daemon/daemon.c b/src/daemon/daemon.c
index 8568cf7..1858340 100644
--- a/src/daemon/daemon.c
+++ b/src/daemon/daemon.c
@@ -122,22 +122,6 @@ typedef struct
 
 static DBusConnection *dbus_conn = NULL;
 
-#define CHECK_DBUS_VERSION(major, minor) \
-        (DBUS_MAJOR_VER > (major) || \
-         (DBUS_MAJOR_VER == (major) && DBUS_MINOR_VER >= (minor)))
-
-#if !CHECK_DBUS_VERSION(0, 60)
-
-/* This is a hack that will go away in time. For now, it's fairly safe. */
-struct _DBusGMethodInvocation
-{
-        DBusGConnection       *connection;
-        DBusGMessage          *message;
-        const DBusGObjectInfo *object;
-        const DBusGMethodInfo *method;
-};
-#endif /* D-BUS < 0.60 */
-
 static void                 notify_daemon_finalize        (GObject *object);
 static void                _notification_destroyed_cb     (GtkWindow *nw,
                                                            NotifyDaemon *daemon);
@@ -891,7 +875,6 @@ _notify_daemon_pixbuf_from_data_hint (GValue *icon_data)
         GValueArray    *image_struct;
         GValue         *value;
         GArray         *tmp_array;
-#if CHECK_DBUS_VERSION(0, 61)
         GType           struct_type;
 
         struct_type = dbus_g_type_get_struct ("GValueArray",
@@ -909,7 +892,6 @@ _notify_daemon_pixbuf_from_data_hint (GValue *icon_data)
                            "GValue of type GValueArray");
                 return NULL;
         }
-#endif /* D-BUS >= 0.61 */
 
         image_struct = (GValueArray *) g_value_get_boxed (icon_data);
         value = g_value_array_get_nth (image_struct, 0);
@@ -1606,11 +1588,7 @@ notify_daemon_notify_handler (NotifyDaemon *daemon,
 
         g_free (sound_file);
 
-#if CHECK_DBUS_VERSION(0, 60)
         sender = dbus_g_method_get_sender (context);
-#else
-        sender = g_strdup (dbus_message_get_sender (dbus_g_message_get_message (context->message)));
-#endif
 
         g_object_set_data (G_OBJECT (nw),
                            "_notify_id",