The Sound Menu

Merge lp:~ken-vandine/indicator-sound/libnotify_and_dbusmenu_change into lp:~indicator-applet-developers/indicator-sound/trunk_3

  1. libnotify_and_dbusmenu_change
  2. Merge into trunk_3
Proposed by Ken VanDine
Status: Merged
Merged at revision: 199
Proposed branch: lp:~ken-vandine/indicator-sound/libnotify_and_dbusmenu_change
Merge into: lp:~indicator-applet-developers/indicator-sound/trunk_3
Diff against target: 79 lines (+3/-17)
5 files modified
configure.ac (+1/-1)
src/Makefile.am (+1/-1)
src/indicator-sound.c (+0/-2)
src/sound-state-manager.c (+1/-11)
src/sound-state-manager.h (+0/-2)
To merge this branch: bzr merge lp:~ken-vandine/indicator-sound/libnotify_and_dbusmenu_change
Reviewer Review Type Date Requested Status
Conor Curran (community) Approve
Review via email: mp+49404@code.launchpad.net

Description of the change

Ported to libnotify4-dev >= 0.7 and handle the Dbusmenu-Glib-0.4 rename to Dbusmenu-0.4

To post a comment you must log in.
Revision history for this message
Conor Curran (cjcurran) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'configure.ac'
2--- configure.ac 2011-02-10 14:35:59 +0000
3+++ configure.ac 2011-02-11 15:27:16 +0000
4@@ -35,7 +35,7 @@
5 INDICATOR_DISPLAY_OBJECTS=0.1.11
6 DBUSMENUGLIB_REQUIRED_VERSION=0.3.9
7 GIO_2_0_REQUIRED_VERSION=2.25.13
8-LIBNOTIFY_REQUIRED_VERSION=0.5.0
9+LIBNOTIFY_REQUIRED_VERSION=0.7.0
10
11 PKG_CHECK_MODULES(APPLET, gtk+-2.0 >= $GTK_REQUIRED_VERSION
12 indicator >= $INDICATOR_REQUIRED_VERSION
13
14=== modified file 'src/Makefile.am'
15--- src/Makefile.am 2011-02-04 16:17:31 +0000
16+++ src/Makefile.am 2011-02-11 15:27:16 +0000
17@@ -65,7 +65,7 @@
18 --vapidir=./ \
19 --thread \
20 --pkg gee-1.0 \
21- --pkg Dbusmenu-Glib-0.4 \
22+ --pkg Dbusmenu-0.4 \
23 --pkg common-defs \
24 --pkg gio-2.0 \
25 --pkg gio-unix-2.0 \
26
27=== modified file 'src/indicator-sound.c'
28--- src/indicator-sound.c 2011-02-02 19:05:50 +0000
29+++ src/indicator-sound.c 2011-02-11 15:27:16 +0000
30@@ -401,8 +401,6 @@
31 newitem,
32 menu_volume_item,
33 parent);
34- sound_state_manager_attach_notification_to_volume_widget (priv->state_manager,
35- volume_widget);
36 return TRUE;
37 }
38
39
40=== modified file 'src/sound-state-manager.c'
41--- src/sound-state-manager.c 2011-02-02 19:05:50 +0000
42+++ src/sound-state-manager.c 2011-02-11 15:27:16 +0000
43@@ -151,23 +151,13 @@
44 }
45
46 if (has_notify_osd) {
47- priv->notification = notify_notification_new(PACKAGE_NAME, NULL, NULL, NULL);
48+ priv->notification = notify_notification_new(PACKAGE_NAME, NULL, NULL);
49 notify_notification_set_hint_string(priv->notification,
50 "x-canonical-private-synchronous", "");
51 }
52 }
53
54 void
55-sound_state_manager_attach_notification_to_volume_widget (SoundStateManager *self,
56- GtkWidget* volume_widget)
57-{
58- SoundStateManagerPrivate* priv = SOUND_STATE_MANAGER_GET_PRIVATE(self);
59- if (priv->notification)
60- notify_notification_attach_to_widget(priv->notification, volume_widget);
61-}
62-
63-
64-void
65 sound_state_manager_show_notification (SoundStateManager *self,
66 double value)
67 {
68
69=== modified file 'src/sound-state-manager.h'
70--- src/sound-state-manager.h 2011-02-02 19:05:50 +0000
71+++ src/sound-state-manager.h 2011-02-11 15:27:16 +0000
72@@ -61,8 +61,6 @@
73 void sound_state_manager_show_notification (SoundStateManager *self,
74 double value);
75
76-void sound_state_manager_attach_notification_to_volume_widget (SoundStateManager *self,
77- GtkWidget* volume_widget);
78
79 G_END_DECLS
80

Subscribers

People subscribed via source and target branches