anjuta r4646 - in trunk: . libanjuta/interfaces plugins/glade plugins/scintilla plugins/sourceview plugins/symbol-db

[jhs svn gnome org]

Author: jhs
Date: Thu Jan 29 21:14:38 2009
New Revision: 4646
URL: http://svn.gnome.org/viewvc/anjuta?rev=4646&view=rev

Log:
2009-01-29  Johannes Schmid  <jhs gnome org>

	* libanjuta/interfaces/libanjuta.idl:
	* plugins/glade/anjuta-design-document.c:
	* plugins/scintilla/text_editor.c (text_editor_save_file):
	* plugins/sourceview/sourceview.c (on_save_failed):
	Emit saved(NULL) when file-saving fails.
	#567206 â Build doesn't start if auto-save fails
	
	* plugins/symbol-db/plugin.c (on_find_symbol):
	#357275 â allow user to jump directly to Symbols / Search

Modified:
   trunk/ChangeLog
   trunk/libanjuta/interfaces/libanjuta.idl
   trunk/plugins/glade/anjuta-design-document.c
   trunk/plugins/scintilla/text_editor.c
   trunk/plugins/sourceview/sourceview.c
   trunk/plugins/symbol-db/plugin.c

Modified: trunk/libanjuta/interfaces/libanjuta.idl
==============================================================================
--- trunk/libanjuta/interfaces/libanjuta.idl	(original)
+++ trunk/libanjuta/interfaces/libanjuta.idl	Thu Jan 29 21:14:38 2009
@@ -84,7 +84,7 @@
 		/**
 		 * IAnjutaFileSavable::saved:
 		 * @obj: Self
-		 * @file: file where the content is saved.
+		 * @file: file where the content is saved or NULL if save failed
 		 * 
 		 * This signal is emitted when the content is saved.
 		 */

Modified: trunk/plugins/glade/anjuta-design-document.c
==============================================================================
--- trunk/plugins/glade/anjuta-design-document.c	(original)
+++ trunk/plugins/glade/anjuta-design-document.c	Thu Jan 29 21:14:38 2009
@@ -364,38 +364,45 @@
 {
 	AnjutaDesignDocument* self = ANJUTA_DESIGN_DOCUMENT(file);
 	AnjutaDesignDocumentPrivate* priv = ADD_GET_PRIVATE(self);
-
+	
 	GladeProject* project = glade_design_view_get_project(priv->design_view);
-
+	
 #if (GLADEUI_VERSION >= 330)
-	if (glade_project_get_path(project) != NULL) {
+	if (glade_project_get_path(project) != NULL) 
+	{
 #else
-	if (project && project->path != NULL) {
+		if (project && project->path != NULL) 
+		{
 #endif
-		AnjutaStatus *status;
-
-		status = anjuta_shell_get_status (ANJUTA_PLUGIN(priv->glade_plugin)->shell, NULL);
-
+			AnjutaStatus *status;
+			
+			status = anjuta_shell_get_status (ANJUTA_PLUGIN(priv->glade_plugin)->shell, NULL);
+			
 #if (GLADEUI_VERSION >= 330)
-		if (glade_project_save (project, glade_project_get_path(project),
-								NULL)) {
-			anjuta_status_set (status, _("Glade project '%s' saved"),
-							   glade_project_get_name(project));
+			if (glade_project_save (project, glade_project_get_path(project),
+									NULL)) 
+			{
+				anjuta_status_set (status, _("Glade project '%s' saved"),
+								   glade_project_get_name(project));
 #else
-		if (glade_project_save (project, project->path, NULL)) {
-			anjuta_status_set (status, _("Glade project '%s' saved"),
-							   project->name);
+				if (glade_project_save (project, project->path, NULL)) 
+				{
+					GFile* file = g_file_new_for_path(project->path);
+					anjuta_status_set (status, _("Glade project '%s' saved"),
+									   project->name);
 #endif
-		g_signal_emit_by_name(G_OBJECT(self), "save_point", TRUE);
-		}
-		else
-		{
-			anjuta_util_dialog_warning (GTK_WINDOW (ANJUTA_PLUGIN(priv->glade_plugin)->shell),
-										_("Invalid glade file name"));
-		}
-		return;
-	}
-	DEBUG_PRINT("%s", "Invalid use of ifile_savable_save!");
+					g_signal_emit_by_name(G_OBJECT(self), "save_point", TRUE);
+					g_signal_emit_by_name(G_OBJECT(self), "saved", file);
+				}
+				else
+				{
+					anjuta_util_dialog_warning (GTK_WINDOW (ANJUTA_PLUGIN(priv->glade_plugin)->shell),
+												_("Invalid glade file name"));
+					g_signal_emit_by_name(G_OBJECT(self), "saved", NULL);
+				}
+				return;
+			}
+			DEBUG_PRINT("%s", "Invalid use of ifile_savable_save!");
 }
 
 static void ifile_savable_save_as(IAnjutaFileSavable* ifile, GFile* file, GError **e)

Modified: trunk/plugins/scintilla/text_editor.c
==============================================================================
--- trunk/plugins/scintilla/text_editor.c	(original)
+++ trunk/plugins/scintilla/text_editor.c	Thu Jan 29 21:14:38 2009
@@ -1621,6 +1621,7 @@
 								  _("Could not save intermediate file %s: %s"),
 								  te->uri,
 								  error->message);
+		g_signal_emit_by_name (G_OBJECT (te), "saved", NULL);
 		g_error_free (error);
 	}
 	else

Modified: trunk/plugins/sourceview/sourceview.c
==============================================================================
--- trunk/plugins/sourceview/sourceview.c	(original)
+++ trunk/plugins/sourceview/sourceview.c	Thu Jan 29 21:14:38 2009
@@ -470,6 +470,8 @@
 	GList* documents = ianjuta_document_manager_get_doc_widgets (docman, NULL);
 	GtkWidget* message_area;
 	
+	g_signal_emit_by_name(G_OBJECT(sv), "saved", NULL);
+	
 	/* Could not open <filename>: <error message> */
 	gchar* message = g_strdup_printf (_("Could not save %s: %s"),
 									  sourceview_io_get_filename (sv->priv->io), 

Modified: trunk/plugins/symbol-db/plugin.c
==============================================================================
--- trunk/plugins/symbol-db/plugin.c	(original)
+++ trunk/plugins/symbol-db/plugin.c	Thu Jan 29 21:14:38 2009
@@ -276,9 +276,12 @@
 	DEBUG_PRINT ("on_find_symbol (GtkAction *action, gpointer user_data)");
 	GtkEntry * entry;
 	
+	anjuta_shell_present_widget(ANJUTA_PLUGIN(sdb_plugin)->shell,
+								sdb_plugin->dbv_main, NULL);
+	
 	entry = symbol_db_view_search_get_entry ( 
 					SYMBOL_DB_VIEW_SEARCH (sdb_plugin->dbv_view_tree_search));
-	gtk_notebook_set_current_page (sdb_plugin->dbv_notebook, 2);
+	gtk_notebook_set_current_page (GTK_NOTEBOOK(sdb_plugin->dbv_notebook), 2);
 	gtk_widget_grab_focus (GTK_WIDGET (entry));
 }