anjuta r3955 - in trunk: . libanjuta src

[naba svn gnome org]

Author: naba
Date: Sun May 25 21:22:55 2008
New Revision: 3955
URL: http://svn.gnome.org/viewvc/anjuta?rev=3955&view=rev

Log:
	* libanjuta/anjuta-preferences.c
	(anjuta_preferences_is_dialog_created):
	* libanjuta/anjuta-preferences.h:
	* src/action-callbacks.c (on_set_preferences1_activate):
	Fixed bug #532537 - Crash on closing Anjuta Preferences when it
	open twice.


Modified:
   trunk/ChangeLog
   trunk/libanjuta/anjuta-preferences.c
   trunk/libanjuta/anjuta-preferences.h
   trunk/src/action-callbacks.c

Modified: trunk/libanjuta/anjuta-preferences.c
==============================================================================
--- trunk/libanjuta/anjuta-preferences.c	(original)
+++ trunk/libanjuta/anjuta-preferences.c	Sun May 25 21:22:55 2008
@@ -1651,6 +1651,12 @@
 	}
 }
 
+gboolean
+anjuta_preferences_is_dialog_created (AnjutaPreferences *pr)
+{
+	return pr->priv->prefs_dialog;
+}
+
 static void anjuta_preferences_class_init    (AnjutaPreferencesClass *class);
 static void anjuta_preferences_instance_init (AnjutaPreferences      *pr);
 

Modified: trunk/libanjuta/anjuta-preferences.h
==============================================================================
--- trunk/libanjuta/anjuta-preferences.h	(original)
+++ trunk/libanjuta/anjuta-preferences.h	Sun May 25 21:22:55 2008
@@ -215,6 +215,7 @@
 
 /* Dialog methods */
 GtkWidget *anjuta_preferences_get_dialog (AnjutaPreferences *pr);
+gboolean anjuta_preferences_is_dialog_created (AnjutaPreferences *pr);
 
 /* Key notifications */
 guint anjuta_preferences_notify_add (AnjutaPreferences *pr,

Modified: trunk/src/action-callbacks.c
==============================================================================
--- trunk/src/action-callbacks.c	(original)
+++ trunk/src/action-callbacks.c	Sun May 25 21:22:55 2008
@@ -80,6 +80,11 @@
 
 	GtkWidget *preferences_dialog;
 	
+	if (anjuta_preferences_is_dialog_created (app->preferences))
+	{
+		gtk_window_present (GTK_WINDOW (anjuta_preferences_get_dialog (app->preferences)));
+		return;
+	}
 	preferences_dialog = anjuta_preferences_get_dialog (app->preferences);
 	
 	/* Install main application preferences */