Revision: 912 http://svn.sourceforge.net/geany/?rev=912&view=rev Author: ntrel Date: 2006-10-21 04:16:54 -0700 (Sat, 21 Oct 2006)
Log Message: ----------- Move geany_debug prototype to geany.h so that all files can use it without a dependency on main.h.
Modified Paths: -------------- trunk/ChangeLog trunk/src/build.c trunk/src/callbacks.c trunk/src/geany.h trunk/src/highlighting.c trunk/src/main.h trunk/src/sci_cb.c trunk/src/search.c trunk/src/utils.c trunk/src/vte.c
Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2006-10-21 11:01:34 UTC (rev 911) +++ trunk/ChangeLog 2006-10-21 11:16:54 UTC (rev 912) @@ -9,7 +9,12 @@ Rename document_find_next() document_search_bar_find(). * src/msgwindow.h, src/dialogs.h, src/main.h: Add G_GNUC_PRINTF checks for variable argument function prototypes. + * src/build.c, src/utils.c, src/highlighting.c, src/geany.h, + src/callbacks.c, src/sci_cb.c, src/vte.c, src/search.c, src/main.h: + Move geany_debug prototype to geany.h so that all files can use it + without a dependency on main.h.
+ 2006-10-20 Nick Treleaven nick.treleaven@btinternet.com
* src/interface.c, src/main.c, geany.glade:
Modified: trunk/src/build.c =================================================================== --- trunk/src/build.c 2006-10-21 11:01:34 UTC (rev 911) +++ trunk/src/build.c 2006-10-21 11:16:54 UTC (rev 912) @@ -41,7 +41,6 @@ #include "dialogs.h" #include "msgwindow.h" #include "document.h" -#include "main.h" #include "keybindings.h"
Modified: trunk/src/callbacks.c =================================================================== --- trunk/src/callbacks.c 2006-10-21 11:01:34 UTC (rev 911) +++ trunk/src/callbacks.c 2006-10-21 11:16:54 UTC (rev 912) @@ -50,7 +50,6 @@ #include "keybindings.h" #include "encodings.h" #include "search.h" -#include "main.h"
#ifdef G_OS_WIN32 # include "win32.h"
Modified: trunk/src/geany.h =================================================================== --- trunk/src/geany.h 2006-10-21 11:01:34 UTC (rev 911) +++ trunk/src/geany.h 2006-10-21 11:16:54 UTC (rev 912) @@ -222,4 +222,7 @@ };
+// implementation in main.c; prototype is here so that all files can use it. +void geany_debug(gchar const *format, ...) G_GNUC_PRINTF (1, 2); + #endif
Modified: trunk/src/highlighting.c =================================================================== --- trunk/src/highlighting.c 2006-10-21 11:01:34 UTC (rev 911) +++ trunk/src/highlighting.c 2006-10-21 11:16:54 UTC (rev 912) @@ -27,7 +27,6 @@ #include "highlighting.h" #include "sci_cb.h" #include "utils.h" -#include "main.h" #include "filetypes.h" #include "symbols.h"
Modified: trunk/src/main.h =================================================================== --- trunk/src/main.h 2006-10-21 11:01:34 UTC (rev 911) +++ trunk/src/main.h 2006-10-21 11:16:54 UTC (rev 912) @@ -34,8 +34,6 @@ extern CommandLineOptions cl_options;
-void geany_debug(gchar const *format, ...) G_GNUC_PRINTF (1, 2); - gchar *get_argv_filename(const gchar *filename);
#endif
Modified: trunk/src/sci_cb.c =================================================================== --- trunk/src/sci_cb.c 2006-10-21 11:01:34 UTC (rev 911) +++ trunk/src/sci_cb.c 2006-10-21 11:16:54 UTC (rev 912) @@ -32,8 +32,8 @@ #include "sciwrappers.h" #include "ui_utils.h" #include "utils.h" -#include "main.h"
+ static gchar current_word[GEANY_MAX_WORD_LENGTH]; // holds word under the mouse or keyboard cursor
EditorInfo editor_info = {current_word, -1};
Modified: trunk/src/search.c =================================================================== --- trunk/src/search.c 2006-10-21 11:01:34 UTC (rev 911) +++ trunk/src/search.c 2006-10-21 11:16:54 UTC (rev 912) @@ -30,7 +30,6 @@ #include "msgwindow.h" #include "document.h" #include "sciwrappers.h" -#include "main.h"
#include <unistd.h> #include <string.h>
Modified: trunk/src/utils.c =================================================================== --- trunk/src/utils.c 2006-10-21 11:01:34 UTC (rev 911) +++ trunk/src/utils.c 2006-10-21 11:16:54 UTC (rev 912) @@ -43,7 +43,6 @@ #include "sciwrappers.h" #include "dialogs.h" #include "win32.h" -#include "main.h" #include "encodings.h"
#include "utils.h"
Modified: trunk/src/vte.c =================================================================== --- trunk/src/vte.c 2006-10-21 11:01:34 UTC (rev 911) +++ trunk/src/vte.c 2006-10-21 11:16:54 UTC (rev 912) @@ -32,7 +32,6 @@ #include "msgwindow.h" #include "support.h" #include "callbacks.h" -#include "main.h"
VteInfo vte_info;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.