Replace remaining occurrences of '__func__' with 'G_STRFUNC'.

git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@3496 ea778897-0a13-0410-b9d1-a72fbfd435f5

ChangeLog

@@ -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>

src/document.c

@@ -616,7 +616,7 @@ gboolean document_remove_page(guint page_num)
 
 	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 @@ void document_undo_clear(GeanyDocument *doc)
 	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 @@ void document_undo_add(GeanyDocument *doc, guint type, gpointer data)
 	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 @@ void document_undo(GeanyDocument *doc)
 	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 @@ void document_undo(GeanyDocument *doc)
 
 	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 @@ void document_redo(GeanyDocument *doc)
 	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 @@ void document_redo(GeanyDocument *doc)
 
 	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 @@ static time_t monitor_check_status_real(GeanyDocument *doc, gboolean force)
 	}
 	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)
 	{

src/keyfile.c

@@ -1070,7 +1070,7 @@ static void generate_filetype_extensions(const gchar *output_dir)
 		"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);
 

src/search.c

@@ -1328,7 +1328,7 @@ search_find_in_files(const gchar *utf8_search_text, const gchar *dir, const gcha
 		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;

src/tools.c

@@ -112,7 +112,7 @@ static gboolean cc_iofunc(GIOChannel *ioc, GIOCondition cond, gpointer data)
 			}
 			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 @@ static gboolean cc_iofunc(GIOChannel *ioc, GIOCondition cond, gpointer data)
 
 		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 @@ void tools_execute_custom_command(GeanyDocument *doc, const gchar *command)
 			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;
 			}

src/utils.c

@@ -890,7 +890,7 @@ GIOChannel *utils_set_up_io_channel(
 		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;
 		}

src/vte.c

@@ -618,7 +618,7 @@ const gchar* vte_get_working_directory(void)
 					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);
 			}

tagmanager/tm_source_file.c

@@ -147,7 +147,7 @@ gboolean tm_source_file_parse(TMSourceFile *source_file)
 		}
 		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;