Plugins-Commits January 2011

plugins-commits@lists.geany.org

8 participants
110 discussions

SF.net SVN: geany-plugins:[1858] trunk/geany-plugins/webhelper/src/ gwh-keybindings.c
by colombanw＠users.sourceforge.net 19 Jan '11

19 Jan '11

Revision: 1858 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=1858&view=rev Author: colombanw Date: 2011-01-19 18:38:35 +0000 (Wed, 19 Jan 2011) Log Message: ----------- WebHelper: Better support for keybindings when shift is locked Also check the original mods state rather than the masked ones to translate to lowercase the key, so if the modifier that changes the key was masked out we still translate it. Modified Paths: -------------- trunk/geany-plugins/webhelper/src/gwh-keybindings.c Modified: trunk/geany-plugins/webhelper/src/gwh-keybindings.c =================================================================== --- trunk/geany-plugins/webhelper/src/gwh-keybindings.c 2011-01-19 18:38:07 UTC (rev 1857) +++ trunk/geany-plugins/webhelper/src/gwh-keybindings.c 2011-01-19 18:38:35 UTC (rev 1858) @@ -72,7 +72,7 @@ guint keyval = event->keyval; guint i; - if (mods & GDK_SHIFT_MASK) { + if ((event->state & GDK_SHIFT_MASK) || (event->state & GDK_LOCK_MASK)) { keyval = gdk_keyval_to_lower (keyval); } for (i = 0; ! handled && i < GWH_KB_COUNT; i++) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany-plugins:[1857] trunk/geany-plugins/webhelper/src
by colombanw＠users.sourceforge.net 19 Jan '11

19 Jan '11

Revision: 1857 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=1857&view=rev Author: colombanw Date: 2011-01-19 18:38:07 +0000 (Wed, 19 Jan 2011) Log Message: ----------- WebHelper: Make GwhSettings object a lot more dynamic Now settings are installed dynamically by the caller rather than built-in. This makes adding a new setting ways easier and cleaner: the caller only needs to register a new item using gwh_settings_install_property(). Modified Paths: -------------- trunk/geany-plugins/webhelper/src/gwh-plugin.c trunk/geany-plugins/webhelper/src/gwh-settings.c trunk/geany-plugins/webhelper/src/gwh-settings.h Modified: trunk/geany-plugins/webhelper/src/gwh-plugin.c =================================================================== --- trunk/geany-plugins/webhelper/src/gwh-plugin.c 2011-01-18 23:32:03 UTC (rev 1856) +++ trunk/geany-plugins/webhelper/src/gwh-plugin.c 2011-01-19 18:38:07 UTC (rev 1857) @@ -35,6 +35,7 @@ #include "gwh-settings.h" #include "gwh-plugin.h" #include "gwh-keybindings.h" +#include "gwh-enum-types.h" GeanyPlugin *geany_plugin; @@ -289,6 +290,46 @@ GError *err = NULL; G_settings = gwh_settings_get_default (); + + gwh_settings_install_property (G_settings, g_param_spec_boolean ( + "browser-auto-reload", + "Browser auto reload", + "Whether the browser reloads itself upon document saving", + TRUE, + G_PARAM_READWRITE)); + gwh_settings_install_property (G_settings, g_param_spec_string ( + "browser-last-uri", + "Browser last URI", + "Last URI visited by the browser", + "about:blank", + G_PARAM_READWRITE)); + gwh_settings_install_property (G_settings, g_param_spec_enum ( + "browser-orientation", + "Browser orientation", + "Orientation of the browser widget", + GTK_TYPE_ORIENTATION, + GTK_ORIENTATION_VERTICAL, + G_PARAM_READWRITE)); + gwh_settings_install_property (G_settings, g_param_spec_enum ( + "browser-position", + "Browser position", + "Position of the browser widget in Geany's UI", + GWH_TYPE_BROWSER_POSITION, + GWH_BROWSER_POSITION_MESSAGE_WINDOW, + G_PARAM_READWRITE)); + gwh_settings_install_property (G_settings, g_param_spec_string ( + "browser-separate-window-geometry", + "Browser separate window geometry", + "Last geometry of the separated browser's window", + "400x300", + G_PARAM_READWRITE)); + gwh_settings_install_property (G_settings, g_param_spec_string ( + "inspector-window-geometry", + "Inspector window geometry", + "Last geometry of the inspector window", + "400x300", + G_PARAM_READWRITE)); + path = get_config_filename (); if (! gwh_settings_load_from_file (G_settings, path, &err)) { g_warning ("Failed to load configuration: %s", err->message); Modified: trunk/geany-plugins/webhelper/src/gwh-settings.c =================================================================== --- trunk/geany-plugins/webhelper/src/gwh-settings.c 2011-01-18 23:32:03 UTC (rev 1856) +++ trunk/geany-plugins/webhelper/src/gwh-settings.c 2011-01-19 18:38:07 UTC (rev 1857) @@ -22,45 +22,15 @@ #include <string.h> #include <glib.h> #include <glib-object.h> -#include <gtk/gtk.h> /* for GtkOrientation */ +#include <gtk/gtk.h> -#include "gwh-enum-types.h" /* for GwhUiBrowserPosition */ - -/* sets @ptr to @value, freeing @ptr before. - * note that: - * * ptr can be used to compute @value, assignation is done after comuptation - * * ptr is used twice, so it must be side-effects-free */ -#define setptr(ptr, value) \ - G_STMT_START { \ - gpointer new_ptr = (value); \ - g_free (ptr); \ - ptr = new_ptr; \ - } G_STMT_END - - struct _GwhSettingsPrivate { - gboolean browser_auto_reload; - gchar *browser_last_uri; - GtkOrientation browser_orientation; - GwhBrowserPosition browser_position; - gchar *browser_separate_window_geometry; - gchar *inspector_window_geometry; + GPtrArray *prop_array; }; -enum -{ - PROP_0, - PROP_BROWSER_AUTO_RELOAD, - PROP_BROWSER_LAST_URI, - PROP_BROWSER_ORIENTATION, - PROP_BROWSER_POSITION, - PROP_BROWSER_SEPARATE_WINDOW_GEOMETRY, - PROP_INSPECTOR_WINDOW_GEOMETRY -}; - G_DEFINE_TYPE (GwhSettings, gwh_settings, G_TYPE_OBJECT) @@ -72,28 +42,13 @@ { GwhSettings *self = GWH_SETTINGS (object); - switch (prop_id) { - case PROP_BROWSER_AUTO_RELOAD: - g_value_set_boolean (value, self->priv->browser_auto_reload); - break; - case PROP_BROWSER_LAST_URI: - g_value_set_string (value, self->priv->browser_last_uri); - break; - case PROP_BROWSER_ORIENTATION: - g_value_set_enum (value, self->priv->browser_orientation); - break; - case PROP_BROWSER_POSITION: - g_value_set_enum (value, self->priv->browser_position); - break; - case PROP_BROWSER_SEPARATE_WINDOW_GEOMETRY: - g_value_set_string (value, self->priv->browser_separate_window_geometry); - break; - case PROP_INSPECTOR_WINDOW_GEOMETRY: - g_value_set_string (value, self->priv->inspector_window_geometry); - break; + if (G_LIKELY (prop_id > 0 && prop_id <= self->priv->prop_array->len)) { + GValue *prop_value; - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); + prop_value = g_ptr_array_index (self->priv->prop_array, prop_id - 1); + g_value_copy (prop_value, value); + } else { + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); } } @@ -105,29 +60,13 @@ { GwhSettings *self = GWH_SETTINGS (object); - switch (prop_id) { - case PROP_BROWSER_AUTO_RELOAD: - self->priv->browser_auto_reload = g_value_get_boolean (value); - break; - case PROP_BROWSER_LAST_URI: - setptr (self->priv->browser_last_uri, g_value_dup_string (value)); - break; - case PROP_BROWSER_ORIENTATION: - self->priv->browser_orientation = g_value_get_enum (value); - break; - case PROP_BROWSER_POSITION: - self->priv->browser_position = g_value_get_enum (value); - break; - case PROP_BROWSER_SEPARATE_WINDOW_GEOMETRY: - setptr (self->priv->browser_separate_window_geometry, - g_value_dup_string (value)); - break; - case PROP_INSPECTOR_WINDOW_GEOMETRY: - setptr (self->priv->inspector_window_geometry, g_value_dup_string (value)); - break; + if (G_LIKELY (prop_id > 0 && prop_id <= self->priv->prop_array->len)) { + GValue *prop_value; - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); + prop_value = g_ptr_array_index (self->priv->prop_array, prop_id - 1); + g_value_copy (value, prop_value); + } else { + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); } } @@ -137,7 +76,7 @@ GObjectConstructParam *properties) { static GObject *obj = NULL; - + if (G_UNLIKELY (! obj)) { obj = G_OBJECT_CLASS (gwh_settings_parent_class)->constructor (gtype, n_properties, @@ -153,15 +92,21 @@ } static void +free_prop_item (gpointer data, + gpointer user_data) +{ + g_value_unset (data); + g_free (data); +} + +static void gwh_settings_finalize (GObject *object) { GwhSettings *self = GWH_SETTINGS (object); - self->priv->browser_auto_reload = FALSE; - setptr (self->priv->browser_last_uri, NULL); - self->priv->browser_orientation = 0; - self->priv->browser_position = 0; - setptr (self->priv->inspector_window_geometry, NULL); + g_ptr_array_foreach (self->priv->prop_array, free_prop_item, NULL); + g_ptr_array_free (self->priv->prop_array, TRUE); + self->priv->prop_array = NULL; G_OBJECT_CLASS (gwh_settings_parent_class)->finalize (object); } @@ -176,45 +121,6 @@ object_class->get_property = gwh_settings_get_property; object_class->set_property = gwh_settings_set_property; - g_object_class_install_property (object_class, PROP_BROWSER_AUTO_RELOAD, - g_param_spec_boolean ("browser-auto-reload", - "Browser auto reload", - "Whether the browser reloads itself upon document saving", - TRUE, - G_PARAM_READWRITE)); - g_object_class_install_property (object_class, PROP_BROWSER_LAST_URI, - g_param_spec_string ("browser-last-uri", - "Browser last URI", - "Last URI visited by the browser", - "about:blank", - G_PARAM_READWRITE)); - g_object_class_install_property (object_class, PROP_BROWSER_ORIENTATION, - g_param_spec_enum ("browser-orientation", - "Browser orientation", - "Orientation of the browser widget", - GTK_TYPE_ORIENTATION, - GTK_ORIENTATION_VERTICAL, - G_PARAM_READWRITE)); - g_object_class_install_property (object_class, PROP_BROWSER_POSITION, - g_param_spec_enum ("browser-position", - "Browser position", - "Position of the browser widget in Geany's UI", - GWH_TYPE_BROWSER_POSITION, - GWH_BROWSER_POSITION_MESSAGE_WINDOW, - G_PARAM_READWRITE)); - g_object_class_install_property (object_class, PROP_BROWSER_SEPARATE_WINDOW_GEOMETRY, - g_param_spec_string ("browser-separate-window-geometry", - "Browser separate window geometry", - "Last geometry of the separated browser's window", - "400x300", - G_PARAM_READWRITE)); - g_object_class_install_property (object_class, PROP_INSPECTOR_WINDOW_GEOMETRY, - g_param_spec_string ("inspector-window-geometry", - "Inspector window geometry", - "Last geometry of the inspector window", - "400x300", - G_PARAM_READWRITE)); - g_type_class_add_private (klass, sizeof (GwhSettingsPrivate)); } @@ -223,12 +129,7 @@ { self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, GWH_TYPE_SETTINGS, GwhSettingsPrivate); - self->priv->browser_auto_reload = TRUE; - self->priv->browser_last_uri = g_strdup ("about:blank"); - self->priv->browser_orientation = GTK_ORIENTATION_VERTICAL; - self->priv->browser_position = GWH_BROWSER_POSITION_MESSAGE_WINDOW; - self->priv->browser_separate_window_geometry = g_strdup ("400x300"); - self->priv->inspector_window_geometry = g_strdup ("400x300"); + self->priv->prop_array = g_ptr_array_new (); } @@ -240,6 +141,86 @@ return g_object_new (GWH_TYPE_SETTINGS, NULL); } +static gboolean +is_pspec_installed (GObject *obj, + const GParamSpec *pspec) +{ + GParamSpec **pspecs; + guint n_props; + guint i; + gboolean installed = FALSE; + + pspecs = g_object_class_list_properties (G_OBJECT_GET_CLASS (obj), &n_props); + for (i = 0; ! installed && i < n_props; i++) { + installed = (pspec->value_type == pspecs[i]->value_type && + strcmp (pspec->name, pspecs[i]->name) == 0); + } + g_free (pspecs); + + return installed; +} + +void +gwh_settings_install_property (GwhSettings *self, + GParamSpec *pspec) +{ + GValue *value; + + g_return_if_fail (GWH_IS_SETTINGS (self)); + g_return_if_fail (G_IS_PARAM_SPEC (pspec)); + + /* a bit hackish, but allows to install the same property twice because the + * class will not be destroyed if the plugin gets reloaded. safe since the + * object is a singleton that will never de destroyed, and the plugin is + * resident, so the object is still valid after a reload. */ + if (is_pspec_installed (G_OBJECT (self), pspec)) { + return; + } + + value = g_value_init (g_malloc0 (sizeof *value), pspec->value_type); + switch (G_TYPE_FUNDAMENTAL (pspec->value_type)) { + #define HANDLE_BASIC_TYPE(NAME, Name, name) \ + case G_TYPE_##NAME: \ + g_value_set_##name (value, ((GParamSpec##Name*)pspec)->default_value); \ + break; + + HANDLE_BASIC_TYPE (BOOLEAN, Boolean, boolean) + HANDLE_BASIC_TYPE (CHAR, Char, char) + HANDLE_BASIC_TYPE (UCHAR, UChar, uchar) + HANDLE_BASIC_TYPE (INT, Int, int) + HANDLE_BASIC_TYPE (UINT, UInt, uint) + HANDLE_BASIC_TYPE (LONG, Long, long) + HANDLE_BASIC_TYPE (ULONG, ULong, ulong) + HANDLE_BASIC_TYPE (INT64, Int64, int64) + HANDLE_BASIC_TYPE (UINT64, UInt64, uint64) + HANDLE_BASIC_TYPE (FLOAT, Float, float) + HANDLE_BASIC_TYPE (DOUBLE, Double, double) + HANDLE_BASIC_TYPE (ENUM, Enum, enum) + HANDLE_BASIC_TYPE (FLAGS, Flags, flags) + HANDLE_BASIC_TYPE (STRING, String, string) + + #undef HANDLE_BASIC_TYPE + + case G_TYPE_PARAM: + case G_TYPE_BOXED: + case G_TYPE_POINTER: + case G_TYPE_OBJECT: + /* nothing to do with these types, default GValue is fine since they have + * no default value */ + break; + + default: + g_critical ("Unsupported property type \"%s\" for property \"%s\"", + G_VALUE_TYPE_NAME (value), pspec->name); + g_value_unset (value); + g_free (value); + return; + } + g_ptr_array_add (self->priv->prop_array, value); + g_object_class_install_property (G_OBJECT_GET_CLASS (self), + self->priv->prop_array->len, pspec); +} + static void get_key_and_group_from_property_name (const gchar *name, gchar **group, @@ -473,9 +454,9 @@ +/* display/edit widgets stuff */ - static GtkWidget * gwh_settings_widget_new_boolean (GwhSettings *self, const GValue *value, Modified: trunk/geany-plugins/webhelper/src/gwh-settings.h =================================================================== --- trunk/geany-plugins/webhelper/src/gwh-settings.h 2011-01-18 23:32:03 UTC (rev 1856) +++ trunk/geany-plugins/webhelper/src/gwh-settings.h 2011-01-19 18:38:07 UTC (rev 1857) @@ -56,6 +56,9 @@ G_GNUC_INTERNAL GwhSettings *gwh_settings_get_default (void); G_GNUC_INTERNAL +void gwh_settings_install_property (GwhSettings *self, + GParamSpec *pspec); +G_GNUC_INTERNAL gboolean gwh_settings_save_to_file (GwhSettings *self, const gchar *filename, GError **error); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

Nightly build failed: Plugins GTK 2.8 build test
by noreply＠nightly.geany.org 19 Jan '11

19 Jan '11

Plugins GTK 2.8 build test failed at: waf build See http://geany.nightlybuilds.org/misc/build_gtk28_plugins_stderr.log for details. Error messages: Setting top to : /home/enrico/geany/gtk28_test_plugins Setting out to : /home/enrico/geany/_build_/plugins_gtk28 Checking for waf version in 1.6.1-1.7.0 : ok Checking for 'gcc' (c compiler) : ok ... ../../gtk28_test_plugins/geanycfp/src/geanycfp.c:1928: warning: assignment makes pointer from integer without a cast ../../gtk28_test_plugins/geanycfp/src/geanycfp.c:1930: error: 'Accel_Render_Edited_CallBack' undeclared (first use in this function) Waf: Leaving directory `/home/enrico/geany/_build_/plugins_gtk28' Build failed -> task failed (exit status 1): {task 421480976: c geanycfp.c -> geanycfp.c.1.o} ['/usr/bin/gcc', '-O0', '-pipe', '-Wall', '-Waggregate-return', '-Wdeclaration-after-statement', '-Wfloat-equal', '-Winit-self', '-Winline', '-Wmissing-noreturn', '-Wpointer-arith', '-Wsign-compare', '-fno-common', '-DHAVE_CONFIG_H', '-fPIC', '-I/home/enrico/geany/_build_/plugins_gtk28', '-I/usr/local/gtk28/include/gtk-2.0', '-I/usr/local/gtk28/lib/gtk-2.0/include', '-I/usr/local/gtk28/include/atk-1.0', '-I/usr/local/gtk28/include/cairo', '-I/usr/local/gtk28/include/pango-1.0', '-I/usr/include/freetype2', '-I/usr/local/gtk28/include/glib-2.0', '-I/usr/local/gtk28/lib/glib-2.0/include', '-I/usr/local/include/geany', '-I/usr/local/include/geany/tagmanager', '-I/usr/local/include/geany/scintilla', '-DG_LOG_DOMAIN="geanycfp"', '-DGTK', '', '../../gtk28_test_plugins/geanycfp/src/geanycfp.c', '-c', '-o', '', 'geanycfp/src/geanycfp.c.1.o'] http://geany.nightlybuilds.org/

1 0

SF.net SVN: geany-plugins:[1856] trunk/geany-plugins/geanycfp/src/geanycfp. c
by wfraser＠users.sourceforge.net 19 Jan '11

19 Jan '11

Revision: 1856 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=1856&view=rev Author: wfraser Date: 2011-01-18 23:32:03 +0000 (Tue, 18 Jan 2011) Log Message: ----------- removed unused variables, tidied up some gint,guint mix-ups Modified Paths: -------------- trunk/geany-plugins/geanycfp/src/geanycfp.c Modified: trunk/geany-plugins/geanycfp/src/geanycfp.c =================================================================== --- trunk/geany-plugins/geanycfp/src/geanycfp.c 2011-01-17 22:56:21 UTC (rev 1855) +++ trunk/geany-plugins/geanycfp/src/geanycfp.c 2011-01-18 23:32:03 UTC (rev 1856) @@ -19,6 +19,7 @@ #include <sys/stat.h> #include <string.h> #include <gdk/gdkkeysyms.h> +#include <gtk/gtk.h> /* offset for marker numbers used - to bypass markers used by normal bookmarksetc */ #define BOOKMARK_BASE 10 @@ -493,10 +494,7 @@ */ static MacroEvent * GetMacroEventFromString(gchar **s,gint *k) { - gint i; MacroEvent *me; - gchar *p=(*s); - gchar *pTemp; me=g_new0(MacroEvent,1); /* get event number */ @@ -576,7 +574,7 @@ if(utils_str_equal(document_get_current()->file_name,fdTemp->pcFileName)==TRUE) { /* get fold data */ - guFoldData=g_base64_decode(fdTemp->pcFolding,&gs); + guFoldData=g_base64_decode(fdTemp->pcFolding,(gsize*)&gs); /* remove FileData from list needing folds re-applying */ foldingToReApply=g_slist_delete_link(foldingToReApply,gslTemp); break; @@ -1197,7 +1195,7 @@ static void on_document_save(GObject *obj, GeanyDocument *doc, gpointer user_data) { FileData *fdTemp; - gint i,iLineCount,iFlags,iBitCounter=0,iBufferLen; + gint i,iLineCount,iFlags,iBitCounter=0; ScintillaObject* sci=doc->editor->sci; struct stat sBuf; GByteArray *gbaFoldData=g_byte_array_sized_new(1000); @@ -1525,6 +1523,7 @@ static gboolean UseableAccel(guint key,guint mod) { gint i,k; + guint u,t; GSList *gsl; /* check if in use by accelerator groups */ @@ -1532,10 +1531,10 @@ /* loop through all the accelerator groups until we either find one that matches the key (k!=0) * or we don't (k==0) */ - for(i=0,k=0;i<g_slist_length(gsl);i++) + for(u=0,k=0;u<g_slist_length(gsl);u++) { - gtk_accel_group_query((GtkAccelGroup*)((g_slist_nth(gsl,i))->data),key,mod,&k); - if(k!=0) + gtk_accel_group_query((GtkAccelGroup*)((g_slist_nth(gsl,u))->data),key,mod,&t); + if(t!=0) return FALSE; /* combination in use so don't accept as macro trigger */ } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

Nightly build failed: Plugins GTK 2.8 build test
by noreply＠nightly.geany.org 18 Jan '11

18 Jan '11

Plugins GTK 2.8 build test failed at: waf build See http://geany.nightlybuilds.org/misc/build_gtk28_plugins_stderr.log for details. Error messages: Setting top to : /home/enrico/geany/gtk28_test_plugins Setting out to : /home/enrico/geany/_build_/plugins_gtk28 Checking for waf version in 1.6.1-1.7.0 : ok Checking for 'gcc' (c compiler) : ok ... ../../gtk28_test_plugins/geanycfp/src/geanycfp.c:1929: warning: assignment makes pointer from integer without a cast ../../gtk28_test_plugins/geanycfp/src/geanycfp.c:1931: error: 'Accel_Render_Edited_CallBack' undeclared (first use in this function) Waf: Leaving directory `/home/enrico/geany/_build_/plugins_gtk28' Build failed -> task failed (exit status 1): {task 256866832: c geanycfp.c -> geanycfp.c.1.o} ['/usr/bin/gcc', '-O0', '-pipe', '-Wall', '-Waggregate-return', '-Wdeclaration-after-statement', '-Wfloat-equal', '-Winit-self', '-Winline', '-Wmissing-noreturn', '-Wpointer-arith', '-Wsign-compare', '-fno-common', '-DHAVE_CONFIG_H', '-fPIC', '-I/home/enrico/geany/_build_/plugins_gtk28', '-I/usr/local/gtk28/include/gtk-2.0', '-I/usr/local/gtk28/lib/gtk-2.0/include', '-I/usr/local/gtk28/include/atk-1.0', '-I/usr/local/gtk28/include/cairo', '-I/usr/local/gtk28/include/pango-1.0', '-I/usr/include/freetype2', '-I/usr/local/gtk28/include/glib-2.0', '-I/usr/local/gtk28/lib/glib-2.0/include', '-I/usr/local/include/geany', '-I/usr/local/include/geany/tagmanager', '-I/usr/local/include/geany/scintilla', '-DG_LOG_DOMAIN="geanycfp"', '-DGTK', '', '../../gtk28_test_plugins/geanycfp/src/geanycfp.c', '-c', '-o', '', 'geanycfp/src/geanycfp.c.1.o'] http://geany.nightlybuilds.org/

1 0

SF.net SVN: geany-plugins:[1855] trunk/geany-plugins/geanycfp/src/geanycfp. c
by wfraser＠users.sourceforge.net 17 Jan '11

17 Jan '11

Revision: 1855 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=1855&view=rev Author: wfraser Date: 2011-01-17 22:56:21 +0000 (Mon, 17 Jan 2011) Log Message: ----------- removed definition of unsued variable in plugin_init, and changed handling of record,stop recording menuitems to show,hide to make it GTK 2.8 compatible Modified Paths: -------------- trunk/geany-plugins/geanycfp/src/geanycfp.c Modified: trunk/geany-plugins/geanycfp/src/geanycfp.c =================================================================== --- trunk/geany-plugins/geanycfp/src/geanycfp.c 2011-01-16 11:27:46 UTC (rev 1854) +++ trunk/geany-plugins/geanycfp/src/geanycfp.c 2011-01-17 22:56:21 UTC (rev 1855) @@ -82,6 +82,7 @@ static FileData *fdKnownFilesSettings=NULL; static gulong key_release_signal_id; static GtkWidget *Record_Macro_menu_item=NULL; +static GtkWidget *Stop_Record_Macro_menu_item=NULL; static GtkWidget *Edit_Macro_menu_item=NULL; static Macro *RecordingMacro=NULL; static GSList *mList=NULL; @@ -1764,7 +1765,8 @@ /* start actual recording */ scintilla_send_message(document_get_current()->editor->sci,SCI_STARTRECORD,0,0); - gtk_menu_item_set_label(menuitem,_("Stop Recording _Macro")); + gtk_widget_hide(Record_Macro_menu_item); + gtk_widget_show(Stop_Record_Macro_menu_item); } else { scintilla_send_message(document_get_current()->editor->sci,SCI_STOPRECORD,0,0); @@ -1774,7 +1776,8 @@ AddMacroToList(RecordingMacro); /* set ready to record new macro (don't free as macro has been saved in macrolist) */ RecordingMacro=NULL; - gtk_menu_item_set_label(menuitem,_("Record _Macro")); + gtk_widget_show(Record_Macro_menu_item); + gtk_widget_hide(Stop_Record_Macro_menu_item); /* Macros have been changed */ bMacrosHaveChanged=TRUE; @@ -1990,7 +1993,8 @@ FreeMacro(m); /* start actual recording */ scintilla_send_message(document_get_current()->editor->sci,SCI_STARTRECORD,0,0); - gtk_menu_item_set_label(GTK_MENU_ITEM(Record_Macro_menu_item),_("Stop Recording _Macro")); + gtk_widget_hide(Record_Macro_menu_item); + gtk_widget_show(Stop_Record_Macro_menu_item); } /* free memory */ @@ -2006,7 +2010,7 @@ /* set up this plugin */ void plugin_init(GeanyData *data) { - gint i,k,iResults=0,l; + gint i,k,iResults=0; GdkKeymapKey *gdkkmkResults; /* Load settings */ @@ -2063,12 +2067,18 @@ g_free(gdkkmkResults); } - /* add record/stop record menu entry */ + /* add record macro menu entry */ Record_Macro_menu_item=gtk_menu_item_new_with_mnemonic(_("Record _Macro")); gtk_widget_show(Record_Macro_menu_item); gtk_container_add(GTK_CONTAINER(geany->main_widgets->tools_menu),Record_Macro_menu_item); g_signal_connect(Record_Macro_menu_item,"activate",G_CALLBACK(DoMacroRecording),NULL); + /* add stop record macromenu entry */ + Stop_Record_Macro_menu_item=gtk_menu_item_new_with_mnemonic(_("Stop Recording _Macro")); + gtk_widget_hide(Stop_Record_Macro_menu_item); + gtk_container_add(GTK_CONTAINER(geany->main_widgets->tools_menu),Stop_Record_Macro_menu_item); + g_signal_connect(Stop_Record_Macro_menu_item,"activate",G_CALLBACK(DoMacroRecording),NULL); + /* add Edit Macro menu entry */ Edit_Macro_menu_item=gtk_menu_item_new_with_mnemonic(_("_Edit Macros")); gtk_widget_show(Edit_Macro_menu_item); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

Nightly build failed: Plugins GTK 2.8 build test
by noreply＠nightly.geany.org 17 Jan '11

17 Jan '11

Plugins GTK 2.8 build test failed at: waf build See http://geany.nightlybuilds.org/misc/build_gtk28_plugins_stderr.log for details. Error messages: Setting top to : /home/enrico/geany/gtk28_test_plugins Setting out to : /home/enrico/geany/_build_/plugins_gtk28 Checking for waf version in 1.6.1-1.7.0 : ok Checking for 'gcc' (c compiler) : ok ... ../../gtk28_test_plugins/geanycfp/src/geanycfp.c: In function 'plugin_init': ../../gtk28_test_plugins/geanycfp/src/geanycfp.c:2009: warning: unused variable 'l' Waf: Leaving directory `/home/enrico/geany/_build_/plugins_gtk28' Build failed -> task failed (exit status 1): {task 91372048: c geanycfp.c -> geanycfp.c.1.o} ['/usr/bin/gcc', '-O0', '-pipe', '-Wall', '-Waggregate-return', '-Wdeclaration-after-statement', '-Wfloat-equal', '-Winit-self', '-Winline', '-Wmissing-noreturn', '-Wpointer-arith', '-Wsign-compare', '-fno-common', '-DHAVE_CONFIG_H', '-fPIC', '-I/home/enrico/geany/_build_/plugins_gtk28', '-I/usr/local/gtk28/include/gtk-2.0', '-I/usr/local/gtk28/lib/gtk-2.0/include', '-I/usr/local/gtk28/include/atk-1.0', '-I/usr/local/gtk28/include/cairo', '-I/usr/local/gtk28/include/pango-1.0', '-I/usr/include/freetype2', '-I/usr/local/gtk28/include/glib-2.0', '-I/usr/local/gtk28/lib/glib-2.0/include', '-I/usr/local/include/geany', '-I/usr/local/include/geany/tagmanager', '-I/usr/local/include/geany/scintilla', '-DG_LOG_DOMAIN="geanycfp"', '-DGTK', '', '../../gtk28_test_plugins/geanycfp/src/geanycfp.c', '-c', '-o', '', 'geanycfp/src/geanycfp.c.1.o'] http://geany.nightlybuilds.org/

1 0

Nightly build failed: Plugins Windows build
by noreply＠nightly.geany.org 17 Jan '11

17 Jan '11

Plugins Windows build failed at: waf build See http://geany.nightlybuilds.org/win32/build_win32_plugins_stderr.log for details. Error messages: Setting top to : /home/enrico/geany/plugins_svn Setting out to : /home/enrico/geany/_build_/plugins_win32 Checking for waf version in 1.6.1-1.7.0 : ok Checking for 'gcc' (c compiler) : ok ... Creating library file: geanycfp/libgeanycfp.dll.a collect2: ld returned 1 exit status Waf: Leaving directory `/home/enrico/geany/_build_/plugins_win32' Build failed -> task failed (exit status 1): {task 312842384: cshlib geanycfp.c.1.o -> geanycfp.dll,libgeanycfp.dll.a} ['i386-mingw32-gcc', '', 'geanycfp/src/geanycfp.c.1.o', '-o', '', '/home/enrico/geany/_build_/plugins_win32/geanycfp/geanycfp.dll', '-Wl,-Bstatic', '-Wl,-Bdynamic', '-L/usr/local/cross-tools/lib', '-L/usr/local/cross-tools/lib', '-lgtk-win32-2.0', '-lgdk-win32-2.0', '-latk-1.0', '-lgio-2.0', '-lgdk_pixbuf-2.0', '-lpangowin32-1.0', '-lgdi32', '-lpangocairo-1.0', '-lpango-1.0', '-lcairo', '-lgobject-2.0', '-lgmodule-2.0', '-lglib-2.0', '-lintl', '-lgtk-win32-2.0', '-lgdk-win32-2.0', '-latk-1.0', '-lgio-2.0', '-lgdk_pixbuf-2.0', '-lpangowin32-1.0', '-lgdi32', '-lpangocairo-1.0', '-lpango-1.0', '-lcairo', '-lgobject-2.0', '-lgmodule-2.0', '-lglib-2.0', '-lintl', '-Wl,--enable-auto-import', '-Wl,--out-implib,geanycfp/libgeanycfp.dll.a', '-shared'] http://geany.nightlybuilds.org/

1 0

SF.net SVN: geany-plugins:[1854] trunk/geany-plugins/geanycfp/src/geanycfp. c
by wfraser＠users.sourceforge.net 16 Jan '11

16 Jan '11

Revision: 1854 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=1854&view=rev Author: wfraser Date: 2011-01-16 11:27:46 +0000 (Sun, 16 Jan 2011) Log Message: ----------- gint to gsize for argument on line 577 Modified Paths: -------------- trunk/geany-plugins/geanycfp/src/geanycfp.c Modified: trunk/geany-plugins/geanycfp/src/geanycfp.c =================================================================== --- trunk/geany-plugins/geanycfp/src/geanycfp.c 2011-01-16 11:12:39 UTC (rev 1853) +++ trunk/geany-plugins/geanycfp/src/geanycfp.c 2011-01-16 11:27:46 UTC (rev 1854) @@ -561,6 +561,7 @@ guchar* guFoldData=NULL; FileData* fdTemp; GSList * gslTemp=foldingToReApply; + gsize gs; /* setting fold states may have been delayed until after folding points were calculated before * paint so wait for a re-paint and check to see if any folding data needs applying @@ -574,7 +575,7 @@ if(utils_str_equal(document_get_current()->file_name,fdTemp->pcFileName)==TRUE) { /* get fold data */ - guFoldData=g_base64_decode(fdTemp->pcFolding,&i); + guFoldData=g_base64_decode(fdTemp->pcFolding,&gs); /* remove FileData from list needing folds re-applying */ foldingToReApply=g_slist_delete_link(foldingToReApply,gslTemp); break; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany-plugins:[1853] trunk/geany-plugins/geanycfp/src/geanycfp. c
by wfraser＠users.sourceforge.net 16 Jan '11

16 Jan '11

Revision: 1853 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=1853&view=rev Author: wfraser Date: 2011-01-16 11:12:39 +0000 (Sun, 16 Jan 2011) Log Message: ----------- formatting tidying Modified Paths: -------------- trunk/geany-plugins/geanycfp/src/geanycfp.c Modified: trunk/geany-plugins/geanycfp/src/geanycfp.c =================================================================== --- trunk/geany-plugins/geanycfp/src/geanycfp.c 2011-01-16 10:50:17 UTC (rev 1852) +++ trunk/geany-plugins/geanycfp/src/geanycfp.c 2011-01-16 11:12:39 UTC (rev 1853) @@ -329,7 +329,7 @@ /* check to see if it's a message that has string attached, and free it if so */ if(me->message==SCI_REPLACESEL) g_free((void*)(me->lparam)); - + g_free((void*)(gslTemp->data)); gslTemp=g_slist_next(gslTemp); } @@ -579,7 +579,7 @@ foldingToReApply=g_slist_delete_link(foldingToReApply,gslTemp); break; } - + /* move onto next item in foldingToReApply */ gslTemp=g_slist_next(gslTemp); } @@ -588,7 +588,7 @@ if(guFoldData!=NULL) { iLineCount=scintilla_send_message(sci,SCI_GETLINECOUNT,0,0); - + /* go through lines setting fold status */ for(i=0,k=0,iBitCounter=0;i<iLineCount;i++) { @@ -734,7 +734,7 @@ g_free(cName); /* return pretified name */ - return cPretyName; + return cPretyName; } @@ -1176,7 +1176,7 @@ foldingToReApply=g_slist_prepend(foldingToReApply,fd); break; /* file has changed since Geany last saved but, try to load bookmarks anyway */ - case GTK_RESPONSE_REJECT: + case GTK_RESPONSE_REJECT: iLineCount=scintilla_send_message(sci,SCI_GETLINECOUNT,0,0); for(i=0;i<10;i++) if(fd->iBookmark[i]!=-1 && fd->iBookmark[i]<iLineCount) @@ -1471,7 +1471,7 @@ { GeanyDocument *doc; gint i; - Macro *m; + Macro *m; m=FindMacroByKey(ev->keyval,ev->state); @@ -1539,7 +1539,7 @@ /* now check to see if numbered bookmark key is atempted * - * control and number pressed + * control and number pressed */ if(mod==4) { @@ -2047,7 +2047,7 @@ if(k==iResults) { g_free(gdkkmkResults); - continue; + continue; } /* set shift pressed */ @@ -2141,4 +2141,3 @@ /* clean up memory used by macros */ ClearAllMacros(); } - This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

← Newer
1
2
3
4
5
6
7
8
...
11
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

Plugins-Commits January 2011