Author: stephan
Date: 2007-01-15 21:02:18 +0000 (Mon, 15 Jan 2007)
New Revision: 24494
Modified:
squeeze/trunk/libsqueeze/archive-support-gnu-tar.h
squeeze/trunk/libsqueeze/archive-support-zip.h
squeeze/trunk/libsqueeze/archive.h
squeeze/trunk/libsqueeze/libsqueeze.c
squeeze/trunk/src/new_dialog.c
squeeze/trunk/src/new_dialog.h
Log:
Fixed segfault
Modified: squeeze/trunk/libsqueeze/archive-support-gnu-tar.h
===================================================================
--- squeeze/trunk/libsqueeze/archive-support-gnu-tar.h 2007-01-15 20:31:46 UTC
(rev 24493)
+++ squeeze/trunk/libsqueeze/archive-support-gnu-tar.h 2007-01-15 21:02:18 UTC
(rev 24494)
@@ -69,13 +69,13 @@
LSQArchiveSupportClass parent;
};
-GType lsq_archive_support_gnu_tar_get_type(void);
-LSQArchiveSupport * lsq_archive_support_gnu_tar_new();
+GType lsq_archive_support_gnu_tar_get_type(void)
G_GNUC_INTERNAL;
+LSQArchiveSupport * lsq_archive_support_gnu_tar_new() G_GNUC_INTERNAL;
-gint lsq_archive_support_gnu_tar_add(LSQArchive *, GSList *);
-gint lsq_archive_support_gnu_tar_extract(LSQArchive *, gchar
*, GSList *);
-gint lsq_archive_support_gnu_tar_remove(LSQArchive *, GSList
*);
-gint lsq_archive_support_gnu_tar_refresh(LSQArchive *);
+gint lsq_archive_support_gnu_tar_add(LSQArchive *, GSList *)
G_GNUC_INTERNAL;
+gint lsq_archive_support_gnu_tar_extract(LSQArchive *, gchar
*, GSList *) G_GNUC_INTERNAL;
+gint lsq_archive_support_gnu_tar_remove(LSQArchive *, GSList
*) G_GNUC_INTERNAL;
+gint lsq_archive_support_gnu_tar_refresh(LSQArchive *)
G_GNUC_INTERNAL;
G_END_DECLS
Modified: squeeze/trunk/libsqueeze/archive-support-zip.h
===================================================================
--- squeeze/trunk/libsqueeze/archive-support-zip.h 2007-01-15 20:31:46 UTC
(rev 24493)
+++ squeeze/trunk/libsqueeze/archive-support-zip.h 2007-01-15 21:02:18 UTC
(rev 24494)
@@ -65,8 +65,8 @@
LSQArchiveSupportClass parent;
};
-GType lsq_archive_support_zip_get_type(void);
-LSQArchiveSupport * lsq_archive_support_zip_new();
+GType lsq_archive_support_zip_get_type(void) G_GNUC_INTERNAL;
+LSQArchiveSupport * lsq_archive_support_zip_new() G_GNUC_INTERNAL;
G_END_DECLS
Modified: squeeze/trunk/libsqueeze/archive.h
===================================================================
--- squeeze/trunk/libsqueeze/archive.h 2007-01-15 20:31:46 UTC (rev 24493)
+++ squeeze/trunk/libsqueeze/archive.h 2007-01-15 21:02:18 UTC (rev 24494)
@@ -107,9 +107,9 @@
};
GType lsq_archive_get_type(void);
-LSQArchive *lsq_archive_new(gchar *, const gchar *);
+LSQArchive *lsq_archive_new(gchar *, const gchar *) G_GNUC_INTERNAL;
-void lsq_archive_set_status(LSQArchive *archive,
LSQArchiveStatus status);
+void lsq_archive_set_status(LSQArchive *archive,
LSQArchiveStatus status) G_GNUC_INTERNAL;
LSQArchiveStatus lsq_archive_get_status(LSQArchive *archive);
const gchar * lsq_archive_get_status_msg(LSQArchive *archive);
LSQArchiveStatus lsq_archive_get_old_status(LSQArchive *archive);
@@ -124,24 +124,24 @@
gboolean lsq_archive_iter_del_child(LSQArchive *, LSQArchiveIter *,
LSQArchiveIter *);
/* void lsq_archive_iter_set_filename(LSQArchive *, LSQArchiveIter
*, const gchar *); */
-void lsq_archive_iter_set_mime(LSQArchive *, LSQArchiveIter *,
ThunarVfsMimeInfo *);
-void lsq_archive_iter_set_prop_str(LSQArchive *, LSQArchiveIter
*, guint, const gchar *);
-void lsq_archive_iter_set_prop_uint(LSQArchive *,
LSQArchiveIter *, guint, guint);
-void lsq_archive_iter_set_prop_uint64(LSQArchive *,
LSQArchiveIter *, guint, guint64);
-void lsq_archive_iter_set_prop_value(LSQArchive *,
LSQArchiveIter *, guint, const GValue *);
-void lsq_archive_iter_set_props(LSQArchive *, LSQArchiveIter *,
...);
-void lsq_archive_iter_set_propsv(LSQArchive *, LSQArchiveIter
*, gconstpointer *);
+void lsq_archive_iter_set_mime(LSQArchive *, LSQArchiveIter *,
ThunarVfsMimeInfo *) G_GNUC_INTERNAL;
+void lsq_archive_iter_set_prop_str(LSQArchive *, LSQArchiveIter
*, guint, const gchar *) G_GNUC_INTERNAL;
+void lsq_archive_iter_set_prop_uint(LSQArchive *,
LSQArchiveIter *, guint, guint) G_GNUC_INTERNAL;
+void lsq_archive_iter_set_prop_uint64(LSQArchive *,
LSQArchiveIter *, guint, guint64) G_GNUC_INTERNAL;
+void lsq_archive_iter_set_prop_value(LSQArchive *,
LSQArchiveIter *, guint, const GValue *) G_GNUC_INTERNAL;
+void lsq_archive_iter_set_props(LSQArchive *, LSQArchiveIter *,
...) G_GNUC_INTERNAL;
+void lsq_archive_iter_set_propsv(LSQArchive *, LSQArchiveIter
*, gconstpointer *) G_GNUC_INTERNAL;
gboolean lsq_archive_iter_get_prop_value(const LSQArchive *, const
LSQArchiveIter *, guint, GValue *);
void lsq_archive_iter_get_icon_name(const LSQArchive *, const
LSQArchiveIter *, GValue *, GtkIconTheme *icon_theme);
-LSQArchiveIter *lsq_archive_add_file(LSQArchive *, const gchar *);
+LSQArchiveIter *lsq_archive_add_file(LSQArchive *, const gchar *)
G_GNUC_INTERNAL;
LSQArchiveIter *lsq_archive_get_iter(LSQArchive *, const gchar *);
GType lsq_archive_get_entry_property_type(LSQArchive *, guint);
const gchar *lsq_archive_get_entry_property_name(LSQArchive *, guint);
-void lsq_archive_clear_entry_property_types(LSQArchive *);
-void lsq_archive_set_entry_property_type(LSQArchive *, guint,
GType, const gchar *);
-void lsq_archive_set_entry_property_typesv(LSQArchive *, GType
*, const gchar **);
+void lsq_archive_clear_entry_property_types(LSQArchive *)
G_GNUC_INTERNAL;
+void lsq_archive_set_entry_property_type(LSQArchive *, guint,
GType, const gchar *) G_GNUC_INTERNAL;
+void lsq_archive_set_entry_property_typesv(LSQArchive *, GType
*, const gchar **) G_GNUC_INTERNAL;
guint lsq_archive_n_property(LSQArchive *);
guint64 lsq_archive_get_n_files(LSQArchive *);
guint64 lsq_archive_get_n_directories(LSQArchive *);
Modified: squeeze/trunk/libsqueeze/libsqueeze.c
===================================================================
--- squeeze/trunk/libsqueeze/libsqueeze.c 2007-01-15 20:31:46 UTC (rev
24493)
+++ squeeze/trunk/libsqueeze/libsqueeze.c 2007-01-15 21:02:18 UTC (rev
24494)
@@ -102,7 +102,8 @@
if(!archive)
{
archive = lsq_archive_new(path, NULL);
- lsq_opened_archive_list =
g_slist_prepend(lsq_opened_archive_list, archive);
+ if(archive)
+ lsq_opened_archive_list =
g_slist_prepend(lsq_opened_archive_list, archive);
}
(*lp_archive) = archive;
if(!archive)
Modified: squeeze/trunk/src/new_dialog.c
===================================================================
--- squeeze/trunk/src/new_dialog.c 2007-01-15 20:31:46 UTC (rev 24493)
+++ squeeze/trunk/src/new_dialog.c 2007-01-15 21:02:18 UTC (rev 24494)
@@ -73,6 +73,7 @@
dialog->append_extention_check =
gtk_check_button_new_with_label(("Append extension to filename"));
gtk_box_pack_start (GTK_BOX
(hbox),dialog->append_extention_check,FALSE, FALSE, 0);
gtk_widget_show_all(hbox);
+ gtk_widget_show_all(dialog->file_chooser);
GSList *supported_mime_types = lsq_get_supported_mime_types();
@@ -124,8 +125,10 @@
g_slist_free(supported_mime_types);
/* WHY DOESN'T THIS WORK?!*/
-
//gtk_file_chooser_add_filter(GTK_FILE_CHOOSER(GTK_FILE_CHOOSER_DIALOG(dialog)),
file_filter);
+ gtk_file_chooser_add_filter(GTK_FILE_CHOOSER(dialog->file_chooser),
file_filter);
+
gtk_file_chooser_set_do_overwrite_confirmation(GTK_FILE_CHOOSER(dialog->file_chooser),
TRUE);
+ gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog)->vbox),
dialog->file_chooser, TRUE, TRUE, 0);
gtk_box_pack_end(GTK_BOX(GTK_DIALOG(dialog)->vbox), hbox, FALSE, TRUE,
0);
gtk_dialog_add_buttons(GTK_DIALOG(dialog),
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
@@ -141,8 +144,6 @@
dialog = g_object_new(sq_new_archive_dialog_get_type(),
"title", _("Create new archive"),
- "action", GTK_FILE_CHOOSER_ACTION_SAVE,
- "do-overwrite-confirmation", TRUE,
NULL);
return dialog;
Modified: squeeze/trunk/src/new_dialog.h
===================================================================
--- squeeze/trunk/src/new_dialog.h 2007-01-15 20:31:46 UTC (rev 24493)
+++ squeeze/trunk/src/new_dialog.h 2007-01-15 21:02:18 UTC (rev 24494)
@@ -43,6 +43,7 @@
struct _SQNewArchiveDialog
{
GtkFileChooserDialog parent;
+ GtkWidget *file_chooser;
GtkWidget *archive_types_combo;
GtkWidget *append_extention_check;
};
_______________________________________________
Xfce4-commits mailing list
[email protected]
http://foo-projects.org/mailman/listinfo/xfce4-commits
