SF.net SVN: geany: [1715] trunk

[eht16 at users.sourceforge.net]

Revision: 1715
          http://svn.sourceforge.net/geany/?rev=1715&view=rev
Author:   eht16
Date:     2007-07-17 05:37:48 -0700 (Tue, 17 Jul 2007)

Log Message:
-----------
Fix compiler warnings.

Modified Paths:
--------------
    trunk/src/document.c
    trunk/tagmanager/ctags.c
    trunk/tagmanager/entry.c
    trunk/tagmanager/read.c
    trunk/tagmanager/regex.c
    trunk/tagmanager/sort.c
    trunk/tagmanager/strlist.c
    trunk/tagmanager/tm_file_entry.c
    trunk/tagmanager/tm_project.c
    trunk/tagmanager/tm_work_object.c
    trunk/tagmanager/tm_workspace.c

Modified: trunk/src/document.c
===================================================================
--- trunk/src/document.c	2007-07-17 12:04:46 UTC (rev 1714)
+++ trunk/src/document.c	2007-07-17 12:37:48 UTC (rev 1715)
@@ -1085,7 +1085,7 @@
 	// ignore the following things if we are quitting
 	if (! app->quitting)
 	{
-		gchar *basename = g_path_get_basename(doc_list[idx].file_name);
+		gchar *base_name = g_path_get_basename(doc_list[idx].file_name);
 
 		// set line numbers again, to reset the margin width, if
 		// there are more lines than before
@@ -1103,11 +1103,11 @@
 		}
 		document_set_filetype(idx, doc_list[idx].file_type);
 		tm_workspace_update(TM_WORK_OBJECT(app->tm_workspace), TRUE, TRUE, FALSE);
-		gtk_label_set_text(GTK_LABEL(doc_list[idx].tab_label), basename);
-		gtk_label_set_text(GTK_LABEL(doc_list[idx].tabmenu_label), basename);
+		gtk_label_set_text(GTK_LABEL(doc_list[idx].tab_label), base_name);
+		gtk_label_set_text(GTK_LABEL(doc_list[idx].tabmenu_label), base_name);
 		msgwin_status_add(_("File %s saved."), doc_list[idx].file_name);
 		ui_update_statusbar(idx, -1);
-		g_free(basename);
+		g_free(base_name);
 #ifdef HAVE_VTE
 		vte_cwd(doc_list[idx].file_name, FALSE);
 #endif

Modified: trunk/tagmanager/ctags.c
===================================================================
--- trunk/tagmanager/ctags.c	2007-07-17 12:04:46 UTC (rev 1714)
+++ trunk/tagmanager/ctags.c	2007-07-17 12:37:48 UTC (rev 1715)
@@ -21,6 +21,7 @@
 */
 #include "general.h"	/* must always come first */
 #include <glib.h>
+#include <glib/gstdio.h>
 
 #ifdef HAVE_STDLIB_H
 # include <stdlib.h>		/* to declare malloc (), realloc () */

Modified: trunk/tagmanager/entry.c
===================================================================
--- trunk/tagmanager/entry.c	2007-07-17 12:04:46 UTC (rev 1714)
+++ trunk/tagmanager/entry.c	2007-07-17 12:37:48 UTC (rev 1715)
@@ -17,6 +17,7 @@
 #include <ctype.h>	/* to define isspace () */
 #include <errno.h>
 #include <glib.h>
+#include <glib/gstdio.h>
 
 #if defined (HAVE_SYS_TYPES_H)
 # include <sys/types.h>	    /* to declare off_t on some hosts */

Modified: trunk/tagmanager/read.c
===================================================================
--- trunk/tagmanager/read.c	2007-07-17 12:04:46 UTC (rev 1714)
+++ trunk/tagmanager/read.c	2007-07-17 12:37:48 UTC (rev 1715)
@@ -16,6 +16,7 @@
 
 #include <string.h>
 #include <ctype.h>
+#include <glib/gstdio.h>
 
 #define FILE_WRITE
 #include "read.h"

Modified: trunk/tagmanager/regex.c
===================================================================
--- trunk/tagmanager/regex.c	2007-07-17 12:04:46 UTC (rev 1714)
+++ trunk/tagmanager/regex.c	2007-07-17 12:37:48 UTC (rev 1715)
@@ -27,6 +27,7 @@
 # endif
 # include "regex.h"
 #endif
+#include <glib/gstdio.h>
 
 #include "entry.h"
 #include "main.h"

Modified: trunk/tagmanager/sort.c
===================================================================
--- trunk/tagmanager/sort.c	2007-07-17 12:04:46 UTC (rev 1714)
+++ trunk/tagmanager/sort.c	2007-07-17 12:37:48 UTC (rev 1715)
@@ -19,6 +19,7 @@
 #include <string.h>
 #include <stdio.h>
 #include <glib.h>
+#include <glib/gstdio.h>
 
 #include "entry.h"
 #include "main.h"

Modified: trunk/tagmanager/strlist.c
===================================================================
--- trunk/tagmanager/strlist.c	2007-07-17 12:04:46 UTC (rev 1714)
+++ trunk/tagmanager/strlist.c	2007-07-17 12:37:48 UTC (rev 1715)
@@ -18,6 +18,7 @@
 #ifdef HAVE_FNMATCH_H
 # include <fnmatch.h>
 #endif
+#include <glib/gstdio.h>
 
 #include "main.h"
 #include "read.h"

Modified: trunk/tagmanager/tm_file_entry.c
===================================================================
--- trunk/tagmanager/tm_file_entry.c	2007-07-17 12:04:46 UTC (rev 1714)
+++ trunk/tagmanager/tm_file_entry.c	2007-07-17 12:37:48 UTC (rev 1715)
@@ -22,6 +22,7 @@
 #ifdef HAVE_FNMATCH_H
 # include <fnmatch.h>
 #endif
+#include <glib/gstdio.h>
 
 #include "tm_work_object.h"
 #include "tm_file_entry.h"

Modified: trunk/tagmanager/tm_project.c
===================================================================
--- trunk/tagmanager/tm_project.c	2007-07-17 12:04:46 UTC (rev 1714)
+++ trunk/tagmanager/tm_project.c	2007-07-17 12:37:48 UTC (rev 1715)
@@ -18,6 +18,7 @@
 #ifdef HAVE_FNMATCH_H
 # include <fnmatch.h>
 #endif
+#include <glib/gstdio.h>
 
 
 #include "options.h"

Modified: trunk/tagmanager/tm_work_object.c
===================================================================
--- trunk/tagmanager/tm_work_object.c	2007-07-17 12:04:46 UTC (rev 1714)
+++ trunk/tagmanager/tm_work_object.c	2007-07-17 12:37:48 UTC (rev 1715)
@@ -14,6 +14,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <sys/stat.h>
+#include <glib/gstdio.h>
 #ifdef G_OS_WIN32
 # define VC_EXTRALEAN
 # define WIN32_LEAN_AND_MEAN

Modified: trunk/tagmanager/tm_workspace.c
===================================================================
--- trunk/tagmanager/tm_workspace.c	2007-07-17 12:04:46 UTC (rev 1714)
+++ trunk/tagmanager/tm_workspace.c	2007-07-17 12:37:48 UTC (rev 1715)
@@ -19,6 +19,7 @@
 #ifdef HAVE_GLOB_H
 # include <glob.h>
 #endif
+#include <glib/gstdio.h>
 // handling of P_tmpdir, should be something like /tmp, take the root directory under Win32,
 // and assume /tmp on non-Win32 systems where P_tmpdir is not set
 #ifndef P_tmpdir


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