file-roller r2290 - in trunk: . src

[paobac svn gnome org]

Author: paobac
Date: Mon Jun  2 16:50:26 2008
New Revision: 2290
URL: http://svn.gnome.org/viewvc/file-roller?rev=2290&view=rev

Log:
2008-06-02  Paolo Bacchilega  <paobac svn gnome org>

	* src/fr-window.c (fr_window_construct): 
	
	Fixed bug #527271 â Ctrl-Q should quit file-roller.
	Patch by Eric Piel, modified to close the window instead of quitting the
	application.
	
	* src/main.c (get_archive_filename_extension): 
	
	return NULL if the filename has no extension.

Modified:
   trunk/ChangeLog
   trunk/src/fr-window.c
   trunk/src/main.c

Modified: trunk/src/fr-window.c
==============================================================================
--- trunk/src/fr-window.c	(original)
+++ trunk/src/fr-window.c	Mon Jun  2 16:50:26 2008
@@ -5473,6 +5473,12 @@
 	gtk_window_add_accel_group (GTK_WINDOW (window),
 				    gtk_ui_manager_get_accel_group (ui));
 
+	/* Add a hidden short cut Ctrl-Q for power users */
+	gtk_accel_group_connect (gtk_ui_manager_get_accel_group (ui), 
+				 GDK_q, GDK_CONTROL_MASK, 0,
+	                         g_cclosure_new_swap (G_CALLBACK (fr_window_close), window, NULL));
+	
+
 	if (!gtk_ui_manager_add_ui_from_string (ui, ui_info, -1, &error)) {
 		g_message ("building menus failed: %s", error->message);
 		g_error_free (error);

Modified: trunk/src/main.c
==============================================================================
--- trunk/src/main.c	(original)
+++ trunk/src/main.c	Mon Jun  2 16:50:26 2008
@@ -656,6 +656,9 @@
 		return NULL;
 
 	ext = get_file_extension (filename);
+	if (ext == NULL)
+		return NULL;
+		
 	for (i = G_N_ELEMENTS (file_ext_type) - 1; i >= 0; i--) 
 		if (strcmp (ext, file_ext_type[i].ext) == 0)
 			return ext;