Author: pollux
Date: 2006-07-20 23:18:31 +0000 (Thu, 20 Jul 2006)
New Revision: 22501
Modified:
xfburn/trunk/xfburn/xfburn-disc-content.c
xfburn/trunk/xfburn/xfburn-main-window.c
xfburn/trunk/xfburn/xfburn-main-window.h
Log:
XfburnDiscContent handles the burn option dialog on its own
Modified: xfburn/trunk/xfburn/xfburn-disc-content.c
===================================================================
--- xfburn/trunk/xfburn/xfburn-disc-content.c 2006-07-20 22:14:57 UTC (rev
22500)
+++ xfburn/trunk/xfburn/xfburn-disc-content.c 2006-07-20 23:18:31 UTC (rev
22501)
@@ -49,6 +49,7 @@
#include "xfburn-adding-progress.h"
#endif
+#include "xfburn-burn-composition-dialog.h"
#include "xfburn-disc-usage.h"
#include "xfburn-main-window.h"
#include "xfburn-utils.h"
@@ -78,6 +79,7 @@
GtkTreeViewDropPosition position);
static gboolean add_file_to_list (XfburnDiscContent * dc, GtkTreeModel *
model, const gchar * path, GtkTreeIter * iter,
GtkTreeIter * insertion,
GtkTreeViewDropPosition position);
+static gboolean generate_file_list (XfburnDiscContent * dc, gchar ** tmpfile);
enum
{
@@ -316,8 +318,17 @@
cb_begin_burn (XfburnDiscUsage * du, XfburnDiscContent * dc)
{
XfburnMainWindow *mainwin = xfburn_main_window_get_instance ();
+ GtkWidget *dialog;
+ gchar *tmpfile = NULL;
+
+ generate_file_list (XFBURN_DISC_CONTENT (dc), &tmpfile);
+
+ dialog = xfburn_burn_composition_dialog_new (tmpfile);
+ gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (mainwin));
+ gtk_dialog_run (GTK_DIALOG (dialog));
+ gtk_widget_destroy (dialog);
- xfburn_main_window_burn_composition (mainwin, dc);
+ g_free (tmpfile);
}
@@ -856,28 +867,9 @@
return FALSE;
}
-/* public methods */
-GtkWidget *
-xfburn_disc_content_new (void)
+static gboolean
+generate_file_list (XfburnDiscContent * dc, gchar ** tmpfile)
{
- return g_object_new (xfburn_disc_content_get_type (), NULL);
-}
-
-void
-xfburn_disc_content_hide_toolbar (XfburnDiscContent * content)
-{
- gtk_widget_hide (content->priv->toolbar);
-}
-
-void
-xfburn_disc_content_show_toolbar (XfburnDiscContent * content)
-{
- gtk_widget_show (content->priv->toolbar);
-}
-
-gboolean
-xfburn_disc_content_generate_file_list (XfburnDiscContent * dc, gchar **
tmpfile)
-{
GError *error = NULL;
FILE *file_tmp;
int fd_tmpfile;
@@ -898,6 +890,27 @@
return TRUE;
}
+/******************/
+/* public methods */
+/******************/
+GtkWidget *
+xfburn_disc_content_new (void)
+{
+ return g_object_new (xfburn_disc_content_get_type (), NULL);
+}
+
+void
+xfburn_disc_content_hide_toolbar (XfburnDiscContent * content)
+{
+ gtk_widget_hide (content->priv->toolbar);
+}
+
+void
+xfburn_disc_content_show_toolbar (XfburnDiscContent * content)
+{
+ gtk_widget_show (content->priv->toolbar);
+}
+
/****************/
/* loading code */
/****************/
Modified: xfburn/trunk/xfburn/xfburn-main-window.c
===================================================================
--- xfburn/trunk/xfburn/xfburn-main-window.c 2006-07-20 22:14:57 UTC (rev
22500)
+++ xfburn/trunk/xfburn/xfburn-main-window.c 2006-07-20 23:18:31 UTC (rev
22501)
@@ -33,7 +33,6 @@
#include "xfburn-disc-content.h"
#include "xfburn-blank-cd-dialog.h"
#include "xfburn-copy-cd-dialog.h"
-#include "xfburn-burn-composition-dialog.h"
#include "xfburn-burn-image-dialog.h"
#include "xfburn-progress-dialog.h"
#include "xfburn-settings.h"
@@ -533,19 +532,3 @@
return instance;
}
-void
-xfburn_main_window_burn_composition (XfburnMainWindow * window,
XfburnDiscContent *dc)
-{
- GtkWidget *dialog;
- gchar *tmpfile = NULL;
-
- xfburn_disc_content_generate_file_list (XFBURN_DISC_CONTENT
(window->disc_content), &tmpfile);
-
- dialog = xfburn_burn_composition_dialog_new (tmpfile);
- gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (window));
- gtk_dialog_run (GTK_DIALOG (dialog));
- gtk_widget_destroy (dialog);
-
- g_free (tmpfile);
-}
-
Modified: xfburn/trunk/xfburn/xfburn-main-window.h
===================================================================
--- xfburn/trunk/xfburn/xfburn-main-window.h 2006-07-20 22:14:57 UTC (rev
22500)
+++ xfburn/trunk/xfburn/xfburn-main-window.h 2006-07-20 23:18:31 UTC (rev
22501)
@@ -60,7 +60,6 @@
GtkWidget *xfburn_main_window_new (void);
XfburnMainWindow *xfburn_main_window_get_instance (void);
-void xfburn_main_window_burn_composition (XfburnMainWindow * window,
XfburnDiscContent *dc);
G_END_DECLS
#endif
_______________________________________________
Xfce4-commits mailing list
[email protected]
http://foo-projects.org/mailman/listinfo/xfce4-commits
