gnome-applets r11142 - trunk/mixer

[callum svn gnome org]

Author: callum
Date: Tue Dec  2 01:07:34 2008
New Revision: 11142
URL: http://svn.gnome.org/viewvc/gnome-applets?rev=11142&view=rev

Log:
Hook up the mixer's new Volume Control... button

Modified:
   trunk/mixer/ChangeLog
   trunk/mixer/applet.c
   trunk/mixer/applet.h
   trunk/mixer/dock.c

Modified: trunk/mixer/applet.c
==============================================================================
--- trunk/mixer/applet.c	(original)
+++ trunk/mixer/applet.c	Tue Dec  2 01:07:34 2008
@@ -704,7 +704,7 @@
  * Run g-v-c.
  */
 
-static void
+void
 gnome_volume_applet_run_mixer (GnomeVolumeApplet *applet)
 {
   GnomeDesktopItem *ditem;

Modified: trunk/mixer/applet.h
==============================================================================
--- trunk/mixer/applet.h	(original)
+++ trunk/mixer/applet.h	Tue Dec  2 01:07:34 2008
@@ -99,6 +99,7 @@
 					    GstMixerTrack *track,
 					    gdouble        volume);
 void     gnome_volume_applet_toggle_mute (GnomeVolumeApplet *applet);
+void     gnome_volume_applet_run_mixer (GnomeVolumeApplet *applet);
 GType    gnome_volume_applet_get_type (void);
 gboolean gnome_volume_applet_setup    (GnomeVolumeApplet *applet,
 				       GList             *elements);

Modified: trunk/mixer/dock.c
==============================================================================
--- trunk/mixer/dock.c	(original)
+++ trunk/mixer/dock.c	Tue Dec  2 01:07:34 2008
@@ -84,16 +84,22 @@
 #endif
 }
 
-gint mute_cb (GObject *mute_widget, GnomeVolumeAppletDock *dock)
+static void mute_cb (GtkToggleButton *mute_widget, GnomeVolumeAppletDock *dock)
 {
   /* Only toggle the mute if we are actually going to change the
    * mute. This stops loops where the toggle_mute code calls us
    * back to make sure our display is in sync with other mute buttons. */
   if (mixer_is_muted (dock->model) != 
-      gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (mute_widget)))
+      gtk_toggle_button_get_active (mute_widget))
     gnome_volume_applet_toggle_mute (dock->model);
 }
 
+static void launch_mixer_cb (GtkButton *button, GnomeVolumeAppletDock *dock)
+{
+  gnome_volume_applet_run_mixer (dock->model);
+}
+
+
 GtkWidget *
 gnome_volume_applet_dock_new (GtkOrientation orientation,
 			      GnomeVolumeApplet *parent)
@@ -168,6 +174,7 @@
   gtk_box_pack_start (GTK_BOX (innerline), dock->mute, TRUE, TRUE, 0);
 
   more = gtk_button_new_with_label (_("Volume Control..."));
+  g_signal_connect (more, "clicked", G_CALLBACK (launch_mixer_cb), dock);
   gtk_box_pack_end (GTK_BOX (innerline), more, TRUE, TRUE, 0);
 
   gtk_container_add (GTK_CONTAINER (dock), frame);