Revert the last change to utils_str_equal() and use it again because…

Revert the last change to utils_str_equal() and use it again because g_str_equal() is not NULL-safe.


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

ChangeLog

@@ -10,8 +10,9 @@
  * src/about.c, src/build.c, src/callbacks.c, src/document.c,
    src/encodings.c, src/gb.c, src/keyfile.c, src/prefs.c, src/sci_cb.c,
    src/search.c, src/symbols.c, src/ui_utils.c, src/utils.c,
-   src/utils.h: Revert the last change to utils_str_equal() and use it
-                again because g_str_equal() is not NULL-safe.
+   src/utils.h, src/dialogs.c, src/vte.c:
+   Revert the last change to utils_str_equal() and use it again because
+   g_str_equal() is not NULL-safe.
 
 
 2006-12-06  Enrico Tröger  <enrico.troeger@uvena.de>

src/dialogs.c

@@ -1196,7 +1196,7 @@ show_question(const gchar *yes_btn, const gchar *no_btn, const gchar *question_t
 
 	// For a cancel button, use cancel reponse so user can press escape to cancel
 	gtk_dialog_add_button(GTK_DIALOG(dialog), no_btn,
-		g_str_equal(no_btn, GTK_STOCK_CANCEL) ? GTK_RESPONSE_CANCEL : GTK_RESPONSE_NO);
+		utils_str_equal(no_btn, GTK_STOCK_CANCEL) ? GTK_RESPONSE_CANCEL : GTK_RESPONSE_NO);
 	gtk_dialog_add_button(GTK_DIALOG(dialog), yes_btn, GTK_RESPONSE_YES);
 
 	if (gtk_dialog_run(GTK_DIALOG(dialog)) == GTK_RESPONSE_YES)

src/vte.c

@@ -437,7 +437,7 @@ void vte_cwd(const gchar *filename)
 
 		path = g_path_get_dirname(filename);
 		vte_get_working_directory();	// refresh vte_info.dir
-		if (! g_str_equal(path, vte_info.dir))
+		if (! utils_str_equal(path, vte_info.dir))
 		{
 			cmd = g_strconcat("cd ", path, "\n", NULL);
 			vte_send_cmd(cmd);