anjuta r4253 - in trunk: . plugins/debug-manager plugins/document-manager plugins/editor plugins/indent plugins/symbol-browser

[sgranjoux svn gnome org]

Author: sgranjoux
Date: Fri Sep 12 20:42:16 2008
New Revision: 4253
URL: http://svn.gnome.org/viewvc/anjuta?rev=4253&view=rev

Log:
	* plugins/symbol-browser/plugin.c,
	plugins/debug-manager/breakpoints.c,
	plugins/document-manager/plugin.c,
	plugins/editor/plugin.c:
	Fix warnings, some documents could have no associated file

	* plugins/indent/plugin.c:
	Need to use a different watch name to track current editor


Modified:
   trunk/ChangeLog
   trunk/plugins/debug-manager/breakpoints.c
   trunk/plugins/document-manager/plugin.c
   trunk/plugins/editor/plugin.c
   trunk/plugins/indent/plugin.c
   trunk/plugins/symbol-browser/plugin.c

Modified: trunk/plugins/debug-manager/breakpoints.c
==============================================================================
--- trunk/plugins/debug-manager/breakpoints.c	(original)
+++ trunk/plugins/debug-manager/breakpoints.c	Fri Sep 12 20:42:16 2008
@@ -1018,10 +1018,14 @@
 	if ((ed != NULL) && IANJUTA_IS_MARKABLE (ed))
 	{
 		GFile* file;
-		gchar* uri;
+		gchar* uri = NULL;
 		
 		file = ianjuta_file_get_file (IANJUTA_FILE (ed), NULL);
-		uri = g_file_get_uri (file);
+		if (file)
+		{
+			uri = g_file_get_uri (file);
+			g_object_unref (file);
+		}
 		if ((uri != NULL) && (bi->uri != NULL) && (strcmp (uri, bi->uri) == 0))
 		{
 			bi->editor = ed;
@@ -1030,7 +1034,6 @@
 			breakpoints_dbase_connect_to_editor (bd, ed);			
 		}
 		g_free (uri);
-		g_object_unref (file);
 	}
 
 	if (bd->debugger != NULL)
@@ -1465,9 +1468,12 @@
 		if (te != NULL)
 		{
 			GFile* file = ianjuta_file_get_file (IANJUTA_FILE(te), NULL);
-			uri = g_file_get_uri (file);
-			line = ianjuta_editor_get_lineno (te, NULL);
-			g_object_unref (file);
+			if (file != NULL)
+			{
+				uri = g_file_get_uri (file);
+				line = ianjuta_editor_get_lineno (te, NULL);
+				g_object_unref (file);
+			}
 		}
 		//NULL uri is ok here
 		bi = breakpoint_item_new_from_uri (bd, uri, line, TRUE);

Modified: trunk/plugins/document-manager/plugin.c
==============================================================================
--- trunk/plugins/document-manager/plugin.c	(original)
+++ trunk/plugins/document-manager/plugin.c	Fri Sep 12 20:42:16 2008
@@ -1452,16 +1452,19 @@
 			if (ianjuta_file_savable_is_dirty (editor, NULL))
 			{
 				const gchar *name;
-				gchar *uri;
+				gchar *uri = NULL;
 				GFile* file;
 			
 				name = ianjuta_document_get_filename (IANJUTA_DOCUMENT (editor), NULL);
 				file = ianjuta_file_get_file (IANJUTA_FILE (editor), NULL);
-				uri = g_file_get_uri (file);
+				if (file)
+				{
+					uri = g_file_get_uri (file);
+					g_object_unref (file);
+				}
 				anjuta_save_prompt_add_item (save_prompt, name, uri, editor,
 											 on_save_prompt_save_editor, plugin);
 				g_free (uri);
-				g_object_unref (file);
 			}
 		}
 		g_list_free (buffers);

Modified: trunk/plugins/editor/plugin.c
==============================================================================
--- trunk/plugins/editor/plugin.c	(original)
+++ trunk/plugins/editor/plugin.c	Fri Sep 12 20:42:16 2008
@@ -103,7 +103,8 @@
 	AnjutaShell *shell = ANJUTA_PLUGIN (factory)->shell;
 	AnjutaPreferences *prefs = anjuta_shell_get_preferences (shell, NULL);
 	AnjutaStatus *status = anjuta_shell_get_status (shell, NULL);
-	gchar* uri = g_file_get_uri (file);
+	/* file can be NULL, if we open a buffer, not a file */
+	gchar* uri = file ? g_file_get_uri (file) : NULL;
 	IAnjutaEditor* editor = IANJUTA_EDITOR(text_editor_new(status, prefs,
 														   uri, filename));
 	g_free(uri);

Modified: trunk/plugins/indent/plugin.c
==============================================================================
--- trunk/plugins/indent/plugin.c	(original)
+++ trunk/plugins/indent/plugin.c	Fri Sep 12 20:42:16 2008
@@ -260,7 +260,7 @@
 	indent_plugin->idt = indent_init(prefs);
 	
 	indent_plugin->editor_watch_id = 
-		anjuta_plugin_add_watch (plugin, "document_manager_current_editor",
+		anjuta_plugin_add_watch (plugin, IANJUTA_DOCUMENT_MANAGER_CURRENT_DOCUMENT,
 								 value_added_current_editor,
 								 value_removed_current_editor, NULL);
 	indent_plugin->current_editor = NULL;

Modified: trunk/plugins/symbol-browser/plugin.c
==============================================================================
--- trunk/plugins/symbol-browser/plugin.c	(original)
+++ trunk/plugins/symbol-browser/plugin.c	Fri Sep 12 20:42:16 2008
@@ -811,7 +811,10 @@
 	if (sv_plugin->locals_line_number == lineno)
 		return;
 	sv_plugin->locals_line_number = lineno;
-	
+
+	if (model == NULL);
+		return;
+
 	if (!gtk_tree_model_get_iter_first (model, &iter))
 		return;
 	while (!found && lineno >= 0)