anjuta r3519 - in trunk: . plugins/terminal plugins/tools

[naba svn gnome org]

Author: naba
Date: Fri Jan 25 13:49:15 2008
New Revision: 3519
URL: http://svn.gnome.org/viewvc/anjuta?rev=3519&view=rev

Log:
	* plugins/terminal/terminal.c: (terminal_execute),
	(activate_plugin):
	* plugins/tools/execute.c: Fixed couple of gtk+ critical warnings.


Modified:
   trunk/ChangeLog
   trunk/plugins/terminal/terminal.c
   trunk/plugins/tools/execute.c

Modified: trunk/plugins/terminal/terminal.c
==============================================================================
--- trunk/plugins/terminal/terminal.c	(original)
+++ trunk/plugins/terminal/terminal.c	Fri Jan 25 13:49:15 2008
@@ -88,6 +88,7 @@
 	GtkWidget *scrollbar;
 	GtkWidget *pref_profile_combo;
 	GtkWidget *pref_default_button;
+	gboolean   widget_added_to_shell;
 	GList *gconf_notify_ids;
 #if OLD_VTE == 1
 	gboolean first_time_realization;
@@ -395,8 +396,9 @@
 	
 	preferences_changed (term_plugin->prefs, term_plugin);
 	
-	anjuta_shell_present_widget (ANJUTA_PLUGIN (term_plugin)->shell,
-								 term_plugin->frame, NULL);
+	if (term_plugin->widget_added_to_shell)
+		anjuta_shell_present_widget (ANJUTA_PLUGIN (term_plugin)->shell,
+									 term_plugin->frame, NULL);
 	
 	return term_plugin->child_pid;
 }
@@ -587,7 +589,7 @@
 	term_plugin = ANJUTA_PLUGIN_TERMINAL (plugin);
 	term_plugin->ui = anjuta_shell_get_ui (plugin->shell, NULL);
 	term_plugin->prefs = anjuta_shell_get_preferences (plugin->shell, NULL);
-	
+	term_plugin->widget_added_to_shell = FALSE;
 	terminal_create (term_plugin);
 	
 	if (!initialized)
@@ -604,7 +606,7 @@
 							 "terminal-plugin-icon",
 							 ANJUTA_SHELL_PLACEMENT_BOTTOM, NULL);
 	/* terminal_focus_cb (term_plugin->term, NULL, term_plugin); */
-	
+	term_plugin->widget_added_to_shell = TRUE;
 	initialized = TRUE;
 	return TRUE;
 }

Modified: trunk/plugins/tools/execute.c
==============================================================================
--- trunk/plugins/tools/execute.c	(original)
+++ trunk/plugins/tools/execute.c	Fri Jan 25 13:49:15 2008
@@ -42,7 +42,7 @@
 
 /*---------------------------------------------------------------------------*/
 
-#define ICON_FILE "anjuta-tools-plugin.png"
+#define ICON_FILE "anjuta-tools-plugin-48.png"
 #define MAX_TOOL_PANES 4
 
 /* Widget and signal name found in glade file