[libnotify] Remove dbus version checks for > 0.60
- From: William Jon McCann <mccann src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [libnotify] Remove dbus version checks for > 0.60
- Date: Thu, 24 Jun 2010 06:26:16 +0000 (UTC)
commit 6471bfe9f4970db2466c9d736dbd51073ea54634
Author: William Jon McCann <jmccann redhat com>
Date: Thu Jun 24 02:21:44 2010 -0400
Remove dbus version checks for > 0.60
We already require 0.78 in configure anyway
libnotify/notification.c | 12 ------------
1 files changed, 0 insertions(+), 12 deletions(-)
---
diff --git a/libnotify/notification.c b/libnotify/notification.c
index c50ea07..7ad2acf 100644
--- a/libnotify/notification.c
+++ b/libnotify/notification.c
@@ -31,10 +31,6 @@
#include "notify.h"
#include "internal.h"
-#define CHECK_DBUS_VERSION(major, minor) \
- (DBUS_MAJOR_VER > (major) || \
- (DBUS_MAJOR_VER == (major) && DBUS_MINOR_VER >= (minor)))
-
#if !defined(G_PARAM_STATIC_NAME) && !defined(G_PARAM_STATIC_NICK) && \
!defined(G_PARAM_STATIC_BLURB)
# define G_PARAM_STATIC_NAME 0
@@ -926,7 +922,6 @@ notify_notification_set_urgency (NotifyNotification *notification,
(guchar) urgency);
}
-#if CHECK_DBUS_VERSION(0, 60)
static void
_gvalue_array_append_int (GValueArray *array,
gint i)
@@ -967,7 +962,6 @@ _gvalue_array_append_byte_array (GValueArray *array,
g_value_array_append (array, &value);
g_value_unset (&value);
}
-#endif /* D-BUS >= 0.60 */
/**
* notify_notification_set_icon_from_pixbuf:
@@ -1001,7 +995,6 @@ void
notify_notification_set_image_from_pixbuf (NotifyNotification *notification,
GdkPixbuf *pixbuf)
{
-#if CHECK_DBUS_VERSION(0, 60)
gint width;
gint height;
gint rowstride;
@@ -1013,12 +1006,10 @@ notify_notification_set_image_from_pixbuf (NotifyNotification *notification,
GValueArray *image_struct;
GValue *value;
const char *hint_name;
-#endif
g_return_if_fail (notification != NULL);
g_return_if_fail (NOTIFY_IS_NOTIFICATION (notification));
-#if CHECK_DBUS_VERSION(0, 60)
g_object_get (pixbuf,
"width", &width,
"height", &height,
@@ -1054,9 +1045,6 @@ notify_notification_set_image_from_pixbuf (NotifyNotification *notification,
g_hash_table_insert (notification->priv->hints,
g_strdup (hint_name),
value);
-#else /* D-BUS < 0.60 */
- g_warning ("Raw images and pixbufs require D-BUS >= 0.60");
-#endif
}
/**
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]