[Rawstudio-commit] r2029 - trunk/src

[Anders Brander]

Author: abrander
Date: 2008-09-24 18:59:20 +0200 (Wed, 24 Sep 2008)
New Revision: 2029

Modified:
   trunk/src/gtk-interface.c
   trunk/src/rawstudio.c
   trunk/src/rawstudio.h
   trunk/src/rs-actions.c
Log:
Moved functionality from rs_shutdown() to ACTION(quit).

Modified: trunk/src/gtk-interface.c
===================================================================
--- trunk/src/gtk-interface.c	2008-09-24 15:35:40 UTC (rev 2028)
+++ trunk/src/gtk-interface.c	2008-09-24 16:59:20 UTC (rev 2029)
@@ -65,6 +65,7 @@
 static void gui_preference_iconview_show_filenames_changed(GtkToggleButton *togglebutton, gpointer user_data);
 static GtkWidget *gui_make_menubar(RS_BLOB *rs);
 static void drag_data_received(GtkWidget *widget, GdkDragContext *drag_context, gint x, gint y, GtkSelectionData *selection_data, guint info, guint t,	RS_BLOB *rs);
+static gboolean gui_window_delete(GtkWidget *widget, GdkEvent  *event, gpointer user_data);
 static GtkWidget *gui_window_make(RS_BLOB *rs);
 static void rs_open_file_delayed(RS_BLOB *rs, const gchar *filename);
 static void rs_open_file(RS_BLOB *rs, const gchar *filename);
@@ -754,6 +755,13 @@
 	return;
 }
 
+static gboolean
+gui_window_delete(GtkWidget *widget, GdkEvent  *event, gpointer user_data)
+{
+	rs_core_action_group_activate("Quit");
+	return TRUE;
+}
+
 static GtkWidget *
 gui_window_make(RS_BLOB *rs)
 {
@@ -762,7 +770,7 @@
 	rawstudio_window = GTK_WINDOW(gtk_window_new (GTK_WINDOW_TOPLEVEL));
 	gtk_window_resize((GtkWindow *) rawstudio_window, 800, 600);
 	gtk_window_set_title (GTK_WINDOW (rawstudio_window), _("Rawstudio"));
-	g_signal_connect((gpointer) rawstudio_window, "delete_event", G_CALLBACK(rs_shutdown), rs);
+	g_signal_connect((gpointer) rawstudio_window, "delete_event", G_CALLBACK(gui_window_delete), NULL);
 	g_signal_connect((gpointer) rawstudio_window, "key_press_event", G_CALLBACK(window_key_press_event), NULL);
 
 	gtk_drag_dest_set(GTK_WIDGET(rawstudio_window), GTK_DEST_DEFAULT_ALL, targets, 1, GDK_ACTION_COPY);

Modified: trunk/src/rawstudio.c
===================================================================
--- trunk/src/rawstudio.c	2008-09-24 15:35:40 UTC (rev 2028)
+++ trunk/src/rawstudio.c	2008-09-24 16:59:20 UTC (rev 2029)
@@ -1106,15 +1106,6 @@
 	_exit(0);
 }
 
-gboolean
-rs_shutdown(GtkWidget *dummy1, GdkEvent *dummy2, RS_BLOB *rs)
-{
-	rs_photo_close(rs->photo);
-	rs_conf_set_integer(CONF_LAST_PRIORITY_PAGE, rs_store_get_current_page(rs->store));
-	gtk_main_quit();
-	return(TRUE);
-}
-
 #if !GLIB_CHECK_VERSION(2,8,0)
 
 /* Include our own g_mkdir_with_parents() in case of old glib.

Modified: trunk/src/rawstudio.h
===================================================================
--- trunk/src/rawstudio.h	2008-09-24 15:35:40 UTC (rev 2028)
+++ trunk/src/rawstudio.h	2008-09-24 16:59:20 UTC (rev 2029)
@@ -288,7 +288,6 @@
 void rs_render_pixel_to_srgb(RS_BLOB *rs, gint x, gint y, guchar *dest);
 void rs_apply_settings_from_double(RS_SETTINGS *rss, RS_SETTINGS_DOUBLE *rsd, gint mask);
 void rs_rect_normalize(RS_RECT *in, RS_RECT *out);
-gboolean rs_shutdown(GtkWidget *dummy1, GdkEvent *dummy2, RS_BLOB *rs);
 gboolean rs_has_gimp(gint major, gint minor, gint micro);
 void rs_rect_flip(RS_RECT *in, RS_RECT *out, gint w, gint h);
 void rs_rect_mirror(RS_RECT *in, RS_RECT *out, gint w, gint h);

Modified: trunk/src/rs-actions.c
===================================================================
--- trunk/src/rs-actions.c	2008-09-24 15:35:40 UTC (rev 2028)
+++ trunk/src/rs-actions.c	2008-09-24 16:59:20 UTC (rev 2029)
@@ -321,7 +321,10 @@
 
 ACTION(quit)
 {
-	rs_shutdown(NULL, NULL, rs);
+	if (rs->photo)
+		rs_photo_close(rs->photo);
+	rs_conf_set_integer(CONF_LAST_PRIORITY_PAGE, rs_store_get_current_page(rs->store));
+	gtk_main_quit();
 }
 
 ACTION(revert_settings)