SF.net SVN: geany: [2358] trunk

[eht16 at users.sourceforge.net]

Revision: 2358
          http://geany.svn.sourceforge.net/geany/?rev=2358&view=rev
Author:   eht16
Date:     2008-03-17 11:26:22 -0700 (Mon, 17 Mar 2008)

Log Message:
-----------
Fix modal dialog problems on Windows by not setting taskbar hint (closes #1916994).

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/geany.glade
    trunk/src/dialogs.c
    trunk/src/gb.c
    trunk/src/interface.c

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2008-03-17 17:22:24 UTC (rev 2357)
+++ trunk/ChangeLog	2008-03-17 18:26:22 UTC (rev 2358)
@@ -19,6 +19,9 @@
  * data/filetypes.python, src/highlighting.c:
    Add additional keyword group for python and slightly change the
    foreground colour for style "word2".
+ * geany.glade, src/dialogs.c, src/interface.c:
+   Fix modal dialog problems on Windows by not setting taskbar hint
+   (closes #1916994).
 
 
 2008-03-15  Enrico Tröger  <enrico(dot)troeger(at)uvena(dot)de>

Modified: trunk/geany.glade
===================================================================
--- trunk/geany.glade	2008-03-17 17:22:24 UTC (rev 2357)
+++ trunk/geany.glade	2008-03-17 18:26:22 UTC (rev 2358)
@@ -3058,7 +3058,7 @@
   <property name="resizable">True</property>
   <property name="destroy_with_parent">False</property>
   <property name="decorated">True</property>
-  <property name="skip_taskbar_hint">True</property>
+  <property name="skip_taskbar_hint">False</property>
   <property name="skip_pager_hint">True</property>
   <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
   <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>

Modified: trunk/src/dialogs.c
===================================================================
--- trunk/src/dialogs.c	2008-03-17 17:22:24 UTC (rev 2357)
+++ trunk/src/dialogs.c	2008-03-17 18:26:22 UTC (rev 2358)
@@ -191,7 +191,7 @@
 	gtk_widget_set_size_request(ui_widgets.open_filesel, -1, 460);
 	gtk_window_set_modal(GTK_WINDOW(ui_widgets.open_filesel), TRUE);
 	gtk_window_set_destroy_with_parent(GTK_WINDOW(ui_widgets.open_filesel), TRUE);
-	gtk_window_set_skip_taskbar_hint(GTK_WINDOW(ui_widgets.open_filesel), TRUE);
+	gtk_window_set_skip_taskbar_hint(GTK_WINDOW(ui_widgets.open_filesel), FALSE);
 	gtk_window_set_type_hint(GTK_WINDOW(ui_widgets.open_filesel), GDK_WINDOW_TYPE_HINT_DIALOG);
 	gtk_window_set_transient_for(GTK_WINDOW(ui_widgets.open_filesel), GTK_WINDOW(app->window));
 	gtk_file_chooser_set_select_multiple(GTK_FILE_CHOOSER(ui_widgets.open_filesel), TRUE);
@@ -480,7 +480,7 @@
 				GTK_FILE_CHOOSER_ACTION_SAVE, NULL, NULL);
 	gtk_window_set_modal(GTK_WINDOW(ui_widgets.save_filesel), TRUE);
 	gtk_window_set_destroy_with_parent(GTK_WINDOW(ui_widgets.save_filesel), TRUE);
-	gtk_window_set_skip_taskbar_hint(GTK_WINDOW(ui_widgets.save_filesel), TRUE);
+	gtk_window_set_skip_taskbar_hint(GTK_WINDOW(ui_widgets.save_filesel), FALSE);
 	gtk_window_set_type_hint(GTK_WINDOW(ui_widgets.save_filesel), GDK_WINDOW_TYPE_HINT_DIALOG);
 	gtk_widget_set_name(ui_widgets.save_filesel, "GeanyDialog");
 
@@ -647,16 +647,13 @@
 
 void dialogs_show_msgbox_with_secondary(gint type, const gchar *text, const gchar *secondary)
 {
-#ifndef G_OS_WIN32
-	GtkWidget *dialog;
-#endif
-
 #ifdef G_OS_WIN32
 	/* put the two strings together because Windows message boxes don't support secondary texts */
 	gchar *string = g_strconcat(text, "\n", secondary, NULL);
 	win32_message_dialog(NULL, type, string);
 	g_free(string);
 #else
+	GtkWidget *dialog;
 	dialog = gtk_message_dialog_new(GTK_WINDOW(app->window), GTK_DIALOG_DESTROY_WITH_PARENT,
                                   type, GTK_BUTTONS_OK, "%s", text);
 	gtk_widget_set_name(dialog, "GeanyDialog");

Modified: trunk/src/gb.c
===================================================================
--- trunk/src/gb.c	2008-03-17 17:22:24 UTC (rev 2357)
+++ trunk/src/gb.c	2008-03-17 18:26:22 UTC (rev 2358)
@@ -77,7 +77,7 @@
 	gtk_window_set_position(GTK_WINDOW(gb_window), GTK_WIN_POS_CENTER);
 	gtk_window_set_destroy_with_parent(GTK_WINDOW(gb_window), TRUE);
 	gtk_window_set_type_hint(GTK_WINDOW(gb_window), GDK_WINDOW_TYPE_HINT_DIALOG);
-	gtk_window_set_skip_taskbar_hint(GTK_WINDOW(gb_window), TRUE);
+	gtk_window_set_skip_taskbar_hint(GTK_WINDOW(gb_window), FALSE);
 	gtk_window_set_modal(GTK_WINDOW(gb_window), TRUE);
 	gtk_window_set_skip_pager_hint(GTK_WINDOW(gb_window), TRUE);
 	gtk_window_set_icon(GTK_WINDOW(gb_window), icons[IMAGE_LOGO]);

Modified: trunk/src/interface.c
===================================================================
--- trunk/src/interface.c	2008-03-17 17:22:24 UTC (rev 2357)
+++ trunk/src/interface.c	2008-03-17 18:26:22 UTC (rev 2358)
@@ -2782,7 +2782,6 @@
   prefs_dialog = gtk_dialog_new ();
   gtk_window_set_title (GTK_WINDOW (prefs_dialog), _("Preferences"));
   gtk_window_set_modal (GTK_WINDOW (prefs_dialog), TRUE);
-  gtk_window_set_skip_taskbar_hint (GTK_WINDOW (prefs_dialog), TRUE);
   gtk_window_set_skip_pager_hint (GTK_WINDOW (prefs_dialog), TRUE);
   gtk_window_set_type_hint (GTK_WINDOW (prefs_dialog), GDK_WINDOW_TYPE_HINT_DIALOG);
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.