jcarr
/
libnotify
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove dbus version checks for > 0.60 

We already require 0.78 in configure anyway
This commit is contained in:
William Jon McCann 2010-06-24 02:21:44 -04:00
parent 23d7fc296a
commit 6471bfe9f4
1 changed files with 0 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libnotify/notification.c
View File

@ -31,10 +31,6 @@
#include "notify.h" #include "notify.h"
#include "internal.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) && \ #if !defined(G_PARAM_STATIC_NAME) && !defined(G_PARAM_STATIC_NICK) && \
!defined(G_PARAM_STATIC_BLURB) !defined(G_PARAM_STATIC_BLURB)
# define G_PARAM_STATIC_NAME 0 # define G_PARAM_STATIC_NAME 0
@ -926,7 +922,6 @@ notify_notification_set_urgency (NotifyNotification *notification,
(guchar) urgency); (guchar) urgency);
} }
#if CHECK_DBUS_VERSION(0, 60)
static void static void
_gvalue_array_append_int (GValueArray *array, _gvalue_array_append_int (GValueArray *array,
gint i) gint i)
@ -967,7 +962,6 @@ _gvalue_array_append_byte_array (GValueArray *array,
g_value_array_append (array, &value); g_value_array_append (array, &value);
g_value_unset (&value); g_value_unset (&value);
} }
#endif /* D-BUS >= 0.60 */
/** /**
* notify_notification_set_icon_from_pixbuf: * notify_notification_set_icon_from_pixbuf:
@ -1001,7 +995,6 @@ void
notify_notification_set_image_from_pixbuf (NotifyNotification *notification, notify_notification_set_image_from_pixbuf (NotifyNotification *notification,
GdkPixbuf *pixbuf) GdkPixbuf *pixbuf)
{ {
#if CHECK_DBUS_VERSION(0, 60)
gint width; gint width;
gint height; gint height;
gint rowstride; gint rowstride;
@ -1013,12 +1006,10 @@ notify_notification_set_image_from_pixbuf (NotifyNotification *notification,
GValueArray *image_struct; GValueArray *image_struct;
GValue *value; GValue *value;
const char *hint_name; const char *hint_name;
#endif
g_return_if_fail (notification != NULL); g_return_if_fail (notification != NULL);
g_return_if_fail (NOTIFY_IS_NOTIFICATION (notification)); g_return_if_fail (NOTIFY_IS_NOTIFICATION (notification));
#if CHECK_DBUS_VERSION(0, 60)
g_object_get (pixbuf, g_object_get (pixbuf,
"width", &width, "width", &width,
"height", &height, "height", &height,
@ -1054,9 +1045,6 @@ notify_notification_set_image_from_pixbuf (NotifyNotification *notification,
g_hash_table_insert (notification->priv->hints, g_hash_table_insert (notification->priv->hints,
g_strdup (hint_name), g_strdup (hint_name),
value); value);
#else /* D-BUS < 0.60 */
g_warning ("Raw images and pixbufs require D-BUS >= 0.60");
#endif
} }
/** /**