diff options
Diffstat (limited to 'libnotify')
-rw-r--r-- | libnotify/Makefile.am | 2 | ||||
-rw-r--r-- | libnotify/notification.c | 3 | ||||
-rw-r--r-- | libnotify/notification.h | 3 | ||||
-rw-r--r-- | libnotify/notify.c | 40 |
4 files changed, 3 insertions, 45 deletions
diff --git a/libnotify/Makefile.am b/libnotify/Makefile.am index 2abb61c..66abb80 100644 --- a/libnotify/Makefile.am +++ b/libnotify/Makefile.am @@ -32,7 +32,7 @@ libnotify_la_SOURCES = \ notify-marshal.c libnotify_la_LIBADD = \ - $(LINKS_LIBS) + $(PACKAGE_LIBS) libnotify_la_LDFLAGS = \ -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) diff --git a/libnotify/notification.c b/libnotify/notification.c index bdb69ad..2a42236 100644 --- a/libnotify/notification.c +++ b/libnotify/notification.c @@ -25,9 +25,6 @@ #include <dbus/dbus.h> #include <dbus/dbus-glib.h> -#include <gtk/gtk.h> -#include <gdk/gdkx.h> - #include "notify.h" #include "internal.h" diff --git a/libnotify/notification.h b/libnotify/notification.h index 033720c..982bc2e 100644 --- a/libnotify/notification.h +++ b/libnotify/notification.h @@ -25,7 +25,8 @@ #include <glib.h> #include <glib-object.h> -#include <gtk/gtk.h> + +#include <gdk-pixbuf/gdk-pixbuf.h> G_BEGIN_DECLS diff --git a/libnotify/notify.c b/libnotify/notify.c index 7272b3e..19138af 100644 --- a/libnotify/notify.c +++ b/libnotify/notify.c @@ -26,7 +26,6 @@ #include <stdlib.h> #include <stdarg.h> #include <unistd.h> -#include <gmodule.h> #include "notify.h" #include "internal.h" @@ -40,23 +39,6 @@ static GList *_active_notifications = NULL; static int _spec_version_major = 0; static int _spec_version_minor = 0; -/* For the GTK+ and gdk-pixbuf functions */ -static GModule *module = NULL; -static struct GtkDlMapping { - const char *function_name; - gpointer function_ptr; -} gtk_dl_mapping [] = { -#define MAP(a) { #a, (gpointer *)&a } - MAP(gdk_screen_make_display_name), - MAP(gdk_window_get_origin), - MAP(gtk_widget_get_allocation), - MAP(gtk_widget_get_has_window), - MAP(gtk_widget_get_screen), - MAP(gtk_widget_get_window) -#undef MAP -}; - - gboolean _notify_check_spec_version (int major, int minor) @@ -98,8 +80,6 @@ _notify_update_spec_version (void) gboolean notify_init (const char *app_name) { - guint i; - g_return_val_if_fail (app_name != NULL, FALSE); g_return_val_if_fail (*app_name != '\0', FALSE); @@ -111,26 +91,6 @@ notify_init (const char *app_name) g_type_init (); - /* Look up the symbols for the GTK+ and GDK - * functions we use */ - module = g_module_open (NULL, G_MODULE_BIND_LAZY | G_MODULE_BIND_LOCAL); - if (module == NULL) { - g_warning ("Failed to get our own symbols: '%s'", - g_module_error ()); - return FALSE; - } - for (i = 0; i < G_N_ELEMENTS (gtk_dl_mapping); i++) { - if (!g_module_symbol (module, - gtk_dl_mapping[i].function_name, - >k_dl_mapping[i].function_ptr)) { - g_warning ("Missing symbol '%s'", - gtk_dl_mapping[i].function_name); - g_module_close (module); - module = NULL; - return FALSE; - } - } - _initted = TRUE; return TRUE; |