[Xfce4-commits] r22743 - xarchiver/branches/xarchiver-psybsd/src

[Stephan Arts]

Author: stephan
Date: 2006-08-13 10:39:46 +0000 (Sun, 13 Aug 2006)
New Revision: 22743

Modified:
   xarchiver/branches/xarchiver-psybsd/src/extract_dialog.h
   xarchiver/branches/xarchiver-psybsd/src/main.c
   xarchiver/branches/xarchiver-psybsd/src/new_dialog.c
   xarchiver/branches/xarchiver-psybsd/src/new_dialog.h
Log:

-- extract_dialog and new_dialog now extend FileChooserDialog again.



Modified: xarchiver/branches/xarchiver-psybsd/src/extract_dialog.h
===================================================================
--- xarchiver/branches/xarchiver-psybsd/src/extract_dialog.h	2006-08-13 10:15:44 UTC (rev 22742)
+++ xarchiver/branches/xarchiver-psybsd/src/extract_dialog.h	2006-08-13 10:39:46 UTC (rev 22743)
@@ -42,7 +42,7 @@
 
 struct _XAExtractArchiveDialog
 {
-	GtkFileSelection parent;
+	GtkFileChooserDialog parent;
 	LXAArchive *archive;
 };
 
@@ -50,7 +50,7 @@
 
 struct _XAExtractArchiveDialogClass
 {
-	GtkFileSelectionClass parent;
+	GtkFileChooserDialog parent_class;
 };
 
 GtkWidget *xa_extract_archive_dialog_new();

Modified: xarchiver/branches/xarchiver-psybsd/src/main.c
===================================================================
--- xarchiver/branches/xarchiver-psybsd/src/main.c	2006-08-13 10:15:44 UTC (rev 22742)
+++ xarchiver/branches/xarchiver-psybsd/src/main.c	2006-08-13 10:39:46 UTC (rev 22743)
@@ -155,6 +155,10 @@
 			}
 			if(lxa_new_archive(add_archive_path, TRUE, NULL, &lpArchive))
 			{
+				dialog = gtk_message_dialog_new (NULL,GTK_DIALOG_MODAL,GTK_MESSAGE_ERROR,GTK_BUTTONS_OK,_("Could not create archive, MIME-type unsupported"));
+				gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_YES);
+				gtk_dialog_run (GTK_DIALOG (dialog) );
+				gtk_widget_destroy (GTK_WIDGET (dialog) );
 				/* Could not create archive (mime type unsupported) */
 				return 1;
 			}

Modified: xarchiver/branches/xarchiver-psybsd/src/new_dialog.c
===================================================================
--- xarchiver/branches/xarchiver-psybsd/src/new_dialog.c	2006-08-13 10:15:44 UTC (rev 22742)
+++ xarchiver/branches/xarchiver-psybsd/src/new_dialog.c	2006-08-13 10:39:46 UTC (rev 22743)
@@ -80,15 +80,11 @@
 {
 	GtkWidget *dialog;
 
-	dialog = g_object_new(xa_new_archive_dialog_get_type(), "title", _("Create new archive"), "action", GTK_FILE_CHOOSER_ACTION_SAVE, "do-overwrite-confirmation", TRUE, NULL);
+	dialog = g_object_new(xa_new_archive_dialog_get_type(),
+			"title", _("Create new archive"),
+			"action", GTK_FILE_CHOOSER_ACTION_SAVE,
+			"do-overwrite-confirmation", TRUE,
+			NULL);
 
 	return dialog;
 }
-
-gchar *
-xa_new_archive_dialog_get_filename (XANewArchiveDialog *dialog)
-{
-	gchar *filename = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(dialog));
-
-	return filename;
-}

Modified: xarchiver/branches/xarchiver-psybsd/src/new_dialog.h
===================================================================
--- xarchiver/branches/xarchiver-psybsd/src/new_dialog.h	2006-08-13 10:15:44 UTC (rev 22742)
+++ xarchiver/branches/xarchiver-psybsd/src/new_dialog.h	2006-08-13 10:39:46 UTC (rev 22743)
@@ -42,24 +42,17 @@
 
 struct _XANewArchiveDialog
 {
-	GtkFileSelection parent;
-	GtkWidget *filetype_selector;
-	GtkListStore *filetype_model;
-	GSList *archivetype_list;
-	GSList *compressiontype_list;
+	GtkFileChooserDialog parent;
 };
 
 typedef struct _XANewArchiveDialogClass XANewArchiveDialogClass;
 
 struct _XANewArchiveDialogClass
 {
-	GtkFileSelectionClass parent;
+	GtkFileChooserDialogClass parent;
 };
 
 GtkWidget *xa_new_archive_dialog_new();
 
-gchar *            xa_new_archive_dialog_get_filename (XANewArchiveDialog *dialog);
-gchar *            xa_new_archive_dialog_get_mimetype (XANewArchiveDialog *dialog);
-
 G_END_DECLS
 #endif /* __XARCHIVER_NEW_ARCHIVE_DIALOG_H__ */