[Xfce4-commits] <xfburn:master> Merge branch 'burnimage'

[David Mohr]

Updating branch refs/heads/master
         to 1a88317ebcf26f7854c0b7a107ffa3f410961505 (commit)
       from 87fe77fc3f011af9e89aa7936f232c8354c0a02a (commit)

commit 1a88317ebcf26f7854c0b7a107ffa3f410961505
Merge: 87fe77fc3f011af9e89aa7936f232c8354c0a02a 84a6ff9475375b0eeee9c71e091e9027dc22a99a
Author: David Mohr <squisher at xfce.org>
Date:   Sat Oct 24 13:10:17 2009 -0600

    Merge branch 'burnimage'

commit 84a6ff9475375b0eeee9c71e091e9027dc22a99a
Author: David Mohr <squisher at xfce.org>
Date:   Sat Oct 24 13:07:15 2009 -0600

    Remove debugging messages

commit 18e1859ba86c33ae03231f70e93aaa757f2e96ed
Author: David Mohr <squisher at xfce.org>
Date:   Fri Oct 23 20:58:31 2009 -0600

    Keep the devlist around, disconnect from the propper object

commit 07d56a81706e1ce9049f38958468e5d7bc24033c
Merge: cfd9906c051c63cb9e1fac6cd447d45c15b563f4 3c289d525f8c02dfba2698a9343dcbc5ae85ffd9
Author: David Mohr <squisher at xfce.org>
Date:   Tue Oct 20 01:54:58 2009 -0600

    Merge branch 'master' into burnimage

commit cfd9906c051c63cb9e1fac6cd447d45c15b563f4
Author: David Mohr <squisher at xfce.org>
Date:   Tue Oct 13 23:11:22 2009 -0600

    Add debugging messages; chain up finalize call

 xfburn/xfburn-burn-image-dialog.c |   18 +++++++++---------
 xfburn/xfburn-main-window.c       |    2 --
 2 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/xfburn/xfburn-burn-image-dialog.c b/xfburn/xfburn-burn-image-dialog.c
index 08e7419..79a9320 100644
--- a/xfburn/xfburn-burn-image-dialog.c
+++ b/xfburn/xfburn-burn-image-dialog.c
@@ -65,6 +65,7 @@ typedef struct
 
   GtkWidget *burn_button;
 
+  XfburnDeviceList *devlist;
   gulong handler_volchange;
 
   ThreadBurnIsoParams *params;
@@ -137,7 +138,6 @@ xfburn_burn_image_dialog_init (XfburnBurnImageDialog * obj)
   GtkWidget *frame;
   GtkWidget *vbox;
   GtkWidget *button;
-  XfburnDeviceList *devlist;
   XfburnDevice *device;
 
   gtk_window_set_title (GTK_WINDOW (obj), _("Burn image"));
@@ -215,19 +215,16 @@ xfburn_burn_image_dialog_init (XfburnBurnImageDialog * obj)
   gtk_widget_grab_focus (priv->burn_button);
   gtk_widget_grab_default (priv->burn_button);
 
-  devlist = xfburn_device_list_new ();
+  priv->devlist = xfburn_device_list_new ();
 
-  priv->handler_volchange = g_signal_connect (G_OBJECT (devlist), "volume-change-end", G_CALLBACK (cb_volume_change_end), obj);
+  priv->handler_volchange = g_signal_connect (G_OBJECT (priv->devlist), "volume-change-end", G_CALLBACK (cb_volume_change_end), obj);
   g_signal_connect (G_OBJECT (obj), "response", G_CALLBACK (cb_dialog_response), obj);
-  device = xfburn_device_list_get_current_device (devlist);
+  device = xfburn_device_list_get_current_device (priv->devlist);
 
-  cb_volume_change_end (devlist, TRUE, device, obj);
+  cb_volume_change_end (priv->devlist, TRUE, device, obj);
 
   if (device)
     gtk_widget_set_sensitive (priv->check_dummy, xfburn_device_can_dummy_write (device));
-
-  g_object_unref (G_OBJECT (devlist));
-
 }
 
 static void
@@ -236,7 +233,10 @@ xfburn_burn_image_dialog_finalize (GObject *object)
   XfburnBurnImageDialog *dialog = XFBURN_BURN_IMAGE_DIALOG (object);
   XfburnBurnImageDialogPrivate *priv = XFBURN_BURN_IMAGE_DIALOG_GET_PRIVATE (dialog);
 
-  g_signal_handler_disconnect (dialog, priv->handler_volchange);
+  g_signal_handler_disconnect (priv->devlist, priv->handler_volchange);
+  g_object_unref (priv->devlist);
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
 }
 
 /*************/
diff --git a/xfburn/xfburn-main-window.c b/xfburn/xfburn-main-window.c
index bb6ba99..500333e 100644
--- a/xfburn/xfburn-main-window.c
+++ b/xfburn/xfburn-main-window.c
@@ -399,9 +399,7 @@ action_burn_image (GtkAction * action, XfburnMainWindow * window)
 
   dialog = xfburn_burn_image_dialog_new ();
   gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (window));
-  DBG ("Running burn image dialog");
   gtk_dialog_run (GTK_DIALOG (dialog));
-  DBG ("Destroying burn image dialog");
   gtk_widget_destroy (dialog);
 }