diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2009-05-01 18:44:36 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2009-05-01 18:44:36 +0800 |
| commit | 5f55aba5b052fb7284973f50009f8b369334d084 (patch) | |
| tree | e7a5149f56fd8550915c3141a408fb79a14d0239 /plugins/mail-notification | |
| parent | 6824309c1179f1346b4877f67e386f237d954196 (diff) | |
| download | gsoc2013-evolution-5f55aba5b052fb7284973f50009f8b369334d084.tar gsoc2013-evolution-5f55aba5b052fb7284973f50009f8b369334d084.tar.gz gsoc2013-evolution-5f55aba5b052fb7284973f50009f8b369334d084.tar.bz2 gsoc2013-evolution-5f55aba5b052fb7284973f50009f8b369334d084.tar.lz gsoc2013-evolution-5f55aba5b052fb7284973f50009f8b369334d084.tar.xz gsoc2013-evolution-5f55aba5b052fb7284973f50009f8b369334d084.tar.zst gsoc2013-evolution-5f55aba5b052fb7284973f50009f8b369334d084.zip | |
Merge in changes from master.
Diffstat (limited to 'plugins/mail-notification')
| -rw-r--r-- | plugins/mail-notification/mail-notification.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/plugins/mail-notification/mail-notification.c b/plugins/mail-notification/mail-notification.c index 89f9daaccb..5bb65cef18 100644 --- a/plugins/mail-notification/mail-notification.c +++ b/plugins/mail-notification/mail-notification.c @@ -29,7 +29,7 @@ #include <glib/gi18n.h> #include <gtk/gtk.h> #include <gconf/gconf-client.h> -#include <libgnome/libgnome.h> +#include <libgnome/gnome-sound.h> #ifdef HAVE_DBUS #include <dbus/dbus-glib.h> @@ -54,10 +54,6 @@ #define GCONF_KEY_ENABLED_STATUS GCONF_KEY_ROOT "status-enabled" #define GCONF_KEY_ENABLED_SOUND GCONF_KEY_ROOT "sound-enabled" -#if !GTK_CHECK_VERSION(2,16,0) -#define gtk_status_icon_set_tooltip_text gtk_status_icon_set_tooltip -#endif - static gboolean enabled = FALSE; static GtkWidget *get_cfg_widget (void); static GStaticMutex mlock = G_STATIC_MUTEX_INIT; |