SF.net SVN: geany:[3496] trunk - Commits

21 Jan 2009

Revision: 3496
          http://geany.svn.sourceforge.net/geany/?rev=3496&view=rev
Author:   eht16
Date:     2009-01-21 22:49:21 +0000 (Wed, 21 Jan 2009)
Log Message:
-----------
Replace remaining occurrences of '__func__' with 'G_STRFUNC'.
Modified Paths:
--------------
    trunk/ChangeLog
    trunk/src/document.c
    trunk/src/keyfile.c
    trunk/src/search.c
    trunk/src/tools.c
    trunk/src/utils.c
    trunk/src/vte.c
    trunk/tagmanager/tm_source_file.c
Modified: trunk/ChangeLog
===================================================================

--- trunk/ChangeLog	2009-01-21 15:50:48 UTC (rev 3495)
+++ trunk/ChangeLog	2009-01-21 22:49:21 UTC (rev 3496)
@@ -6,6 +6,9 @@
    Don't check disk status for files which are marked to be ignored.
    Reset file disk status when manually reloading a file.
    Various improvements to the GIO-based file disk checking code.
+ * src/document.c, src/keyfile.c, src/search.c, src/tools.c,
+   src/utils.c, src/vte.c, tagmanager/tm_source_file.c:
+   Replace remaining occurrences of '__func__' with 'G_STRFUNC'.
2009-01-20  Nick Treleaven  <nick(dot)treleaven(at)btinternet(dot)com>
Modified: trunk/src/document.c
===================================================================
--- trunk/src/document.c	2009-01-21 15:50:48 UTC (rev 3495)
+++ trunk/src/document.c	2009-01-21 22:49:21 UTC (rev 3496)
@@ -616,7 +616,7 @@
if (doc == NULL)
    {
-		g_warning("%s: page_num: %d", __func__, page_num);
+		g_warning("%s: page_num: %d", G_STRFUNC, page_num);
    	return FALSE;
    }
@@ -2464,7 +2464,7 @@
    if (! main_status.quitting && doc->editor != NULL)
    	document_set_text_changed(doc, FALSE);
-	/*geany_debug("%s: new undo stack height: %d, new redo stack height: %d", __func__,
+	/*geany_debug("%s: new undo stack height: %d, new redo stack height: %d", G_STRFUNC,
    			 *g_trash_stack_height(&doc->undo_actions), g_trash_stack_height(&doc->redo_actions)); */
 }
@@ -2485,7 +2485,7 @@
    document_set_text_changed(doc, TRUE);
    ui_update_popup_reundo_items(doc);
-	/*geany_debug("%s: new stack height: %d, added type: %d", __func__,
+	/*geany_debug("%s: new stack height: %d, added type: %d", G_STRFUNC,
    			 *g_trash_stack_height(&doc->undo_actions), action->type); */
 }
@@ -2524,7 +2524,7 @@
    if (action == NULL)
    {
    	/* fallback, should not be necessary */
-		geany_debug("%s: fallback used", __func__);
+		geany_debug("%s: fallback used", G_STRFUNC);
    	sci_undo(doc->editor->sci);
    }
    else
@@ -2568,7 +2568,7 @@
update_changed_state(doc);
    ui_update_popup_reundo_items(doc);
-	/*geany_debug("%s: new stack height: %d", __func__, g_trash_stack_height(&doc->undo_actions));*/
+	/*geany_debug("%s: new stack height: %d", G_STRFUNC, g_trash_stack_height(&doc->undo_actions));*/
 }
@@ -2596,7 +2596,7 @@
    if (action == NULL)
    {
    	/* fallback, should not be necessary */
-		geany_debug("%s: fallback used", __func__);
+		geany_debug("%s: fallback used", G_STRFUNC);
    	sci_redo(doc->editor->sci);
    }
    else
@@ -2639,7 +2639,7 @@
update_changed_state(doc);
    ui_update_popup_reundo_items(doc);
-	/*geany_debug("%s: new stack height: %d", __func__, g_trash_stack_height(&doc->redo_actions));*/
+	/*geany_debug("%s: new stack height: %d", G_STRFUNC, g_trash_stack_height(&doc->redo_actions));*/
 }
@@ -2849,7 +2849,7 @@
    }
    else if (doc->priv->mtime > t || st.st_mtime > t)
    {
-		g_warning("%s: Something is wrong with the time stamps.", __func__);
+		g_warning("%s: Something is wrong with the time stamps.", G_STRFUNC);
    }
    else if (doc->priv->mtime < st.st_mtime)
    {
Modified: trunk/src/keyfile.c
===================================================================
--- trunk/src/keyfile.c	2009-01-21 15:50:48 UTC (rev 3495)
+++ trunk/src/keyfile.c	2009-01-21 22:49:21 UTC (rev 3496)
@@ -1070,7 +1070,7 @@
    	"See Geany's main documentation for details.", NULL);
/* write the file */
-	g_print("%s: ", __func__);
+	g_print("%s: ", G_STRFUNC);
    data = g_key_file_to_data(config, NULL, NULL);
    basename = g_path_get_basename(configfile);
Modified: trunk/src/search.c
===================================================================
--- trunk/src/search.c	2009-01-21 15:50:48 UTC (rev 3495)
+++ trunk/src/search.c	2009-01-21 22:49:21 UTC (rev 3496)
@@ -1328,7 +1328,7 @@
    	NULL, NULL, &child_pid,
    	NULL, &stdout_fd, &stderr_fd, &error))
    {
-		geany_debug("%s: g_spawn_async_with_pipes() failed: %s", __func__, error->message);
+		geany_debug("%s: g_spawn_async_with_pipes() failed: %s", G_STRFUNC, error->message);
    	ui_set_statusbar(TRUE, _("Process failed (%s)"), error->message);
    	g_error_free(error);
    	ret = FALSE;
Modified: trunk/src/tools.c
===================================================================
--- trunk/src/tools.c	2009-01-21 15:50:48 UTC (rev 3495)
+++ trunk/src/tools.c	2009-01-21 22:49:21 UTC (rev 3496)
@@ -112,7 +112,7 @@
    		}
    		if (err != NULL)
    		{
-				geany_debug("%s: %s", __func__, err->message);
+				geany_debug("%s: %s", G_STRFUNC, err->message);
    			g_error_free(err);
    			err = NULL;
    		}
@@ -120,7 +120,7 @@
if (rv != G_IO_STATUS_EOF)
    	{	/* Something went wrong? */
-			g_warning("%s: %s\n", __func__, "Incomplete command output");
+			g_warning("%s: %s\n", G_STRFUNC, "Incomplete command output");
    	}
    }
    return FALSE;
@@ -274,7 +274,7 @@
    		wrote = write(stdin_fd, sel, remaining);
    		if (wrote < 0)
    		{
-				g_warning("%s: %s: %s\n", __func__, "Failed sending data to command",
+				g_warning("%s: %s: %s\n", G_STRFUNC, "Failed sending data to command",
    									g_strerror(errno));
    			break;
    		}
Modified: trunk/src/utils.c
===================================================================
--- trunk/src/utils.c	2009-01-21 15:50:48 UTC (rev 3495)
+++ trunk/src/utils.c	2009-01-21 22:49:21 UTC (rev 3496)
@@ -890,7 +890,7 @@
    	g_io_channel_set_encoding(ioc, encoding, &error);
    	if (error)
    	{
-			geany_debug("%s: %s", __func__, error->message);
+			geany_debug("%s: %s", G_STRFUNC, error->message);
    		g_error_free(error);
    		return ioc;
    	}
Modified: trunk/src/vte.c
===================================================================
--- trunk/src/vte.c	2009-01-21 15:50:48 UTC (rev 3495)
+++ trunk/src/vte.c	2009-01-21 22:49:21 UTC (rev 3496)
@@ -618,7 +618,7 @@
    				g_free(vte_info.dir);
    				vte_info.dir = g_get_current_dir();
    				if (chdir(cwd) != 0)
-						geany_debug("%s: %s", __func__, g_strerror(errno));
+						geany_debug("%s: %s", G_STRFUNC, g_strerror(errno));
    			}
    			g_free(cwd);
    		}
Modified: trunk/tagmanager/tm_source_file.c
===================================================================
--- trunk/tagmanager/tm_source_file.c	2009-01-21 15:50:48 UTC (rev 3495)
+++ trunk/tagmanager/tm_source_file.c	2009-01-21 22:49:21 UTC (rev 3496)
@@ -147,7 +147,7 @@
    	}
    	else
    	{
-			g_warning("%s: Unable to open %s", __func__, file_name);
+			g_warning("%s: Unable to open %s", G_STRFUNC, file_name);
    		return FALSE;
    	}
    	++ passCount;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

    