Revision: 5856 http://geany.svn.sourceforge.net/geany/?rev=5856&view=rev Author: colombanw Date: 2011-06-17 22:52:43 +0000 (Fri, 17 Jun 2011)
Log Message: ----------- Fix a few GCC warnings
Modified Paths: -------------- trunk/plugins/filebrowser.c trunk/src/plugins.c trunk/src/sidebar.c trunk/src/ui_utils.c trunk/tagmanager/get.c trunk/tagmanager/php.c trunk/tagmanager/sql.c
Modified: trunk/plugins/filebrowser.c =================================================================== --- trunk/plugins/filebrowser.c 2011-06-17 22:52:17 UTC (rev 5855) +++ trunk/plugins/filebrowser.c 2011-06-17 22:52:43 UTC (rev 5856) @@ -842,7 +842,7 @@ ui_widget_modify_font_from_string(file_view, geany->interface_prefs->tagbar_font);
/* tooltips */ - gtk_tree_view_set_tooltip_column(file_view, FILEVIEW_COLUMN_FILENAME); + gtk_tree_view_set_tooltip_column(GTK_TREE_VIEW(file_view), FILEVIEW_COLUMN_FILENAME);
/* selection handling */ selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(file_view));
Modified: trunk/src/plugins.c =================================================================== --- trunk/src/plugins.c 2011-06-17 22:52:17 UTC (rev 5855) +++ trunk/src/plugins.c 2011-06-17 22:52:43 UTC (rev 5856) @@ -892,7 +892,7 @@ }
-static gchar *get_plugin_path() +static gchar *get_plugin_path(void) { #ifdef G_OS_WIN32 gchar *path;
Modified: trunk/src/sidebar.c =================================================================== --- trunk/src/sidebar.c 2011-06-17 22:52:17 UTC (rev 5855) +++ trunk/src/sidebar.c 2011-06-17 22:52:43 UTC (rev 5856) @@ -136,11 +136,11 @@ g_signal_connect(tree, "key-press-event", G_CALLBACK(sidebar_key_press_cb), NULL);
- gtk_tree_view_set_show_expanders(tree, interface_prefs.show_symbol_list_expanders); + gtk_tree_view_set_show_expanders(GTK_TREE_VIEW(tree), interface_prefs.show_symbol_list_expanders); if (! interface_prefs.show_symbol_list_expanders) - gtk_tree_view_set_level_indentation(tree, 10); + gtk_tree_view_set_level_indentation(GTK_TREE_VIEW(tree), 10); /* Tooltips */ - gtk_tree_view_set_tooltip_column(tree, SYMBOLS_COLUMN_TOOLTIP); + gtk_tree_view_set_tooltip_column(GTK_TREE_VIEW(tree), SYMBOLS_COLUMN_TOOLTIP);
/* selection handling */ selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(tree)); @@ -307,7 +307,7 @@ ui_widget_modify_font_from_string(tv.tree_openfiles, interface_prefs.tagbar_font);
/* tooltips */ - gtk_tree_view_set_tooltip_column(tv.tree_openfiles, DOCUMENTS_FILENAME); + gtk_tree_view_set_tooltip_column(GTK_TREE_VIEW(tv.tree_openfiles), DOCUMENTS_FILENAME);
/* selection handling */ selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(tv.tree_openfiles));
Modified: trunk/src/ui_utils.c =================================================================== --- trunk/src/ui_utils.c 2011-06-17 22:52:17 UTC (rev 5855) +++ trunk/src/ui_utils.c 2011-06-17 22:52:43 UTC (rev 5856) @@ -1937,9 +1937,9 @@ gsize i, len; GtkStockItem items[] = { - { GEANY_STOCK_SAVE_ALL, _("Save All"), 0, 0, GETTEXT_PACKAGE }, - { GEANY_STOCK_CLOSE_ALL, _("Close All"), 0, 0, GETTEXT_PACKAGE }, - { GEANY_STOCK_BUILD, _("Build"), 0, 0, GETTEXT_PACKAGE } + { GEANY_STOCK_SAVE_ALL, N_("Save All"), 0, 0, GETTEXT_PACKAGE }, + { GEANY_STOCK_CLOSE_ALL, N_("Close All"), 0, 0, GETTEXT_PACKAGE }, + { GEANY_STOCK_BUILD, N_("Build"), 0, 0, GETTEXT_PACKAGE } };
len = G_N_ELEMENTS(items);
Modified: trunk/tagmanager/get.c =================================================================== --- trunk/tagmanager/get.c 2011-06-17 22:52:17 UTC (rev 5855) +++ trunk/tagmanager/get.c 2011-06-17 22:52:43 UTC (rev 5856) @@ -494,7 +494,7 @@ /* Skips over a D style comment. * Really we should match nested /+ comments. At least they're less common. */ -int skipOverDComment (void) +static int skipOverDComment (void) { int c = fileGetc ();
Modified: trunk/tagmanager/php.c =================================================================== --- trunk/tagmanager/php.c 2011-06-17 22:52:17 UTC (rev 5855) +++ trunk/tagmanager/php.c 2011-06-17 22:52:43 UTC (rev 5856) @@ -102,7 +102,7 @@ { char *name, *arglist; char kind = 'f'; - static char *kindName = "function"; + static const char *kindName = "function"; tagEntryInfo e; const regexMatch *match_funcname = NULL; const regexMatch *match_arglist = NULL;
Modified: trunk/tagmanager/sql.c =================================================================== --- trunk/tagmanager/sql.c 2011-06-17 22:52:17 UTC (rev 5855) +++ trunk/tagmanager/sql.c 2011-06-17 22:52:43 UTC (rev 5856) @@ -267,7 +267,7 @@ * DEBUG function */
-static void dispToken (tokenInfo *const token, char * location) +static void dispToken (tokenInfo *const token, const char * location) { #ifdef DEBUG if ( isKeyword(token, KEYWORD_NONE) )
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.