aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorConor Curran <conor.curran@canonical.com>2011-02-14 15:35:52 +0000
committerConor Curran <conor.curran@canonical.com>2011-02-14 15:35:52 +0000
commit9c00b2b4ab7ed39a5c5952010688b597d9c72934 (patch)
tree3bd913436e953b6c1221698f36607d2f61d26331
parentc963e37be35b53d6f9da68a92b2bb9f1d42a788d (diff)
parentf21b7129d4758ad7a187a2375b9c65cf20d2e70f (diff)
downloadayatana-indicator-sound-9c00b2b4ab7ed39a5c5952010688b597d9c72934.tar.gz
ayatana-indicator-sound-9c00b2b4ab7ed39a5c5952010688b597d9c72934.tar.bz2
ayatana-indicator-sound-9c00b2b4ab7ed39a5c5952010688b597d9c72934.zip
merged libnotify upgrade
-rw-r--r--configure.ac2
-rw-r--r--src/Makefile.am2
-rw-r--r--src/indicator-sound.c2
-rw-r--r--src/sound-state-manager.c12
-rw-r--r--src/sound-state-manager.h2
5 files changed, 3 insertions, 17 deletions
diff --git a/configure.ac b/configure.ac
index d42f574..7788c58 100644
--- a/configure.ac
+++ b/configure.ac
@@ -35,7 +35,7 @@ PULSE_AUDIO_REQUIRED_VERSION=0.9.19
INDICATOR_DISPLAY_OBJECTS=0.1.11
DBUSMENUGLIB_REQUIRED_VERSION=0.3.9
GIO_2_0_REQUIRED_VERSION=2.25.13
-LIBNOTIFY_REQUIRED_VERSION=0.5.0
+LIBNOTIFY_REQUIRED_VERSION=0.7.0
PKG_CHECK_MODULES(APPLET, gtk+-2.0 >= $GTK_REQUIRED_VERSION
indicator >= $INDICATOR_REQUIRED_VERSION
diff --git a/src/Makefile.am b/src/Makefile.am
index 63d6d5a..23bda3d 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -65,7 +65,7 @@ music_bridge_VALAFLAGS = \
--vapidir=./ \
--thread \
--pkg gee-1.0 \
- --pkg Dbusmenu-Glib-0.4 \
+ --pkg Dbusmenu-0.4 \
--pkg common-defs \
--pkg gio-2.0 \
--pkg gio-unix-2.0 \
diff --git a/src/indicator-sound.c b/src/indicator-sound.c
index 7e5ebc7..96ab89b 100644
--- a/src/indicator-sound.c
+++ b/src/indicator-sound.c
@@ -401,8 +401,6 @@ new_volume_slider_widget(DbusmenuMenuitem * newitem,
newitem,
menu_volume_item,
parent);
- sound_state_manager_attach_notification_to_volume_widget (priv->state_manager,
- volume_widget);
return TRUE;
}
diff --git a/src/sound-state-manager.c b/src/sound-state-manager.c
index a592711..0958763 100644
--- a/src/sound-state-manager.c
+++ b/src/sound-state-manager.c
@@ -151,23 +151,13 @@ sound_state_manager_notification_init (SoundStateManager* self)
}
if (has_notify_osd) {
- priv->notification = notify_notification_new(PACKAGE_NAME, NULL, NULL, NULL);
+ priv->notification = notify_notification_new(PACKAGE_NAME, NULL, NULL);
notify_notification_set_hint_string(priv->notification,
"x-canonical-private-synchronous", "");
}
}
void
-sound_state_manager_attach_notification_to_volume_widget (SoundStateManager *self,
- GtkWidget* volume_widget)
-{
- SoundStateManagerPrivate* priv = SOUND_STATE_MANAGER_GET_PRIVATE(self);
- if (priv->notification)
- notify_notification_attach_to_widget(priv->notification, volume_widget);
-}
-
-
-void
sound_state_manager_show_notification (SoundStateManager *self,
double value)
{
diff --git a/src/sound-state-manager.h b/src/sound-state-manager.h
index 0b919cb..9287897 100644
--- a/src/sound-state-manager.h
+++ b/src/sound-state-manager.h
@@ -61,8 +61,6 @@ void sound_state_manager_get_state_cb (GObject *object,
void sound_state_manager_show_notification (SoundStateManager *self,
double value);
-void sound_state_manager_attach_notification_to_volume_widget (SoundStateManager *self,
- GtkWidget* volume_widget);
G_END_DECLS