Commit: 02f73b72800626af4e1d77b33c9e1b516c0b3526 - dia (git)

作図ソフト dia の改良版

Commit MetaInfo

• Revisión: 02f73b72800626af4e1d77b33c9e1b516c0b3526 (tree)
• Tiempo: 2004-04-13 22:30:15
• Autor: Lars Clausen <lclausen@src....>
• Commiter: Lars Clausen

Log Message

Disappearing toolbox fix

Cambiar Resumen

• modified: ChangeLog
• modified: app/app_procs.c
• modified: app/app_procs.h
• modified: app/interface.c

Diferencia incremental

--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
[phone]  Lars Clausen  <[e-mail]>
+
+	* app/interface.c (toolbox_delete): 
+	* app/app_procs.[ch] (app_exit): Stop the delete event if the user
+	cancels quit due to modified diagrams.
+
 2004-04-07  Samúel Jón Gunnarsson  <[e-mail]>
 
 	* is.po: Added "is" to ALL_LINGUAS.

--- a/app/app_procs.c
+++ b/app/app_procs.c
@@ -574,7 +574,7 @@ set_true_callback(GtkWidget *w, int *data)
 }
 #endif
 
-void
+gboolean
 app_exit(void)
 {
   GList *list;
@@ -589,7 +589,7 @@ app_exit(void)
 
   if (app_exit_once) {
     g_error(_("This shouldn't happen.  Please file a bug report at bugzilla.gnome.org\ndescribing how you can cause this message to appear.\n"));
-    return;
+    return FALSE;
   }
 
   if (diagram_modified_exists()) {
@@ -618,7 +618,7 @@ app_exit(void)
 
     if (gtk_dialog_run(GTK_DIALOG(dialog)) != GTK_RESPONSE_OK) {
       gtk_widget_destroy(dialog);
-      return;
+      return FALSE;
     }
     gtk_widget_destroy(dialog);
   }
@@ -661,6 +661,8 @@ app_exit(void)
   /* Yuck.  -Lars */
   printf(_("Thank you for using Dia.\n"));
   app_exit_once = TRUE;
+
+  return TRUE;
 }
 
 static void create_user_dirs(void)

--- a/app/app_procs.h
+++ b/app/app_procs.h
@@ -21,7 +21,11 @@
 #include <lib/filter.h>
 
 void app_init(int argc, char **argv);
-void app_exit(void);
+/** Exit the application, but asking the user for confirmation
+ * if there are changed diagrams.
+ * Returns TRUE if the application exits.
+ */
+gboolean app_exit(void);
 int app_is_embedded(void);
 
 gboolean do_convert(const char *infname,

--- a/app/interface.c
+++ b/app/interface.c
@@ -1135,7 +1135,7 @@ toolbox_destroy (GtkWidget *widget, gpointer data)
   app_exit();
 }
 
-static void
+static gboolean
 toolbox_delete (GtkWidget *widget, GdkEvent *event, gpointer data)
 {
   if (!app_is_embedded()) {
@@ -1147,7 +1147,8 @@ toolbox_delete (GtkWidget *widget, GdkEvent *event, gpointer data)
       g_signal_handler_disconnect (GTK_OBJECT (widget), handlerid);
     prefs.recent_sheet = gtk_option_menu_get_history(GTK_OPTION_MENU(sheet_option_menu));
 
-    app_exit();
+    /** If the app didn't exit, don't close the window */
+    return (!app_exit());
   }
 }