Revision: 2244 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=2244&view=re... Author: cesspit Date: 2011-10-07 09:46:20 +0000 (Fri, 07 Oct 2011) Log Message: ----------- fix i18n for debugger and addons (added config.h include)
Modified Paths: -------------- trunk/geany-plugins/addons/src/ao_bookmarklist.c trunk/geany-plugins/addons/src/ao_doclist.c trunk/geany-plugins/addons/src/ao_openuri.c trunk/geany-plugins/addons/src/ao_tasks.c trunk/geany-plugins/addons/src/ao_xmltagging.c trunk/geany-plugins/debugger/src/bptree.c trunk/geany-plugins/debugger/src/btnpanel.c trunk/geany-plugins/debugger/src/callbacks.c trunk/geany-plugins/debugger/src/dbm_gdb.c trunk/geany-plugins/debugger/src/dconfig.c trunk/geany-plugins/debugger/src/debug.c trunk/geany-plugins/debugger/src/envtree.c trunk/geany-plugins/debugger/src/keys.c trunk/geany-plugins/debugger/src/plugin.c trunk/geany-plugins/debugger/src/stree.c trunk/geany-plugins/debugger/src/tabs.c trunk/geany-plugins/debugger/src/tpage.c trunk/geany-plugins/debugger/src/utils.c trunk/geany-plugins/debugger/src/vtree.c trunk/geany-plugins/debugger/src/watch_model.c
Modified: trunk/geany-plugins/addons/src/ao_bookmarklist.c =================================================================== --- trunk/geany-plugins/addons/src/ao_bookmarklist.c 2011-10-06 16:53:35 UTC (rev 2243) +++ trunk/geany-plugins/addons/src/ao_bookmarklist.c 2011-10-07 09:46:20 UTC (rev 2244) @@ -24,7 +24,10 @@ #include <gtk/gtk.h> #include <glib-object.h>
-#include "geanyplugin.h" +#ifdef HAVE_CONFIG_H + #include "config.h" +#endif +#include <geanyplugin.h>
#include "addons.h" #include "ao_bookmarklist.h"
Modified: trunk/geany-plugins/addons/src/ao_doclist.c =================================================================== --- trunk/geany-plugins/addons/src/ao_doclist.c 2011-10-06 16:53:35 UTC (rev 2243) +++ trunk/geany-plugins/addons/src/ao_doclist.c 2011-10-07 09:46:20 UTC (rev 2244) @@ -24,7 +24,10 @@ #include <gtk/gtk.h> #include <glib-object.h>
-#include "geanyplugin.h" +#ifdef HAVE_CONFIG_H + #include "config.h" +#endif +#include <geanyplugin.h>
#include "addons.h" #include "ao_doclist.h"
Modified: trunk/geany-plugins/addons/src/ao_openuri.c =================================================================== --- trunk/geany-plugins/addons/src/ao_openuri.c 2011-10-06 16:53:35 UTC (rev 2243) +++ trunk/geany-plugins/addons/src/ao_openuri.c 2011-10-07 09:46:20 UTC (rev 2244) @@ -23,7 +23,10 @@ #include <glib-object.h> #include <string.h>
-#include "geanyplugin.h" +#ifdef HAVE_CONFIG_H + #include "config.h" +#endif +#include <geanyplugin.h>
#include "addons.h" #include "ao_openuri.h"
Modified: trunk/geany-plugins/addons/src/ao_tasks.c =================================================================== --- trunk/geany-plugins/addons/src/ao_tasks.c 2011-10-06 16:53:35 UTC (rev 2243) +++ trunk/geany-plugins/addons/src/ao_tasks.c 2011-10-07 09:46:20 UTC (rev 2244) @@ -25,7 +25,10 @@ #include <gtk/gtk.h> #include <glib-object.h>
-#include "geanyplugin.h" +#ifdef HAVE_CONFIG_H + #include "config.h" +#endif +#include <geanyplugin.h>
#include "addons.h" #include "ao_tasks.h"
Modified: trunk/geany-plugins/addons/src/ao_xmltagging.c =================================================================== --- trunk/geany-plugins/addons/src/ao_xmltagging.c 2011-10-06 16:53:35 UTC (rev 2243) +++ trunk/geany-plugins/addons/src/ao_xmltagging.c 2011-10-07 09:46:20 UTC (rev 2244) @@ -19,7 +19,11 @@ * MA 02110-1301, USA. */
-#include "geanyplugin.h" +#ifdef HAVE_CONFIG_H + #include "config.h" +#endif +#include <geanyplugin.h> + #include "addons.h" #include "ao_xmltagging.h"
Modified: trunk/geany-plugins/debugger/src/bptree.c =================================================================== --- trunk/geany-plugins/debugger/src/bptree.c 2011-10-06 16:53:35 UTC (rev 2243) +++ trunk/geany-plugins/debugger/src/bptree.c 2011-10-07 09:46:20 UTC (rev 2244) @@ -33,7 +33,10 @@ #include <gtk/gtk.h> #include <gdk/gdkkeysyms.h>
-#include "geanyplugin.h" +#ifdef HAVE_CONFIG_H + #include "config.h" +#endif +#include <geanyplugin.h>
#include "breakpoints.h" #include "bptree.h"
Modified: trunk/geany-plugins/debugger/src/btnpanel.c =================================================================== --- trunk/geany-plugins/debugger/src/btnpanel.c 2011-10-06 16:53:35 UTC (rev 2243) +++ trunk/geany-plugins/debugger/src/btnpanel.c 2011-10-07 09:46:20 UTC (rev 2244) @@ -25,7 +25,11 @@
#include <sys/stat.h>
-#include "geanyplugin.h" +#ifdef HAVE_CONFIG_H + #include "config.h" +#endif +#include <geanyplugin.h> + extern GeanyFunctions *geany_functions; extern GeanyPlugin *geany_plugin;
Modified: trunk/geany-plugins/debugger/src/callbacks.c =================================================================== --- trunk/geany-plugins/debugger/src/callbacks.c 2011-10-06 16:53:35 UTC (rev 2243) +++ trunk/geany-plugins/debugger/src/callbacks.c 2011-10-07 09:46:20 UTC (rev 2244) @@ -26,7 +26,11 @@
#include <string.h>
-#include "geanyplugin.h" +#ifdef HAVE_CONFIG_H + #include "config.h" +#endif +#include <geanyplugin.h> + #include "breakpoints.h" #include "debug.h" #include "keys.h"
Modified: trunk/geany-plugins/debugger/src/dbm_gdb.c =================================================================== --- trunk/geany-plugins/debugger/src/dbm_gdb.c 2011-10-06 16:53:35 UTC (rev 2243) +++ trunk/geany-plugins/debugger/src/dbm_gdb.c 2011-10-07 09:46:20 UTC (rev 2244) @@ -30,15 +30,16 @@ #include <wctype.h> #include <unistd.h>
-#include <gtk/gtk.h> +#ifdef HAVE_CONFIG_H + #include "config.h" +#endif +#include <geanyplugin.h> +extern GeanyFunctions *geany_functions; +extern GeanyData *geany_data;
#include "breakpoint.h" #include "debug_module.h"
-#include "geanyplugin.h" -extern GeanyFunctions *geany_functions; -extern GeanyData *geany_data; - /* module features */ #define MODULE_FEATURES MF_ASYNC_BREAKS
Modified: trunk/geany-plugins/debugger/src/dconfig.c =================================================================== --- trunk/geany-plugins/debugger/src/dconfig.c 2011-10-06 16:53:35 UTC (rev 2243) +++ trunk/geany-plugins/debugger/src/dconfig.c 2011-10-07 09:46:20 UTC (rev 2244) @@ -29,7 +29,10 @@
#include <glib/gstdio.h>
-#include "geanyplugin.h" +#ifdef HAVE_CONFIG_H + #include "config.h" +#endif +#include <geanyplugin.h> extern GeanyData *geany_data;
#include "dconfig.h"
Modified: trunk/geany-plugins/debugger/src/debug.c =================================================================== --- trunk/geany-plugins/debugger/src/debug.c 2011-10-06 16:53:35 UTC (rev 2243) +++ trunk/geany-plugins/debugger/src/debug.c 2011-10-07 09:46:20 UTC (rev 2244) @@ -42,7 +42,10 @@ #include <gdk/gdkkeysyms.h> #include <vte/vte.h>
-#include "geanyplugin.h" +#ifdef HAVE_CONFIG_H + #include "config.h" +#endif +#include <geanyplugin.h> extern GeanyFunctions *geany_functions; extern GeanyData *geany_data;
Modified: trunk/geany-plugins/debugger/src/envtree.c =================================================================== --- trunk/geany-plugins/debugger/src/envtree.c 2011-10-06 16:53:35 UTC (rev 2243) +++ trunk/geany-plugins/debugger/src/envtree.c 2011-10-07 09:46:20 UTC (rev 2244) @@ -25,7 +25,11 @@
#include <string.h>
-#include "geanyplugin.h" +#ifdef HAVE_CONFIG_H + #include "config.h" +#endif +#include <geanyplugin.h> + extern GeanyFunctions *geany_functions; extern GeanyPlugin *geany_plugin;
Modified: trunk/geany-plugins/debugger/src/keys.c =================================================================== --- trunk/geany-plugins/debugger/src/keys.c 2011-10-06 16:53:35 UTC (rev 2243) +++ trunk/geany-plugins/debugger/src/keys.c 2011-10-07 09:46:20 UTC (rev 2244) @@ -23,7 +23,11 @@ * Contains hotkeys definition and handlers. */
-#include "geanyplugin.h" +#ifdef HAVE_CONFIG_H + #include "config.h" +#endif +#include <geanyplugin.h> + extern GeanyFunctions *geany_functions; extern GeanyPlugin *geany_plugin;
@@ -42,15 +46,15 @@
/* hotkeys list */ keyinfo keys[] = { - { "key_debug_run", "Run / Continue", KEY_RUN}, - { "key_debug_stop", "Stop", KEY_STOP}, - { "key_debug_restart", "Restart", KEY_RESTART}, - { "key_debug_step_into", "Step into", KEY_STEP_INTO}, - { "key_debug_step_over", "Step over", KEY_STEP_OVER}, - { "key_debug_step_out", "Step out", KEY_STEP_OUT}, - { "key_debug_exec_until", "Run to cursor", KEY_EXECUTE_UNTIL}, - { "key_debug_break", "Add / Remove breakpoint", KEY_BREAKPOINT}, - { "key_current_instruction", "Jump to the currect instruction", KEY_CURRENT_INSTRUCTION}, + { "key_debug_run", N_("Run / Continue"), KEY_RUN}, + { "key_debug_stop", N_("Stop"), KEY_STOP}, + { "key_debug_restart", N_("Restart"), KEY_RESTART}, + { "key_debug_step_into", N_("Step into"), KEY_STEP_INTO}, + { "key_debug_step_over", N_("Step over"), KEY_STEP_OVER}, + { "key_debug_step_out", N_("Step out"), KEY_STEP_OUT}, + { "key_debug_exec_until", N_("Run to cursor"), KEY_EXECUTE_UNTIL}, + { "key_debug_break", N_("Add / Remove breakpoint"), KEY_BREAKPOINT}, + { "key_current_instruction", N_("Jump to the currect instruction"), KEY_CURRENT_INSTRUCTION}, { NULL, NULL, 0} };
Modified: trunk/geany-plugins/debugger/src/plugin.c =================================================================== --- trunk/geany-plugins/debugger/src/plugin.c 2011-10-06 16:53:35 UTC (rev 2243) +++ trunk/geany-plugins/debugger/src/plugin.c 2011-10-07 09:46:20 UTC (rev 2244) @@ -24,10 +24,10 @@ */
#ifdef HAVE_CONFIG_H -# include "config.h" + #include "config.h" #endif +#include <geanyplugin.h>
-#include "geanyplugin.h" #include "breakpoints.h" #include "callbacks.h" #include "debug.h" @@ -43,7 +43,7 @@
/* These items are set by Geany before plugin_init() is called. */ GeanyPlugin *geany_plugin; -GeanyData *geany_data; +GeanyData *geany_data; GeanyFunctions *geany_functions;
@@ -89,8 +89,6 @@ * Note: data is the same as geany_data. */ void plugin_init(GeanyData *data) { - main_locale_init(LOCALEDIR, GETTEXT_PACKAGE); - keys_init(); pixbufs_init();
Modified: trunk/geany-plugins/debugger/src/stree.c =================================================================== --- trunk/geany-plugins/debugger/src/stree.c 2011-10-06 16:53:35 UTC (rev 2243) +++ trunk/geany-plugins/debugger/src/stree.c 2011-10-07 09:46:20 UTC (rev 2244) @@ -25,9 +25,11 @@
#include <stdlib.h> #include <string.h> -#include <gtk/gtk.h>
-#include "geanyplugin.h" +#ifdef HAVE_CONFIG_H + #include "config.h" +#endif +#include <geanyplugin.h>
#include "breakpoints.h" #include "utils.h"
Modified: trunk/geany-plugins/debugger/src/tabs.c =================================================================== --- trunk/geany-plugins/debugger/src/tabs.c 2011-10-06 16:53:35 UTC (rev 2243) +++ trunk/geany-plugins/debugger/src/tabs.c 2011-10-07 09:46:20 UTC (rev 2244) @@ -24,7 +24,11 @@ * tabs widgets */
-#include "geanyplugin.h" +#ifdef HAVE_CONFIG_H + #include "config.h" +#endif +#include <geanyplugin.h> + extern GeanyFunctions *geany_functions; extern GeanyData *geany_data;
Modified: trunk/geany-plugins/debugger/src/tpage.c =================================================================== --- trunk/geany-plugins/debugger/src/tpage.c 2011-10-06 16:53:35 UTC (rev 2243) +++ trunk/geany-plugins/debugger/src/tpage.c 2011-10-07 09:46:20 UTC (rev 2244) @@ -29,7 +29,11 @@
#include <sys/stat.h>
+#ifdef HAVE_CONFIG_H + #include "config.h" +#endif #include "geanyplugin.h" + extern GeanyFunctions *geany_functions; extern GeanyData *geany_data;
Modified: trunk/geany-plugins/debugger/src/utils.c =================================================================== --- trunk/geany-plugins/debugger/src/utils.c 2011-10-06 16:53:35 UTC (rev 2243) +++ trunk/geany-plugins/debugger/src/utils.c 2011-10-07 09:46:20 UTC (rev 2244) @@ -32,7 +32,10 @@ #include "breakpoint.h" #include "debug_module.h"
-#include "geanyplugin.h" +#ifdef HAVE_CONFIG_H + #include "config.h" +#endif +#include <geanyplugin.h> extern GeanyFunctions *geany_functions;
/*
Modified: trunk/geany-plugins/debugger/src/vtree.c =================================================================== --- trunk/geany-plugins/debugger/src/vtree.c 2011-10-06 16:53:35 UTC (rev 2243) +++ trunk/geany-plugins/debugger/src/vtree.c 2011-10-07 09:46:20 UTC (rev 2244) @@ -28,7 +28,10 @@ #include <gtk/gtk.h> #include <gdk/gdkkeysyms.h>
-#include "geanyplugin.h" +#ifdef HAVE_CONFIG_H + #include "config.h" +#endif +#include <geanyplugin.h>
#include "breakpoint.h" #include "debug_module.h"
Modified: trunk/geany-plugins/debugger/src/watch_model.c =================================================================== --- trunk/geany-plugins/debugger/src/watch_model.c 2011-10-06 16:53:35 UTC (rev 2243) +++ trunk/geany-plugins/debugger/src/watch_model.c 2011-10-07 09:46:20 UTC (rev 2244) @@ -24,12 +24,14 @@ * Functions for handling variables tree - expanding, refreshing etc. */
+#ifdef HAVE_CONFIG_H + #include "config.h" +#endif +#include <geanyplugin.h> + #include <string.h> #include <gtk/gtk.h>
-#include <libintl.h> -#define _(String) gettext (String) - #include "watch_model.h" #include "breakpoint.h" #include "debug_module.h"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
plugins-commits@lists.geany.org