gnome-media r4055 - in trunk/gnome-volume-control: . src

[mccann svn gnome org]

Author: mccann
Date: Wed Nov 12 19:18:57 2008
New Revision: 4055
URL: http://svn.gnome.org/viewvc/gnome-media?rev=4055&view=rev

Log:
2008-11-12  William Jon McCann  <jmccann redhat com>

	* src/gvc-mixer-dialog.c (gvc_mixer_dialog_dispose):
	Only disconnect signals once.



Modified:
   trunk/gnome-volume-control/ChangeLog
   trunk/gnome-volume-control/src/gvc-mixer-dialog.c

Modified: trunk/gnome-volume-control/src/gvc-mixer-dialog.c
==============================================================================
--- trunk/gnome-volume-control/src/gvc-mixer-dialog.c	(original)
+++ trunk/gnome-volume-control/src/gvc-mixer-dialog.c	Wed Nov 12 19:18:57 2008
@@ -746,14 +746,14 @@
 {
         GvcMixerDialog *dialog = GVC_MIXER_DIALOG (object);
 
-        g_signal_handlers_disconnect_by_func (dialog->priv->mixer_control,
-                                              on_control_stream_added,
-                                              dialog);
-        g_signal_handlers_disconnect_by_func (dialog->priv->mixer_control,
-                                              on_control_stream_removed,
-                                              dialog);
-
         if (dialog->priv->mixer_control != NULL) {
+                g_signal_handlers_disconnect_by_func (dialog->priv->mixer_control,
+                                                      on_control_stream_added,
+                                                      dialog);
+                g_signal_handlers_disconnect_by_func (dialog->priv->mixer_control,
+                                                      on_control_stream_removed,
+                                                      dialog);
+
                 g_object_unref (dialog->priv->mixer_control);
                 dialog->priv->mixer_control = NULL;
         }