Revision: 3460 http://geany.svn.sourceforge.net/geany/?rev=3460&view=rev Author: eht16 Date: 2009-01-11 18:29:39 +0000 (Sun, 11 Jan 2009)
Log Message: ----------- Fix several compiler warnings and build errors (patch by Daniel Richard G., thanks).
Modified Paths: -------------- trunk/ChangeLog trunk/configure.in trunk/plugins/splitwindow.c trunk/src/callbacks.c trunk/src/document.c trunk/src/document.h trunk/src/filetypes.c trunk/src/highlighting.c trunk/src/keybindings.c trunk/src/plugins.c trunk/src/search.c trunk/src/socket.c trunk/src/symbols.c trunk/tagmanager/read.h
Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2009-01-11 17:40:40 UTC (rev 3459) +++ trunk/ChangeLog 2009-01-11 18:29:39 UTC (rev 3460) @@ -3,6 +3,12 @@ * configure.in, wscript, src/Makefile.am, src/utils.c: Fix build with GTK 2.12 by adding GIO compile and linker flags (closes #2498580). + * configure.in, plugins/splitwindow.c, src/callbacks.c, src/document.c, + src/document.h, src/filetypes.c, src/highlighting.c, + src/keybindings.c, src/plugins.c, src/search.c, src/socket.c, + src/symbols.c, tagmanager/read.h: + Fix several compiler warnings and build errors + (patch by Daniel Richard G., thanks).
2009-01-09 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de>
Modified: trunk/configure.in =================================================================== --- trunk/configure.in 2009-01-11 17:40:40 UTC (rev 3459) +++ trunk/configure.in 2009-01-11 18:29:39 UTC (rev 3460) @@ -137,7 +137,9 @@ PKG_CHECK_MODULES(GIO, [$gio_modules], have_gio=1, have_gio=0) AC_SUBST(GIO_CFLAGS) AC_SUBST(GIO_LIBS) -AC_DEFINE_UNQUOTED(HAVE_GIO, $have_gio, [Whether GIO is available]) +if test $have_gio = 1 ; then + AC_DEFINE(HAVE_GIO, 1, [Whether GIO is available]) +fi
# --disable-deprecated switch for GTK2 purification AC_ARG_ENABLE(deprecated, [ --disable-deprecated Disable deprecated GTK functions. ],
Modified: trunk/plugins/splitwindow.c =================================================================== --- trunk/plugins/splitwindow.c 2009-01-11 17:40:40 UTC (rev 3459) +++ trunk/plugins/splitwindow.c 2009-01-11 18:29:39 UTC (rev 3460) @@ -410,7 +410,7 @@ };
-void plugin_cleanup() +void plugin_cleanup(void) { if (plugin_state != STATE_UNSPLIT) on_unsplit(NULL, NULL);
Modified: trunk/src/callbacks.c =================================================================== --- trunk/src/callbacks.c 2009-01-11 17:40:40 UTC (rev 3459) +++ trunk/src/callbacks.c 2009-01-11 18:29:39 UTC (rev 3460) @@ -1216,7 +1216,7 @@
if (doc != NULL) { - if (! editor_goto_line(doc->editor, val - 1)) + if (! editor_goto_line(doc->editor, (gint) val - 1)) utils_beep(); } }
Modified: trunk/src/document.c =================================================================== --- trunk/src/document.c 2009-01-11 17:40:40 UTC (rev 3459) +++ trunk/src/document.c 2009-01-11 18:29:39 UTC (rev 3460) @@ -530,7 +530,7 @@
/* Opens a new empty document only if there are no other documents open */ -GeanyDocument *document_new_file_if_non_open() +GeanyDocument *document_new_file_if_non_open(void) { if (gtk_notebook_get_n_pages(GTK_NOTEBOOK(main_widgets.notebook)) == 0) return document_new_file(NULL, NULL, NULL);
Modified: trunk/src/document.h =================================================================== --- trunk/src/document.h 2009-01-11 17:40:40 UTC (rev 3459) +++ trunk/src/document.h 2009-01-11 18:29:39 UTC (rev 3460) @@ -138,7 +138,7 @@
GeanyDocument* document_new_file(const gchar *filename, GeanyFiletype *ft, const gchar *text);
-GeanyDocument* document_new_file_if_non_open(); +GeanyDocument* document_new_file_if_non_open(void);
GeanyDocument* document_find_by_filename(const gchar *utf8_filename);
Modified: trunk/src/filetypes.c =================================================================== --- trunk/src/filetypes.c 2009-01-11 17:40:40 UTC (rev 3459) +++ trunk/src/filetypes.c 2009-01-11 18:29:39 UTC (rev 3460) @@ -654,7 +654,7 @@ gtk_widget_show((item));
-static void create_set_filetype_menu() +static void create_set_filetype_menu(void) { filetype_id ft_id; GtkWidget *filetype_menu = ui_lookup_widget(main_widgets.window, "set_filetype1_menu");
Modified: trunk/src/highlighting.c =================================================================== --- trunk/src/highlighting.c 2009-01-11 17:40:40 UTC (rev 3459) +++ trunk/src/highlighting.c 2009-01-11 18:29:39 UTC (rev 3460) @@ -564,11 +564,11 @@ SSM(sci,SCI_MARKERSETFORE, SC_MARKNUM_FOLDERMIDTAIL, 0xffffff); SSM(sci,SCI_MARKERSETBACK, SC_MARKNUM_FOLDERMIDTAIL, 0x000000);
- SSM(sci, SCI_SETPROPERTY, (sptr_t) "fold", (sptr_t) "1"); - SSM(sci, SCI_SETPROPERTY, (sptr_t) "fold.compact", (sptr_t) "0"); - SSM(sci, SCI_SETPROPERTY, (sptr_t) "fold.comment", (sptr_t) "1"); - SSM(sci, SCI_SETPROPERTY, (sptr_t) "fold.preprocessor", (sptr_t) "1"); - SSM(sci, SCI_SETPROPERTY, (sptr_t) "fold.at.else", (sptr_t) "1"); + SSM(sci, SCI_SETPROPERTY, (uptr_t) "fold", (sptr_t) "1"); + SSM(sci, SCI_SETPROPERTY, (uptr_t) "fold.compact", (sptr_t) "0"); + SSM(sci, SCI_SETPROPERTY, (uptr_t) "fold.comment", (sptr_t) "1"); + SSM(sci, SCI_SETPROPERTY, (uptr_t) "fold.preprocessor", (sptr_t) "1"); + SSM(sci, SCI_SETPROPERTY, (uptr_t) "fold.at.else", (sptr_t) "1");
/* bold (3rd argument) is whether to override default foreground selection */
Modified: trunk/src/keybindings.c =================================================================== --- trunk/src/keybindings.c 2009-01-11 17:40:40 UTC (rev 3459) +++ trunk/src/keybindings.c 2009-01-11 18:29:39 UTC (rev 3460) @@ -487,7 +487,7 @@
/* before the tab changes, add the current document to the MRU list */ -static void on_notebook_switch_page() +static void on_notebook_switch_page(void) { GeanyDocument *old = document_get_current();
Modified: trunk/src/plugins.c =================================================================== --- trunk/src/plugins.c 2009-01-11 17:40:40 UTC (rev 3459) +++ trunk/src/plugins.c 2009-01-11 18:29:39 UTC (rev 3460) @@ -735,7 +735,7 @@
/* load active plugins at startup */ static void -load_active_plugins() +load_active_plugins(void) { guint i, len;
Modified: trunk/src/search.c =================================================================== --- trunk/src/search.c 2009-01-11 17:40:40 UTC (rev 3459) +++ trunk/src/search.c 2009-01-11 18:29:39 UTC (rev 3460) @@ -316,7 +316,7 @@ * search dialogs. This needs to be done only once. * The monospace font should increase readibility of regular expressions containing spaces, points, * commas and similar (#1907117). */ -static void load_monospace_style() +static void load_monospace_style(void) { static const gchar *rcstyle = "style "geany-monospace"\n" \ @@ -601,7 +601,7 @@ }
-static void create_fif_dialog() +static void create_fif_dialog(void) { GtkWidget *dir_combo, *combo, *e_combo, *entry; GtkWidget *label, *label1, *label2, *checkbox1, *checkbox2, *check_wholeword,
Modified: trunk/src/socket.c =================================================================== --- trunk/src/socket.c 2009-01-11 17:40:40 UTC (rev 3459) +++ trunk/src/socket.c 2009-01-11 18:29:39 UTC (rev 3460) @@ -481,7 +481,7 @@
/* we never know how the input is encoded, so do the best auto detection we can */ if (! g_utf8_validate(buf, -1, NULL)) - utf8_filename = encodings_convert_to_utf8(buf, -1, NULL); + utf8_filename = encodings_convert_to_utf8(buf, (gsize) -1, NULL); else utf8_filename = g_strdup(buf);
Modified: trunk/src/symbols.c =================================================================== --- trunk/src/symbols.c 2009-01-11 17:40:40 UTC (rev 3459) +++ trunk/src/symbols.c 2009-01-11 18:29:39 UTC (rev 3460) @@ -846,7 +846,7 @@
if (! doc_is_utf8) utf8_name = encodings_convert_to_utf8_from_charset(tag->name, - (gsize)-1, doc->encoding, TRUE); + (gsize) -1, doc->encoding, TRUE); else utf8_name = tag->name;
@@ -889,7 +889,7 @@ ! utils_str_equal(doc->encoding, "None")) { setptr(utf8_name, - encodings_convert_to_utf8_from_charset(utf8_name, -1, doc->encoding, TRUE)); + encodings_convert_to_utf8_from_charset(utf8_name, (gsize) -1, doc->encoding, TRUE)); }
return utf8_name;
Modified: trunk/tagmanager/read.h =================================================================== --- trunk/tagmanager/read.h 2009-01-11 17:40:40 UTC (rev 3459) +++ trunk/tagmanager/read.h 2009-01-11 18:29:39 UTC (rev 3460) @@ -125,8 +125,8 @@ const char *const fileName, const langType language ); extern void bufferClose (void); extern void setBufPos (int new_position); -extern int getBufPos (); -extern boolean useFile (); +extern int getBufPos (void); +extern boolean useFile (void);
#endif /* _READ_H */
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.