--- nautilus-cd-burner/ChangeLog	2004-01-30 20:04:24.000000000 +0530
+++ nautilus-cd-burner-new/ChangeLog	2004-01-31 16:46:41.000000000 +0530
@@ -1,3 +1,13 @@
++2004-01-31  Shakti Sen <shakti.sen@wipro.com>
+
+	* nautilus-cd-burner.c: (main), (open_cdcreator_cb), (cancel_cb), 
+	(help_cb), (write_files_cb): Provided support for Help, open the
+	the "CD Creator" window from "Write files to a CD recorder" dialog. 
+	Create a  Cancel button for the dialog to exit cleanly.
+	* cdburn.glade : Created the Help, Open and Cancel buttons. 
+	Also did some tabbing where ever possible ;-)
+	Patch for #119991
+
 === 0.6.4 ===
 
 2004-01-30  Alexander Larsson  <alexl@redhat.com>
--- nautilus-cd-burner/nautilus-cd-burner.c	2004-01-13 19:52:10.000000000 +0530
+++ nautilus-cd-burner-new/nautilus-cd-burner.c	2004-01-31 16:45:20.000000000 +0530
@@ -21,6 +21,10 @@
   
    Authors: Alexander Larsson <alexl@redhat.com>
 */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <gtk/gtk.h>
 #include <gtk/gtkfilesel.h>
 #include <gtk/gtkseparatormenuitem.h>
@@ -34,8 +38,11 @@
 #include <unistd.h>
 #include <string.h>
 
+#include <gnome.h>
+
 #include "nautilus-cd-burner.h"
 #include "make-iso.h"
+static void write_files_cb (GtkButton *button, gpointer data);
 
 static GladeXML *xml;
 
@@ -1053,7 +1060,8 @@ init_dialog (GladeXML *xml, GtkWidget *d
 	if (!are_all_files_music ("burn:///")) {
 		gtk_widget_hide (music_check);	
 	}
-	g_signal_connect (music_check, "toggled", (GCallback)music_cd_toggled, xml);
+	g_signal_connect (music_check, "toggled", 
+			  (GCallback)music_cd_toggled, xml);
 
 	
 	refresh_dialog (xml);
@@ -1177,30 +1185,72 @@ my_gdk_pixbuf_new_from_stock (const char
 	return icon;
 }
 
+static void
+open_cdcreator_cb (GtkButton *button, gpointer data)
+{
+	char *argv[] = {"nautilus", "--no-desktop", "burn:///", NULL};
+
+	g_spawn_async (NULL, argv, NULL,
+		       G_SPAWN_SEARCH_PATH,
+		       NULL, NULL, NULL, NULL);
+}
+
+static void
+help_cb (GtkButton *button, gpointer data)
+{
+	GError *error = NULL;
+                                                                               
+	gnome_help_display_desktop (NULL, 
+			            "user-guide",
+			            "wgosnautilus.xml",
+			            "gosnautilus-475",
+				    &error);
+
+
+	if (error) {
+		GtkWidget *err_dialog;
+
+		err_dialog = gtk_message_dialog_new (GTK_WINDOW (data),
+						     GTK_DIALOG_DESTROY_WITH_PARENT,
+						     GTK_MESSAGE_ERROR,
+						     GTK_BUTTONS_CLOSE,
+						     _("There was an error displaying help: %s"),
+						     error->message);
+                                                                                
+		g_signal_connect (G_OBJECT (err_dialog),
+				  "response", G_CALLBACK (gtk_widget_destroy),
+				  NULL);
+		gtk_window_set_resizable (GTK_WINDOW (err_dialog), FALSE);
+		gtk_widget_show (err_dialog);
+		g_error_free (error);
+	}
+}
+
 int
 main (int argc, char *argv[])
 {
-	CDDrive *rec;
-	GtkWidget *dialog, *entry, *eject_check, *blank_check, *music_check, *reuse_check, *progress_window;
-	GtkWidget *cancel_button, *dummy_check, *option_menu, *item;
-	const char *label;
-	int res, speed;
-	gboolean eject, blank, music, reuse, dummy;
-	GnomeVFSURI *uri;
+	GtkWidget *dialog;
+	GtkWidget *cancel_button, *dummy_check;
+	GtkWidget *write_button, *open_button, *help_button;
+	int res;
 	GnomeVFSFileSize size;
 	char *source_iso, *disc_name = NULL;
 	struct stat stat_buf;
-	GConfClient *gc;
 	GdkPixbuf *icon;
 
 	bindtextdomain (GETTEXT_PACKAGE, GNOMELOCALEDIR);
 	bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
 	textdomain (GETTEXT_PACKAGE);
     
-	recorders = scan_for_cdroms (TRUE, TRUE);
 	
-	gtk_init (&argc, &argv);
-	gnome_vfs_init ();
+	recorders = scan_for_cdroms (TRUE, TRUE);
+
+	gnome_program_init (PACKAGE, VERSION,
+			    LIBGNOMEUI_MODULE,
+			    argc, argv,
+			    GNOME_PARAM_APP_DATADIR, DATADIR,
+		 	    NULL);
+ 	
 
 	if (argc > 2) {
 		dialog = gtk_message_dialog_new (NULL,
@@ -1263,6 +1313,9 @@ main (int argc, char *argv[])
 	dialog = glade_xml_get_widget (xml, "cdr_dialog");
 
 	init_dialog (xml, dialog, size, disc_name, source_iso != NULL);
+	g_signal_connect (G_OBJECT (dialog), "delete_event", 
+			  (GCallback)gtk_main_quit, NULL);
+
 
 	if (disc_name != NULL) g_free (disc_name);
 
@@ -1277,67 +1330,119 @@ main (int argc, char *argv[])
 	icon = my_gdk_pixbuf_new_from_stock ("gtk-cdrom");
 	gtk_window_set_icon (GTK_WINDOW (dialog), icon);
 	gdk_pixbuf_unref (icon);
-	res = gtk_dialog_run (GTK_DIALOG (dialog));
 
-	gtk_widget_hide (dialog);
-	progress_window = glade_xml_get_widget (xml, "progress_window");
-	cd_progress_image_setup ();
-	gtk_widget_show (progress_window);
-	cancel_button = glade_xml_get_widget (xml, "cancel_button");
-	g_signal_connect (cancel_button, "clicked", (GCallback)cancel_clicked, NULL);
-	g_signal_connect (progress_window, "delete_event", (GCallback)handle_delete_event, NULL);
+	write_button = glade_xml_get_widget (xml, "write_button");
+
+	if (write_button) {
+		g_signal_connect (write_button, "clicked", 
+				  (GCallback)write_files_cb, source_iso);
+		g_object_set_data (G_OBJECT (write_button), "get_dialog", 
+				   dialog);
+	}
+
+	help_button = glade_xml_get_widget (xml, "help_button");
+
+	if (help_button)
+		g_signal_connect (help_button, "clicked", 
+				  (GCallback)help_cb, dialog);
+
+	cancel_button = glade_xml_get_widget (xml, "cancel1_button");
+
+	if (cancel_button)
+		g_signal_connect (cancel_button, "clicked",
+				  (GCallback) gtk_main_quit, NULL);
 
-	if (res == 0) {
-		rec = lookup_current_recorder (xml);
+	open_button = glade_xml_get_widget (xml, "open_cd_creator_button");
+
+	if (open_button)
+		g_signal_connect (open_button, "clicked", 
+				  (GCallback)open_cdcreator_cb, NULL);
+
+	gtk_main ();
+
+	return 0;
+}
+
+
+static void
+write_files_cb (GtkButton *button, gpointer data)
+{
+	CDDrive *rec;
+	GtkWidget *dialog, *entry, *eject_check, *blank_check;
+	GtkWidget *music_check, *reuse_check, *progress_window;
+	GtkWidget *cancel_button, *option_menu, *item;
+	GtkWidget *dummy_check;
+	int res, speed;
+	gboolean eject, blank, music, reuse, dummy;
+	GConfClient *gc;
+	const char *label;
+	char *source_iso = (char *)data;
+
+	rec = lookup_current_recorder (xml);
 		
-		entry = glade_xml_get_widget (xml, "cdname_entry");
-		label = gtk_entry_get_text (GTK_ENTRY (entry));
+	entry = glade_xml_get_widget (xml, "cdname_entry");
+	label = gtk_entry_get_text (GTK_ENTRY (entry));
 
-		eject_check = glade_xml_get_widget (xml, "eject_check");
-		eject = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (eject_check));
+	eject_check = glade_xml_get_widget (xml, "eject_check");
+	eject = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (eject_check));
 
-		blank_check = glade_xml_get_widget (xml, "blank_check");
-		blank = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (blank_check));
+	blank_check = glade_xml_get_widget (xml, "blank_check");
+	blank = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (blank_check));
 
-		music_check = glade_xml_get_widget (xml, "music_check");
-		music = (rec->type != CDDRIVE_TYPE_FILE) &&
-			gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (music_check));
+	music_check = glade_xml_get_widget (xml, "music_check");
+	music = (rec->type != CDDRIVE_TYPE_FILE) &&
+		 gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (music_check));
 	
-		dummy = FALSE;
+	dummy = FALSE;
 
+	dummy_check = glade_xml_get_widget (xml, "dummy_check");
 #ifdef ENABLE_DUMMY_WRITE
-		dummy = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (dummy_check));
+	dummy = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (dummy_check));
 #endif
 
-		option_menu = glade_xml_get_widget (xml, "speed_optionmenu");
-		item = gtk_menu_get_active (GTK_MENU (gtk_option_menu_get_menu (GTK_OPTION_MENU (option_menu))));
-		speed = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (item), "speed"));
-		gc = gconf_client_get_default ();
-		gconf_client_set_int (gc, "/apps/nautilus-cd-burner/default_speed", speed, NULL);
-		g_object_unref (G_OBJECT (gc));
+	option_menu = glade_xml_get_widget (xml, "speed_optionmenu");
+	item = gtk_menu_get_active (GTK_MENU (gtk_option_menu_get_menu (GTK_OPTION_MENU (option_menu))));
+
+	speed = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (item), "speed"));
+
+	gc = gconf_client_get_default ();
+	gconf_client_set_int (gc, "/apps/nautilus-cd-burner/default_speed", speed, NULL);
+	g_object_unref (G_OBJECT (gc));
+
+	dialog = (GtkWidget *)g_object_get_data (G_OBJECT (button), "get_dialog");
+	gtk_widget_hide (dialog);
+
+	progress_window = glade_xml_get_widget (xml, "progress_window");
+	cd_progress_image_setup ();
+	gtk_widget_show (progress_window);
+
+	cancel_button = glade_xml_get_widget (xml, "cancel_button");
+	g_signal_connect (cancel_button, "clicked", (GCallback)cancel_clicked, NULL);
+	g_signal_connect (progress_window, "delete_event", (GCallback)handle_delete_event, NULL);
+
 
-		res = burn_cd (rec, source_iso, label, eject, blank, music, speed, dummy);
+	res = burn_cd (rec, source_iso, label, eject, blank, music, speed, dummy);
 
-		reuse_check = glade_xml_get_widget (xml, "reuse_check");
-		reuse = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (reuse_check));
+	reuse_check = glade_xml_get_widget (xml, "reuse_check");
+	reuse = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (reuse_check));
 
-		if (!reuse && res == RESULT_FINISHED) {
-			GList l;
+	if (!reuse && res == RESULT_FINISHED) {
+		GList l;
+		GnomeVFSURI *uri;
 			
-			uri = gnome_vfs_uri_new ("burn:///");
+		uri = gnome_vfs_uri_new ("burn:///");
 			
-			l.data = uri;
-			l.next = NULL;
-			l.prev = NULL;
-
-			gnome_vfs_xfer_delete_list (&l,
-						    GNOME_VFS_XFER_ERROR_MODE_ABORT,
-						    GNOME_VFS_XFER_RECURSIVE,
-						    NULL, NULL);
-		}
+		l.data = uri;
+		l.next = NULL;
+		l.prev = NULL;
+
+		gnome_vfs_xfer_delete_list (&l,
+					    GNOME_VFS_XFER_ERROR_MODE_ABORT,
+					    GNOME_VFS_XFER_RECURSIVE,
+					    NULL, NULL);
 	}
 
 	cd_progress_image_cleanup ();
 
-	return 0;
+	gtk_main_quit ();
 }
--- nautilus-cd-burner/cdburn.glade	2003-08-30 16:05:57.000000000 +0530
+++ nautilus-cd-burner-new/cdburn.glade	2004-01-31 15:25:06.000000000 +0530
@@ -12,6 +12,11 @@
   <property name="modal">False</property>
   <property name="resizable">True</property>
   <property name="destroy_with_parent">False</property>
+  <property name="decorated">True</property>
+  <property name="skip_taskbar_hint">False</property>
+  <property name="skip_pager_hint">False</property>
+  <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
+  <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
   <property name="has_separator">False</property>
 
   <child internal-child="vbox">
@@ -26,68 +31,28 @@
 	  <property name="layout_style">GTK_BUTTONBOX_END</property>
 
 	  <child>
-	    <widget class="GtkButton" id="write_button">
+	    <widget class="GtkButton" id="cancel1_button">
 	      <property name="visible">True</property>
 	      <property name="can_default">True</property>
 	      <property name="can_focus">True</property>
+	      <property name="label">gtk-cancel</property>
+	      <property name="use_stock">True</property>
 	      <property name="relief">GTK_RELIEF_NORMAL</property>
-	      <property name="response_id">0</property>
-
-	      <child>
-		<widget class="GtkAlignment" id="alignment1">
-		  <property name="visible">True</property>
-		  <property name="xalign">0.5</property>
-		  <property name="yalign">0.5</property>
-		  <property name="xscale">0</property>
-		  <property name="yscale">0</property>
-
-		  <child>
-		    <widget class="GtkHBox" id="hbox2">
-		      <property name="visible">True</property>
-		      <property name="homogeneous">False</property>
-		      <property name="spacing">2</property>
-
-		      <child>
-			<widget class="GtkImage" id="image1">
-			  <property name="visible">True</property>
-			  <property name="stock">gtk-cdrom</property>
-			  <property name="icon_size">4</property>
-			  <property name="xalign">0.5</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
-			</widget>
-			<packing>
-			  <property name="padding">0</property>
-			  <property name="expand">False</property>
-			  <property name="fill">False</property>
-			</packing>
-		      </child>
+	      <property name="focus_on_click">True</property>
+	      <property name="response_id">-6</property>
+	    </widget>
+	  </child>
 
-		      <child>
-			<widget class="GtkLabel" id="label12">
-			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">Write files to CD</property>
-			  <property name="use_underline">True</property>
-			  <property name="use_markup">False</property>
-			  <property name="justify">GTK_JUSTIFY_LEFT</property>
-			  <property name="wrap">False</property>
-			  <property name="selectable">False</property>
-			  <property name="xalign">0.5</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
-			</widget>
-			<packing>
-			  <property name="padding">0</property>
-			  <property name="expand">False</property>
-			  <property name="fill">False</property>
-			</packing>
-		      </child>
-		    </widget>
-		  </child>
-		</widget>
-	      </child>
+	  <child>
+	    <widget class="GtkButton" id="help_button">
+	      <property name="visible">True</property>
+	      <property name="can_default">True</property>
+	      <property name="can_focus">True</property>
+	      <property name="label">gtk-help</property>
+	      <property name="use_stock">True</property>
+	      <property name="relief">GTK_RELIEF_NORMAL</property>
+	      <property name="focus_on_click">True</property>
+	      <property name="response_id">-11</property>
 	    </widget>
 	  </child>
 	</widget>
@@ -108,7 +73,7 @@
 	  <child>
 	    <widget class="GtkLabel" id="top_label">
 	      <property name="visible">True</property>
-	      <property name="label">You have selected 185 megabytes of files to be written to the CD.</property>
+	      <property name="label" translatable="yes">You have selected 185 megabytes of files to be written to the CD.</property>
 	      <property name="use_underline">False</property>
 	      <property name="use_markup">True</property>
 	      <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -281,102 +246,284 @@
 	  </child>
 
 	  <child>
-	    <widget class="GtkVBox" id="vbox4">
+	    <widget class="GtkHBox" id="hbox3">
 	      <property name="visible">True</property>
 	      <property name="homogeneous">False</property>
 	      <property name="spacing">0</property>
 
 	      <child>
-		<widget class="GtkCheckButton" id="music_check">
+		<widget class="GtkVBox" id="vbox4">
 		  <property name="visible">True</property>
-		  <property name="tooltip" translatable="yes">Create a CD that you can use with ordinary stereo equipment</property>
-		  <property name="can_focus">True</property>
-		  <property name="label" translatable="yes">Create a music CD</property>
-		  <property name="use_underline">True</property>
-		  <property name="relief">GTK_RELIEF_NORMAL</property>
-		  <property name="active">False</property>
-		  <property name="inconsistent">False</property>
-		  <property name="draw_indicator">True</property>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">False</property>
-		  <property name="fill">False</property>
-		</packing>
-	      </child>
+		  <property name="homogeneous">False</property>
+		  <property name="spacing">0</property>
 
-	      <child>
-		<widget class="GtkCheckButton" id="blank_check">
-		  <property name="visible">True</property>
-		  <property name="tooltip" translatable="yes">Erase entire contents of CD before writing</property>
-		  <property name="can_focus">True</property>
-		  <property name="label" translatable="yes">Erase CD</property>
-		  <property name="use_underline">True</property>
-		  <property name="relief">GTK_RELIEF_NORMAL</property>
-		  <property name="active">False</property>
-		  <property name="inconsistent">False</property>
-		  <property name="draw_indicator">True</property>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">False</property>
-		  <property name="fill">False</property>
-		</packing>
-	      </child>
+		  <child>
+		    <widget class="GtkCheckButton" id="music_check">
+		      <property name="visible">True</property>
+		      <property name="tooltip" translatable="yes">Create a CD that you can use with ordinary stereo equipment</property>
+		      <property name="can_focus">True</property>
+		      <property name="label" translatable="yes">Create a music CD</property>
+		      <property name="use_underline">True</property>
+		      <property name="relief">GTK_RELIEF_NORMAL</property>
+		      <property name="focus_on_click">True</property>
+		      <property name="active">False</property>
+		      <property name="inconsistent">False</property>
+		      <property name="draw_indicator">True</property>
+		    </widget>
+		    <packing>
+		      <property name="padding">0</property>
+		      <property name="expand">False</property>
+		      <property name="fill">False</property>
+		    </packing>
+		  </child>
 
-	      <child>
-		<widget class="GtkCheckButton" id="eject_check">
-		  <property name="visible">True</property>
-		  <property name="tooltip" translatable="yes">When the write is done, eject the CD tray</property>
-		  <property name="can_focus">True</property>
-		  <property name="label" translatable="yes">Eject CD when done</property>
-		  <property name="use_underline">True</property>
-		  <property name="relief">GTK_RELIEF_NORMAL</property>
-		  <property name="active">True</property>
-		  <property name="inconsistent">False</property>
-		  <property name="draw_indicator">True</property>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">False</property>
-		  <property name="fill">False</property>
-		</packing>
-	      </child>
+		  <child>
+		    <widget class="GtkCheckButton" id="blank_check">
+		      <property name="visible">True</property>
+		      <property name="tooltip" translatable="yes">Erase entire contents of CD before writing</property>
+		      <property name="can_focus">True</property>
+		      <property name="label" translatable="yes">Erase CD</property>
+		      <property name="use_underline">True</property>
+		      <property name="relief">GTK_RELIEF_NORMAL</property>
+		      <property name="focus_on_click">True</property>
+		      <property name="active">False</property>
+		      <property name="inconsistent">False</property>
+		      <property name="draw_indicator">True</property>
+		    </widget>
+		    <packing>
+		      <property name="padding">0</property>
+		      <property name="expand">False</property>
+		      <property name="fill">False</property>
+		    </packing>
+		  </child>
 
-	      <child>
-		<widget class="GtkCheckButton" id="reuse_check">
-		  <property name="visible">True</property>
-		  <property name="tooltip" translatable="yes">Keep the selected files so that you can use them for another CD</property>
-		  <property name="can_focus">True</property>
-		  <property name="label" translatable="yes">Reuse these files for another CD</property>
-		  <property name="use_underline">True</property>
-		  <property name="relief">GTK_RELIEF_NORMAL</property>
-		  <property name="active">False</property>
-		  <property name="inconsistent">False</property>
-		  <property name="draw_indicator">True</property>
+		  <child>
+		    <widget class="GtkCheckButton" id="eject_check">
+		      <property name="visible">True</property>
+		      <property name="tooltip" translatable="yes">When the write is done, eject the CD tray</property>
+		      <property name="can_focus">True</property>
+		      <property name="label" translatable="yes">Eject CD when done</property>
+		      <property name="use_underline">True</property>
+		      <property name="relief">GTK_RELIEF_NORMAL</property>
+		      <property name="focus_on_click">True</property>
+		      <property name="active">True</property>
+		      <property name="inconsistent">False</property>
+		      <property name="draw_indicator">True</property>
+		    </widget>
+		    <packing>
+		      <property name="padding">0</property>
+		      <property name="expand">False</property>
+		      <property name="fill">False</property>
+		    </packing>
+		  </child>
+
+		  <child>
+		    <widget class="GtkCheckButton" id="reuse_check">
+		      <property name="visible">True</property>
+		      <property name="tooltip" translatable="yes">Keep the selected files so that you can use them for another CD</property>
+		      <property name="can_focus">True</property>
+		      <property name="label" translatable="yes">Reuse these files for another CD</property>
+		      <property name="use_underline">True</property>
+		      <property name="relief">GTK_RELIEF_NORMAL</property>
+		      <property name="focus_on_click">True</property>
+		      <property name="active">False</property>
+		      <property name="inconsistent">False</property>
+		      <property name="draw_indicator">True</property>
+		    </widget>
+		    <packing>
+		      <property name="padding">0</property>
+		      <property name="expand">False</property>
+		      <property name="fill">False</property>
+		    </packing>
+		  </child>
+
+		  <child>
+		    <widget class="GtkCheckButton" id="dummy_check">
+		      <property name="visible">True</property>
+		      <property name="can_focus">True</property>
+		      <property name="label" translatable="yes">Dummy write (debug build)</property>
+		      <property name="use_underline">True</property>
+		      <property name="relief">GTK_RELIEF_NORMAL</property>
+		      <property name="focus_on_click">True</property>
+		      <property name="active">True</property>
+		      <property name="inconsistent">False</property>
+		      <property name="draw_indicator">True</property>
+		    </widget>
+		    <packing>
+		      <property name="padding">0</property>
+		      <property name="expand">False</property>
+		      <property name="fill">False</property>
+		    </packing>
+		  </child>
 		</widget>
 		<packing>
 		  <property name="padding">0</property>
-		  <property name="expand">False</property>
-		  <property name="fill">False</property>
+		  <property name="expand">True</property>
+		  <property name="fill">True</property>
 		</packing>
 	      </child>
 
 	      <child>
-		<widget class="GtkCheckButton" id="dummy_check">
+		<widget class="GtkVBox" id="vbox6">
 		  <property name="visible">True</property>
-		  <property name="can_focus">True</property>
-		  <property name="label" translatable="yes">Dummy write (debug build)</property>
-		  <property name="use_underline">True</property>
-		  <property name="relief">GTK_RELIEF_NORMAL</property>
-		  <property name="active">True</property>
-		  <property name="inconsistent">False</property>
-		  <property name="draw_indicator">True</property>
+		  <property name="homogeneous">False</property>
+		  <property name="spacing">0</property>
+
+		  <child>
+		    <widget class="GtkButton" id="open_cd_creator_button">
+		      <property name="visible">True</property>
+		      <property name="can_focus">True</property>
+		      <property name="relief">GTK_RELIEF_NORMAL</property>
+		      <property name="focus_on_click">True</property>
+
+		      <child>
+			<widget class="GtkAlignment" id="alignment3">
+			  <property name="visible">True</property>
+			  <property name="xalign">0.5</property>
+			  <property name="yalign">0.5</property>
+			  <property name="xscale">0</property>
+			  <property name="yscale">0</property>
+			  <property name="top_padding">0</property>
+			  <property name="bottom_padding">0</property>
+			  <property name="left_padding">0</property>
+			  <property name="right_padding">0</property>
+
+			  <child>
+			    <widget class="GtkHBox" id="hbox5">
+			      <property name="visible">True</property>
+			      <property name="homogeneous">False</property>
+			      <property name="spacing">2</property>
+
+			      <child>
+				<widget class="GtkImage" id="image3">
+				  <property name="visible">True</property>
+				  <property name="stock">gtk-open</property>
+				  <property name="icon_size">4</property>
+				  <property name="xalign">0.5</property>
+				  <property name="yalign">0.5</property>
+				  <property name="xpad">0</property>
+				  <property name="ypad">0</property>
+				</widget>
+				<packing>
+				  <property name="padding">0</property>
+				  <property name="expand">False</property>
+				  <property name="fill">False</property>
+				</packing>
+			      </child>
+
+			      <child>
+				<widget class="GtkLabel" id="label14">
+				  <property name="visible">True</property>
+				  <property name="label" translatable="yes">_Open CD Creator</property>
+				  <property name="use_underline">True</property>
+				  <property name="use_markup">False</property>
+				  <property name="justify">GTK_JUSTIFY_LEFT</property>
+				  <property name="wrap">False</property>
+				  <property name="selectable">False</property>
+				  <property name="xalign">0.5</property>
+				  <property name="yalign">0.5</property>
+				  <property name="xpad">0</property>
+				  <property name="ypad">0</property>
+				  <property name="mnemonic_widget">open_cd_creator_button</property>
+				</widget>
+				<packing>
+				  <property name="padding">0</property>
+				  <property name="expand">False</property>
+				  <property name="fill">False</property>
+				</packing>
+			      </child>
+			    </widget>
+			  </child>
+			</widget>
+		      </child>
+		    </widget>
+		    <packing>
+		      <property name="padding">0</property>
+		      <property name="expand">False</property>
+		      <property name="fill">False</property>
+		    </packing>
+		  </child>
+
+		  <child>
+		    <widget class="GtkButton" id="write_button">
+		      <property name="visible">True</property>
+		      <property name="can_default">True</property>
+		      <property name="can_focus">True</property>
+		      <property name="relief">GTK_RELIEF_NORMAL</property>
+		      <property name="focus_on_click">True</property>
+
+		      <child>
+			<widget class="GtkAlignment" id="alignment2">
+			  <property name="visible">True</property>
+			  <property name="xalign">0.5</property>
+			  <property name="yalign">0.5</property>
+			  <property name="xscale">0</property>
+			  <property name="yscale">0</property>
+			  <property name="top_padding">0</property>
+			  <property name="bottom_padding">0</property>
+			  <property name="left_padding">0</property>
+			  <property name="right_padding">0</property>
+
+			  <child>
+			    <widget class="GtkHBox" id="hbox4">
+			      <property name="visible">True</property>
+			      <property name="homogeneous">False</property>
+			      <property name="spacing">2</property>
+
+			      <child>
+				<widget class="GtkImage" id="image2">
+				  <property name="visible">True</property>
+				  <property name="stock">gtk-cdrom</property>
+				  <property name="icon_size">4</property>
+				  <property name="xalign">0.5</property>
+				  <property name="yalign">0.5</property>
+				  <property name="xpad">0</property>
+				  <property name="ypad">0</property>
+				</widget>
+				<packing>
+				  <property name="padding">0</property>
+				  <property name="expand">False</property>
+				  <property name="fill">False</property>
+				</packing>
+			      </child>
+
+			      <child>
+				<widget class="GtkLabel" id="label13">
+				  <property name="visible">True</property>
+				  <property name="label" translatable="yes">_Write files to CD</property>
+				  <property name="use_underline">True</property>
+				  <property name="use_markup">False</property>
+				  <property name="justify">GTK_JUSTIFY_LEFT</property>
+				  <property name="wrap">False</property>
+				  <property name="selectable">False</property>
+				  <property name="xalign">0.5</property>
+				  <property name="yalign">0.5</property>
+				  <property name="xpad">0</property>
+				  <property name="ypad">0</property>
+				  <property name="mnemonic_widget">write_button</property>
+				</widget>
+				<packing>
+				  <property name="padding">0</property>
+				  <property name="expand">False</property>
+				  <property name="fill">False</property>
+				</packing>
+			      </child>
+			    </widget>
+			  </child>
+			</widget>
+		      </child>
+		    </widget>
+		    <packing>
+		      <property name="padding">10</property>
+		      <property name="expand">False</property>
+		      <property name="fill">False</property>
+		    </packing>
+		  </child>
 		</widget>
 		<packing>
 		  <property name="padding">0</property>
-		  <property name="expand">False</property>
-		  <property name="fill">False</property>
+		  <property name="expand">True</property>
+		  <property name="fill">True</property>
 		</packing>
 	      </child>
 	    </widget>
@@ -404,6 +551,11 @@
   <property name="modal">False</property>
   <property name="resizable">False</property>
   <property name="destroy_with_parent">False</property>
+  <property name="decorated">True</property>
+  <property name="skip_taskbar_hint">False</property>
+  <property name="skip_pager_hint">False</property>
+  <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
+  <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
 
   <child>
     <widget class="GtkVBox" id="vbox5">
@@ -535,6 +687,7 @@
 	      <property name="label">gtk-cancel</property>
 	      <property name="use_stock">True</property>
 	      <property name="relief">GTK_RELIEF_NORMAL</property>
+	      <property name="focus_on_click">True</property>
 	    </widget>
 	  </child>
 
@@ -545,6 +698,7 @@
 	      <property name="label">gtk-close</property>
 	      <property name="use_stock">True</property>
 	      <property name="relief">GTK_RELIEF_NORMAL</property>
+	      <property name="focus_on_click">True</property>
 	    </widget>
 	  </child>
 	</widget>
