SF.net SVN: geany: [1060] trunk

[eht16 at users.sourceforge.net]

Revision: 1060
          http://svn.sourceforge.net/geany/?rev=1060&view=rev
Author:   eht16
Date:     2006-12-07 08:12:01 -0800 (Thu, 07 Dec 2006)

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

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/src/dialogs.c
    trunk/src/vte.c

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2006-12-07 16:09:45 UTC (rev 1059)
+++ trunk/ChangeLog	2006-12-07 16:12:01 UTC (rev 1060)
@@ -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 at uvena.de>

Modified: trunk/src/dialogs.c
===================================================================
--- trunk/src/dialogs.c	2006-12-07 16:09:45 UTC (rev 1059)
+++ trunk/src/dialogs.c	2006-12-07 16:12:01 UTC (rev 1060)
@@ -1196,7 +1196,7 @@
 
 	// 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)

Modified: trunk/src/vte.c
===================================================================
--- trunk/src/vte.c	2006-12-07 16:09:45 UTC (rev 1059)
+++ trunk/src/vte.c	2006-12-07 16:12:01 UTC (rev 1060)
@@ -437,7 +437,7 @@
 
 		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);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.