[Xfce4-commits] r24704 - in squeeze/trunk: libsqueeze src

[Stephan Arts]

Author: stephan
Date: 2007-01-23 11:42:07 +0000 (Tue, 23 Jan 2007)
New Revision: 24704

Modified:
   squeeze/trunk/libsqueeze/archive.c
   squeeze/trunk/src/main_window.c
Log:
Fixed segfault when filename is not UTF-8



Modified: squeeze/trunk/libsqueeze/archive.c
===================================================================
--- squeeze/trunk/libsqueeze/archive.c	2007-01-23 09:54:13 UTC (rev 24703)
+++ squeeze/trunk/libsqueeze/archive.c	2007-01-23 11:42:07 UTC (rev 24704)
@@ -661,7 +661,7 @@
 	}
 	else
 	{
-		entry->filename = g_strdup(filename);
+		entry->filename = g_locale_to_utf8(filename, -1, NULL, NULL, NULL);
 		lsq_archive_iter_set_mime(archive, entry, thunar_vfs_mime_database_get_info_for_name(lsq_mime_database, entry->filename));
 	}
 

Modified: squeeze/trunk/src/main_window.c
===================================================================
--- squeeze/trunk/src/main_window.c	2007-01-23 09:54:13 UTC (rev 24703)
+++ squeeze/trunk/src/main_window.c	2007-01-23 11:42:07 UTC (rev 24704)
@@ -1066,9 +1066,12 @@
 			sq_notebook_get_active_archive(SQ_NOTEBOOK(notebook), &lp_archive, &lp_support);
 			if(lsq_archive_support_view(lp_support, lp_archive, filenames))
 			{
-				GtkWidget *warnig_dialog = gtk_message_dialog_new(window, GTK_DIALOG_MODAL, GTK_MESSAGE_WARNING, GTK_BUTTONS_CLOSE, _("Squeeze cannot view this file.\nthe application to support this is missing."));
-				gtk_dialog_run(GTK_DIALOG(warnig_dialog));
-				gtk_widget_destroy(warnig_dialog);
+				GtkWidget *warning_dialog = gtk_message_dialog_new(window, GTK_DIALOG_MODAL, GTK_MESSAGE_WARNING, GTK_BUTTONS_CLOSE, _("Squeeze cannot view this file.\nthe application to support this is missing."));
+				if(warning_dialog)
+				{
+					gtk_dialog_run(GTK_DIALOG(warning_dialog));
+					gtk_widget_destroy(warning_dialog);
+				}
 			}
 			break;
 		case GTK_RESPONSE_ACCEPT: /* EXTRACT */