aboutsummaryrefslogtreecommitdiff
path: root/src/indicator-sound.c
diff options
context:
space:
mode:
authorConor Curran <conor.curran@canonical.com>2011-02-17 18:54:58 +0000
committerConor Curran <conor.curran@canonical.com>2011-02-17 18:54:58 +0000
commit4bebcafef41b3dbc6b4f3f3e2f6382d82390335f (patch)
treeebb69bda73b2d4be8a11efbd9f0f59b3c3a24a3d /src/indicator-sound.c
parent6ad2bc640794ad3d78c401e4e9391169446db619 (diff)
downloadayatana-indicator-sound-4bebcafef41b3dbc6b4f3f3e2f6382d82390335f.tar.gz
ayatana-indicator-sound-4bebcafef41b3dbc6b4f3f3e2f6382d82390335f.tar.bz2
ayatana-indicator-sound-4bebcafef41b3dbc6b4f3f3e2f6382d82390335f.zip
getting there
Diffstat (limited to 'src/indicator-sound.c')
-rw-r--r--src/indicator-sound.c32
1 files changed, 21 insertions, 11 deletions
diff --git a/src/indicator-sound.c b/src/indicator-sound.c
index 138c5ac..ef803e4 100644
--- a/src/indicator-sound.c
+++ b/src/indicator-sound.c
@@ -32,12 +32,12 @@ with this program. If not, see <http://www.gnu.org/licenses/>.
#include "metadata-widget.h"
#include "title-widget.h"
#include "volume-widget.h"
-
+#include "voip-input-widget.h"
#include "dbus-shared-names.h"
+#include "sound-state-manager.h"
#include "gen-sound-service.xml.h"
#include "common-defs.h"
-#include "sound-state-manager.h"
typedef struct _IndicatorSoundPrivate IndicatorSoundPrivate;
@@ -410,6 +410,15 @@ new_volume_slider_widget(DbusmenuMenuitem * newitem,
parent);
return TRUE;
}
+/**
+ * new_voip_slider_widget
+ * Create the voip menu item widget, must of the time this widget will be hidden.
+ * @param newitem
+ * @param parent
+ * @param client
+ * @param user_data
+ * @return
+ */
static gboolean
new_voip_slider_widget (DbusmenuMenuitem * newitem,
DbusmenuMenuitem * parent,
@@ -417,34 +426,35 @@ new_voip_slider_widget (DbusmenuMenuitem * newitem,
gpointer user_data)
{
g_debug("indicator-sound: new_voip_slider_widget");
-/*
GtkWidget* voip_widget = NULL;
- IndicatorObject *io = NULL;
-
+ //IndicatorObject *io = NULL;
g_return_val_if_fail(DBUSMENU_IS_MENUITEM(newitem), FALSE);
g_return_val_if_fail(DBUSMENU_IS_GTKCLIENT(client), FALSE);
- volume_widget = volume_widget_new (newitem);
- io = g_object_get_data (G_OBJECT (client), "indicator");
- IndicatorSoundPrivate* priv = INDICATOR_SOUND_GET_PRIVATE(INDICATOR_SOUND (io));
- priv->volume_widget = volume_widget;
+ voip_widget = voip_input_widget_new (newitem);
+/*
+ / io = g_object_get_data (G_OBJECT (client), "indicator");
+*/
+ //IndicatorSoundPrivate* priv = INDICATOR_SOUND_GET_PRIVATE(INDICATOR_SOUND (io));
+ //priv->volume_widget = volume_widget;
- GtkWidget* ido_slider_widget = volume_widget_get_ido_slider(VOLUME_WIDGET(priv->volume_widget));
+ GtkWidget* ido_slider_widget = voip_input_widget_get_ido_slider(VOIP_INPUT_WIDGET(voip_widget));
gtk_widget_show_all(ido_slider_widget);
// register the style callback on this widget with state manager's style change
// handler (needs to remake the blocking animation for each style).
+/*
g_signal_connect (ido_slider_widget, "style-set",
G_CALLBACK(sound_state_manager_style_changed_cb),
priv->state_manager);
+*/
GtkMenuItem *menu_volume_item = GTK_MENU_ITEM(ido_slider_widget);
dbusmenu_gtkclient_newitem_base(DBUSMENU_GTKCLIENT(client),
newitem,
menu_volume_item,
parent);
-*/
return TRUE;
}