Plugins-Commits February 2015

plugins-commits@lists.geany.org

1 participants
61 discussions

[geany/geany-plugins] 62d452: git-changebar: Add support for building with libgit2 >= 0.22
by Colomban Wendling 16 Feb '15

16 Feb '15

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Mon, 16 Feb 2015 16:06:00 UTC Commit: 62d45210db2c43918fef01e67d5f18fc5ddd2372 https://github.com/geany/geany-plugins/commit/62d45210db2c43918fef01e67d5f1… Log Message: ----------- git-changebar: Add support for building with libgit2 >= 0.22 Modified Paths: -------------- git-changebar/src/gcb-plugin.c Modified: git-changebar/src/gcb-plugin.c 9 lines changed, 7 insertions(+), 2 deletions(-) =================================================================== @@ -32,6 +32,11 @@ #include <geany.h> #include <document.h> +#if ! defined (LIBGIT2_SOVERSION) || LIBGIT2_SOVERSION < 22 +# define git_libgit2_init git_threads_init +# define git_libgit2_shutdown git_threads_shutdown +#endif + GeanyPlugin *geany_plugin; GeanyData *geany_data; @@ -1017,7 +1022,7 @@ plugin_init (GeanyData *data) G_thread = NULL; G_queue = NULL; - if (git_threads_init () != 0) { + if (git_libgit2_init () < 0) { const git_error *err = giterr_last (); g_warning ("Failed to initialize libgit2: %s", err ? err->message : "?"); return; @@ -1069,7 +1074,7 @@ plugin_cleanup (void) save_config (); - git_threads_shutdown (); + git_libgit2_shutdown (); } /* --- configuration dialog --- */ -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] efcd27: git-changebar: Lower libgit2 dependency to 0.18
by Colomban Wendling 16 Feb '15

16 Feb '15

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Mon, 16 Feb 2015 15:42:37 UTC Commit: efcd274ebf234565dfb51986e9c13bf17b8308cb https://github.com/geany/geany-plugins/commit/efcd274ebf234565dfb51986e9c13… Log Message: ----------- git-changebar: Lower libgit2 dependency to 0.18 Modified Paths: -------------- build/git-changebar.m4 git-changebar/src/gcb-plugin.c Modified: build/git-changebar.m4 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -5,7 +5,7 @@ AC_DEFUN([GP_CHECK_GITCHANGEBAR], GP_CHECK_PLUGIN_DEPS([GitChangeBar], [GITCHANGEBAR], [$GP_GTK_PACKAGE >= 2.18 glib-2.0 - libgit2]) + libgit2 >= 0.18]) GP_COMMIT_PLUGIN_STATUS([GitChangeBar]) Modified: git-changebar/src/gcb-plugin.c 3 lines changed, 1 insertions(+), 2 deletions(-) =================================================================== @@ -514,7 +514,7 @@ diff_blob_to_doc (const git_blob *old_blob, void *payload) { ScintillaObject *sci = doc->editor->sci; - git_diff_options opts; + git_diff_options opts = GIT_DIFF_OPTIONS_INIT; gchar *buf; size_t len; gboolean free_buf = FALSE; @@ -530,7 +530,6 @@ diff_blob_to_doc (const git_blob *old_blob, } /* no context lines, and no need to bother about binary checks */ - git_diff_init_options (&opts, GIT_DIFF_OPTIONS_VERSION); opts.context_lines = 0; opts.flags = GIT_DIFF_FORCE_TEXT; -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] 01911c: git-ui: Rename plugin to Git Change Bar
by Colomban Wendling 16 Feb '15

16 Feb '15

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Mon, 16 Feb 2015 15:04:27 UTC Commit: 01911c3efec2d7411cdf946d2191919f66b04359 https://github.com/geany/geany-plugins/commit/01911c3efec2d7411cdf946d21919… Log Message: ----------- git-ui: Rename plugin to Git Change Bar While the initial goal of this plugin was bigger, only the changebar feature is currently ready, and useful enough to be released on its own. Modified Paths: -------------- Makefile.am build/git-changebar.m4 build/git-ui.m4 configure.ac git-changebar/AUTHORS git-changebar/COPYING git-changebar/ChangeLog git-changebar/Makefile.am git-changebar/NEWS git-changebar/README git-changebar/data/Makefile.am git-changebar/data/prefs.ui git-changebar/src/Makefile.am git-changebar/src/gcb-plugin.c git-ui/src/Makefile.am po/POTFILES.in Modified: Makefile.am 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -103,8 +103,8 @@ if ENABLE_GENIUSPASTE SUBDIRS += geniuspaste endif -if ENABLE_GITUI -SUBDIRS += git-ui +if ENABLE_GITCHANGEBAR +SUBDIRS += git-changebar endif if ENABLE_MARKDOWN Modified: build/git-changebar.m4 17 lines changed, 17 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,17 @@ +AC_DEFUN([GP_CHECK_GITCHANGEBAR], +[ + GP_ARG_DISABLE([GitChangeBar], [auto]) + + GP_CHECK_PLUGIN_DEPS([GitChangeBar], [GITCHANGEBAR], + [$GP_GTK_PACKAGE >= 2.18 + glib-2.0 + libgit2]) + + GP_COMMIT_PLUGIN_STATUS([GitChangeBar]) + + AC_CONFIG_FILES([ + git-changebar/Makefile + git-changebar/data/Makefile + git-changebar/src/Makefile + ]) +]) Modified: build/git-ui.m4 17 lines changed, 0 insertions(+), 17 deletions(-) =================================================================== @@ -1,17 +0,0 @@ -AC_DEFUN([GP_CHECK_GITUI], -[ - GP_ARG_DISABLE([GitUI], [auto]) - - GP_CHECK_PLUGIN_DEPS([GitUI], [GITUI], - [$GP_GTK_PACKAGE >= 2.18 - glib-2.0 - libgit2]) - - GP_COMMIT_PLUGIN_STATUS([GitUI]) - - AC_CONFIG_FILES([ - git-ui/Makefile - git-ui/data/Makefile - git-ui/src/Makefile - ]) -]) Modified: configure.ac 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -51,7 +51,7 @@ GP_CHECK_GEANYSENDMAIL GP_CHECK_GEANYVC GP_CHECK_GEANYPG GP_CHECK_GENIUSPASTE -GP_CHECK_GITUI +GP_CHECK_GITCHANGEBAR GP_CHECK_MARKDOWN GP_CHECK_MULTITERM GP_CHECK_PAIRTAGHIGHLIGHTER Modified: git-changebar/AUTHORS 0 lines changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: git-changebar/COPYING 0 lines changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: git-changebar/ChangeLog 0 lines changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: git-changebar/Makefile.am 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -1,4 +1,4 @@ include $(top_srcdir)/build/vars.auxfiles.mk -plugin = git-ui +plugin = git-changebar SUBDIRS = data src Modified: git-changebar/NEWS 0 lines changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: git-changebar/README 6 lines changed, 3 insertions(+), 3 deletions(-) =================================================================== @@ -1,6 +1,6 @@ -=============== -Git Integration -=============== +============== +Git Change Bar +============== .. contents:: Modified: git-changebar/data/Makefile.am 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -1,4 +1,4 @@ include $(top_srcdir)/build/vars.docs.mk -plugin = git-ui +plugin = git-changebar dist_plugindata_DATA = prefs.ui Modified: git-changebar/data/prefs.ui 0 lines changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: git-changebar/src/Makefile.am 13 lines changed, 13 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,13 @@ +include $(top_srcdir)/build/vars.build.mk +plugin = git-changebar + +geanyplugins_LTLIBRARIES = git-changebar.la + +git_changebar_la_SOURCES = gcb-plugin.c +git_changebar_la_CPPFLAGS = $(AM_CPPFLAGS) -DG_LOG_DOMAIN=\"GitChangeBar\" \ + -DPLUGIN=\""$(plugin)"\" +git_changebar_la_CFLAGS = $(AM_CFLAGS) $(GITCHANGEBAR_CFLAGS) +git_changebar_la_LIBADD = $(COMMONLIBS) \ + $(GITCHANGEBAR_LIBS) + +include $(top_srcdir)/build/cppcheck.mk Modified: git-changebar/src/gcb-plugin.c 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -42,8 +42,8 @@ PLUGIN_VERSION_CHECK(219) /* for document IDs */ PLUGIN_SET_TRANSLATABLE_INFO ( LOCALEDIR, GETTEXT_PACKAGE, - _("Git Integration"), - _("Integration of the Git version control system"), + _("Git Change Bar"), + _("Highlights uncommitted changes in files tracked with Git"), "0.1", "Colomban Wendling <ban(a)herbesfolles.org>" ) Modified: git-ui/src/Makefile.am 13 lines changed, 0 insertions(+), 13 deletions(-) =================================================================== @@ -1,13 +0,0 @@ -include $(top_srcdir)/build/vars.build.mk -plugin = git-ui - -geanyplugins_LTLIBRARIES = git-ui.la - -git_ui_la_SOURCES = ggu-plugin.c -git_ui_la_CPPFLAGS = $(AM_CPPFLAGS) -DG_LOG_DOMAIN=\"GitUI\" \ - -DPLUGIN=\""$(plugin)"\" -git_ui_la_CFLAGS = $(AM_CFLAGS) $(GITUI_CFLAGS) -git_ui_la_LIBADD = $(COMMONLIBS) \ - $(GITUI_LIBS) - -include $(top_srcdir)/build/cppcheck.mk Modified: po/POTFILES.in 6 lines changed, 3 insertions(+), 3 deletions(-) =================================================================== @@ -216,9 +216,9 @@ geanyvc/src/utils.c # GeniusPaste geniuspaste/src/geniuspaste.c -# GitUI -[type: gettext/glade]git-ui/data/prefs.ui -git-ui/src/ggu-plugin.c +# GitChangeBar +[type: gettext/glade]git-changebar/data/prefs.ui +git-changebar/src/gcb-plugin.c # Markdown markdown/src/conf.c -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] 050d0d: git-ui: Add a setting to disable repository monitoring
by Colomban Wendling 16 Feb '15

16 Feb '15

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Mon, 16 Feb 2015 14:40:21 UTC Commit: 050d0dfccfe3e4de0bb1b38275abd2fc292d5a27 https://github.com/geany/geany-plugins/commit/050d0dfccfe3e4de0bb1b38275abd… Log Message: ----------- git-ui: Add a setting to disable repository monitoring While monitoring provides best user experience by keeping the diff in sync with the actual repository status throughout commits and branch switch, some people want to avoid this kind of implicit behavior, so add a setting to allow disabling it. Modified Paths: -------------- git-ui/data/prefs.ui git-ui/src/ggu-plugin.c Modified: git-ui/data/prefs.ui 20 lines changed, 19 insertions(+), 1 deletions(-) =================================================================== @@ -5,6 +5,24 @@ <object class="GtkVBox" id="base"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="spacing">6</property> + <child> + <object class="GtkCheckButton" id="monitoring-check"> + <property name="label" translatable="yes">_Monitor repository for changes</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="tooltip_text" translatable="yes">Whether to automatically update the diff in order to maintain it up to date when the underlying Git repository changes. This should generally be enabled for optimal user experience.</property> + <property name="use_underline">True</property> + <property name="xalign">0</property> + <property name="draw_indicator">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> <child> <object class="GtkFrame" id="frame1"> <property name="visible">True</property> @@ -155,7 +173,7 @@ <packing> <property name="expand">True</property> <property name="fill">True</property> - <property name="position">0</property> + <property name="position">1</property> </packing> </child> </object> Modified: git-ui/src/ggu-plugin.c 50 lines changed, 44 insertions(+), 6 deletions(-) =================================================================== @@ -114,14 +114,23 @@ static void write_setting_color (GKeyFile *kf, const gchar *group, const gchar *key, gconstpointer value); +static void read_setting_boolean (GKeyFile *kf, + const gchar *group, + const gchar *key, + gpointer value); +static void write_setting_boolean (GKeyFile *kf, + const gchar *group, + const gchar *key, + gconstpointer value); /* cache */ -static git_blob *G_file_blob = NULL; +static git_blob *G_file_blob = NULL; /* global state */ -static GAsyncQueue *G_queue = NULL; -static GThread *G_thread = NULL; -static gulong G_source_id = 0; +static GAsyncQueue *G_queue = NULL; +static GThread *G_thread = NULL; +static gulong G_source_id = 0; +static gboolean G_monitoring_enabled = TRUE; static struct { gint num; gint style; @@ -145,6 +154,8 @@ static const struct { const gchar *key, gconstpointer value); } G_settings_desc[] = { + { "general", "monitor-repository", &G_monitoring_enabled, + read_setting_boolean, write_setting_boolean }, { "colors", "line-added", &G_markers[MARKER_LINE_ADDED].color, read_setting_color, write_setting_color }, { "colors", "line-changed", &G_markers[MARKER_LINE_CHANGED].color, @@ -290,7 +301,7 @@ worker_thread (gpointer data) if (git_repository_is_bare (repo)) { git_repository_free (repo); repo = NULL; - } else { + } else if (G_monitoring_enabled) { /* we need to monitor HEAD, in case of e.g. branch switch (e.g. * git checkout -b will switch the ref we need to watch) */ monitors[0] = monitor_repo_file (repo, "HEAD", @@ -878,6 +889,28 @@ write_setting_color (GKeyFile *kf, g_key_file_set_value (kf, group, key, kfval); } +static void +read_setting_boolean (GKeyFile *kf, + const gchar *group, + const gchar *key, + gpointer value) +{ + gboolean *bool = value; + + *bool = utils_get_setting_boolean (kf, group, key, *bool); +} + +static void +write_setting_boolean (GKeyFile *kf, + const gchar *group, + const gchar *key, + gconstpointer value) +{ + const gboolean *bool = value; + + g_key_file_set_boolean (kf, group, key, *bool); +} + /* loads @filename in @kf and return %FALSE if failed, emitting a warning * unless the file was simply missing */ static gboolean @@ -1045,6 +1078,7 @@ plugin_cleanup (void) typedef struct ConfigureWidgets ConfigureWidgets; struct ConfigureWidgets { GtkWidget *base; + GtkWidget *monitoring_check; GtkWidget *added_color_button; GtkWidget *changed_color_button; GtkWidget *removed_color_button; @@ -1085,6 +1119,7 @@ on_plugin_configure_response (GtkDialog *dialog, GdkColor color; GeanyDocument *doc = document_get_current (); + G_monitoring_enabled = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (cw->monitoring_check)); gtk_color_button_get_color (GTK_COLOR_BUTTON (cw->added_color_button), &color); G_markers[MARKER_LINE_ADDED].color = color_to_int (&color); @@ -1100,7 +1135,7 @@ on_plugin_configure_response (GtkDialog *dialog, release_resources (documents[i]->editor->sci); } if (doc) { - update_diff_push (doc, FALSE); + update_diff_push (doc, TRUE); } } } @@ -1127,6 +1162,7 @@ plugin_configure (GtkDialog *dialog) GtkWidget **ptr; } map[] = { { "base", &cw->base }, + { "monitoring-check", &cw->monitoring_check }, { "added-color-button", &cw->added_color_button }, { "changed-color-button", &cw->changed_color_button }, { "removed-color-button", &cw->removed_color_button }, @@ -1137,6 +1173,8 @@ plugin_configure (GtkDialog *dialog) *map[i].ptr = GTK_WIDGET (gtk_builder_get_object (builder, map[i].name)); } + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (cw->monitoring_check), + G_monitoring_enabled); color_from_int (&color, G_markers[MARKER_LINE_ADDED].color); gtk_color_button_set_color (GTK_COLOR_BUTTON (cw->added_color_button), &color); -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] 147c18: git-ui: Add a preference dialog
by Colomban Wendling 16 Feb '15

16 Feb '15

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Mon, 16 Feb 2015 14:35:09 UTC Commit: 147c188c1c03ef38ca62c181e981935bd9650930 https://github.com/geany/geany-plugins/commit/147c188c1c03ef38ca62c181e9819… Log Message: ----------- git-ui: Add a preference dialog Modified Paths: -------------- build/git-ui.m4 git-ui/Makefile.am git-ui/data/Makefile.am git-ui/data/prefs.ui git-ui/src/ggu-plugin.c po/POTFILES.in Modified: build/git-ui.m4 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -11,6 +11,7 @@ AC_DEFUN([GP_CHECK_GITUI], AC_CONFIG_FILES([ git-ui/Makefile + git-ui/data/Makefile git-ui/src/Makefile ]) ]) Modified: git-ui/Makefile.am 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -1,4 +1,4 @@ include $(top_srcdir)/build/vars.auxfiles.mk plugin = git-ui -SUBDIRS = src +SUBDIRS = data src Modified: git-ui/data/Makefile.am 4 lines changed, 4 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,4 @@ +include $(top_srcdir)/build/vars.docs.mk +plugin = git-ui + +dist_plugindata_DATA = prefs.ui Modified: git-ui/data/prefs.ui 162 lines changed, 162 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,162 @@ +<?xml version="1.0" encoding="UTF-8"?> +<interface> + <requires lib="gtk+" version="2.16"/> +  + <object class="GtkVBox" id="base"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="GtkFrame" id="frame1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label_xalign">0</property> + <property name="shadow_type">none</property> + <child> + <object class="GtkAlignment" id="alignment1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="left_padding">12</property> + <child> + <object class="GtkVBox" id="box2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="GtkHBox" id="box3"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="spacing">6</property> + <child> + <object class="GtkLabel" id="label2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">_Added lines:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">added-color-button</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkColorButton" id="added-color-button"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="pack_type">end</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkHBox" id="box4"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="spacing">6</property> + <child> + <object class="GtkLabel" id="label3"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">_Changed lines:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">changed-color-button</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkColorButton" id="changed-color-button"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="pack_type">end</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkHBox" id="box5"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="spacing">6</property> + <child> + <object class="GtkLabel" id="label4"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">_Removed lines:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">removed-color-button</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkColorButton" id="removed-color-button"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="pack_type">end</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> + </child> + </object> + </child> + </object> + </child> + <child type="label"> + <object class="GtkLabel" id="label1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">Colors</property> + <attributes> + <attribute name="weight" value="bold"/> + </attributes> + </object> + </child> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + </object> +</interface> Modified: git-ui/src/ggu-plugin.c 119 lines changed, 119 insertions(+), 0 deletions(-) =================================================================== @@ -1039,3 +1039,122 @@ plugin_cleanup (void) git_threads_shutdown (); } + +/* --- configuration dialog --- */ + +typedef struct ConfigureWidgets ConfigureWidgets; +struct ConfigureWidgets { + GtkWidget *base; + GtkWidget *added_color_button; + GtkWidget *changed_color_button; + GtkWidget *removed_color_button; +}; + +static void configure_widgets_free (ConfigureWidgets *cw) +{ + g_object_unref (cw->base); + g_free (cw); +} + +static void +color_from_int (GdkColor *color, + guint32 val) +{ + color->red = ((val & 0xff0000) >> 16) * 0x101; + color->green = ((val & 0x00ff00) >> 8) * 0x101; + color->blue = ((val & 0x0000ff) >> 0) * 0x101; +} + +static guint32 +color_to_int (const GdkColor *color) +{ + return (((color->red / 0x101) << 16) | + ((color->green / 0x101) << 8) | + ((color->blue / 0x101) << 0)); +} + +static void +on_plugin_configure_response (GtkDialog *dialog, + gint response, + ConfigureWidgets *cw) +{ + switch (response) { + case GTK_RESPONSE_APPLY: + case GTK_RESPONSE_OK: { + guint i; + GdkColor color; + GeanyDocument *doc = document_get_current (); + + gtk_color_button_get_color (GTK_COLOR_BUTTON (cw->added_color_button), + &color); + G_markers[MARKER_LINE_ADDED].color = color_to_int (&color); + gtk_color_button_get_color (GTK_COLOR_BUTTON (cw->changed_color_button), + &color); + G_markers[MARKER_LINE_CHANGED].color = color_to_int (&color); + gtk_color_button_get_color (GTK_COLOR_BUTTON (cw->removed_color_button), + &color); + G_markers[MARKER_LINE_REMOVED].color = color_to_int (&color); + + /* update everything */ + foreach_document (i) { + release_resources (documents[i]->editor->sci); + } + if (doc) { + update_diff_push (doc, FALSE); + } + } + } +} + +GtkWidget * +plugin_configure (GtkDialog *dialog) +{ + GError *error = NULL; + GtkWidget *base = NULL; + GtkBuilder *builder = gtk_builder_new (); + + gtk_builder_set_translation_domain (builder, GETTEXT_PACKAGE); + if (! gtk_builder_add_from_file (builder, PKGDATADIR"/"PLUGIN"/prefs.ui", + &error)) { + g_critical (_("Failed to load UI definition, please check your " + "installation. The error was: %s"), error->message); + g_error_free (error); + } else { + GdkColor color; + ConfigureWidgets *cw = g_malloc (sizeof *cw); + struct { + const gchar *name; + GtkWidget **ptr; + } map[] = { + { "base", &cw->base }, + { "added-color-button", &cw->added_color_button }, + { "changed-color-button", &cw->changed_color_button }, + { "removed-color-button", &cw->removed_color_button }, + }; + guint i; + + for (i = 0; i < G_N_ELEMENTS (map); i++) { + *map[i].ptr = GTK_WIDGET (gtk_builder_get_object (builder, map[i].name)); + } + + color_from_int (&color, G_markers[MARKER_LINE_ADDED].color); + gtk_color_button_set_color (GTK_COLOR_BUTTON (cw->added_color_button), + &color); + color_from_int (&color, G_markers[MARKER_LINE_CHANGED].color); + gtk_color_button_set_color (GTK_COLOR_BUTTON (cw->changed_color_button), + &color); + color_from_int (&color, G_markers[MARKER_LINE_REMOVED].color); + gtk_color_button_set_color (GTK_COLOR_BUTTON (cw->removed_color_button), + &color); + + base = g_object_ref_sink (cw->base); + + g_signal_connect_data (dialog, "response", + G_CALLBACK (on_plugin_configure_response), + cw, (GClosureNotify) configure_widgets_free, 0); + } + + g_object_unref (builder); + + return base; +} Modified: po/POTFILES.in 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -217,6 +217,7 @@ geanyvc/src/utils.c geniuspaste/src/geniuspaste.c # GitUI +[type: gettext/glade]git-ui/data/prefs.ui git-ui/src/ggu-plugin.c # Markdown -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] 216fe9: git-ui: Add a configuration file and read and write colors from it
by Colomban Wendling 16 Feb '15

16 Feb '15

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Mon, 16 Feb 2015 13:41:54 UTC Commit: 216fe98773f9e01d5eca543c53e7841ba69e6b93 https://github.com/geany/geany-plugins/commit/216fe98773f9e01d5eca543c53e78… Log Message: ----------- git-ui: Add a configuration file and read and write colors from it Modified Paths: -------------- git-ui/src/ggu-plugin.c Modified: git-ui/src/ggu-plugin.c 207 lines changed, 190 insertions(+), 17 deletions(-) =================================================================== @@ -90,23 +90,6 @@ struct TooltipHunkData { { line, FALSE, doc, blob, tooltip } -/* cache */ -static git_blob *G_file_blob = NULL; -/* global state */ -static GAsyncQueue *G_queue = NULL; -static GThread *G_thread = NULL; -static gulong G_source_id = 0; -static struct { - gint num; - gint style; - guint32 color; -} G_markers[MARKER_COUNT] = { - { -1, SC_MARK_LEFTRECT, 0x73d216 }, - { -1, SC_MARK_LEFTRECT, 0xf57900 }, - { -1, SC_MARK_LEFTRECT, 0xcc0000 } -}; - - static void on_git_head_changed (GFileMonitor *monitor, GFile *file, GFile *other_file, @@ -123,6 +106,52 @@ static gboolean on_sci_query_tooltip (GtkWidget *widget, gboolean keyboard_mode, GtkTooltip *tooltip, gpointer user_data); +static void read_setting_color (GKeyFile *kf, + const gchar *group, + const gchar *key, + gpointer value); +static void write_setting_color (GKeyFile *kf, + const gchar *group, + const gchar *key, + gconstpointer value); + + +/* cache */ +static git_blob *G_file_blob = NULL; +/* global state */ +static GAsyncQueue *G_queue = NULL; +static GThread *G_thread = NULL; +static gulong G_source_id = 0; +static struct { + gint num; + gint style; + guint32 color; +} G_markers[MARKER_COUNT] = { + { -1, SC_MARK_LEFTRECT, 0x73d216 }, + { -1, SC_MARK_LEFTRECT, 0xf57900 }, + { -1, SC_MARK_LEFTRECT, 0xcc0000 } +}; +/* settings description */ +static const struct { + const gchar *group; + const gchar *key; + gpointer value; + void (*read) (GKeyFile *kf, + const gchar *group, + const gchar *key, + gpointer value); + void (*write) (GKeyFile *kf, + const gchar *group, + const gchar *key, + gconstpointer value); +} G_settings_desc[] = { + { "colors", "line-added", &G_markers[MARKER_LINE_ADDED].color, + read_setting_color, write_setting_color }, + { "colors", "line-changed", &G_markers[MARKER_LINE_CHANGED].color, + read_setting_color, write_setting_color }, + { "colors", "line-removed", &G_markers[MARKER_LINE_REMOVED].color, + read_setting_color, write_setting_color } +}; static void @@ -806,6 +835,146 @@ on_git_ref_changed (GFileMonitor *monitor, } } +/* --- configuration loading and saving --- */ + +static void +read_setting_color (GKeyFile *kf, + const gchar *group, + const gchar *key, + gpointer value) +{ + guint32 *color = value; + gchar *kfval = g_key_file_get_value (kf, group, key, NULL); + + if (kfval) { + const gchar *nptr = kfval; + gchar *endptr; + glong val; + + if (*nptr == '#') { + nptr++; + } + + val = strtol (nptr, &endptr, 16); + if (! *endptr && val >= 0 && val <= 0xffffff) { + *color = (guint32) val; + } + g_free (kfval); + } +} + +static void +write_setting_color (GKeyFile *kf, + const gchar *group, + const gchar *key, + gconstpointer value) +{ + const guint32 *color = value; + gchar kfval[8] = {0}; + + g_return_if_fail (*color <= 0xffffff); + + g_snprintf (kfval, sizeof value, "#%.6x", *color); + g_key_file_set_value (kf, group, key, kfval); +} + +/* loads @filename in @kf and return %FALSE if failed, emitting a warning + * unless the file was simply missing */ +static gboolean +read_keyfile (GKeyFile *kf, + const gchar *filename, + GKeyFileFlags flags) +{ + GError *error = NULL; + + if (! g_key_file_load_from_file (kf, filename, flags, &error)) { + if (error->domain != G_FILE_ERROR || error->code != G_FILE_ERROR_NOENT) { + g_warning (_("Failed to load configuration file: %s"), error->message); + } + g_error_free (error); + + return FALSE; + } + + return TRUE; +} + +/* writes @kf in @filename, possibly creating directories to be able to write + * in @filename */ +static gboolean +write_keyfile (GKeyFile *kf, + const gchar *filename) +{ + gchar *dirname = g_path_get_dirname (filename); + GError *error = NULL; + gint err; + gchar *data; + gsize length; + gboolean success = FALSE; + + data = g_key_file_to_data (kf, &length, NULL); + if ((err = utils_mkdir (dirname, TRUE)) != 0) { + g_warning (_("Failed to create configuration directory \"%s\": %s"), + dirname, g_strerror (err)); + } else if (! g_file_set_contents (filename, data, (gssize) length, &error)) { + g_warning (_("Failed to save configuration file: %s"), error->message); + g_error_free (error); + } else { + success = TRUE; + } + g_free (data); + g_free (dirname); + + return success; +} + +static gchar * +get_config_filename (void) +{ + return g_build_filename (geany_data->app->configdir, "plugins", + PLUGIN, PLUGIN".conf", NULL); +} + +static void +load_config (void) +{ + gchar *filename = get_config_filename (); + GKeyFile *kf = g_key_file_new (); + + if (read_keyfile (kf, filename, G_KEY_FILE_NONE)) { + guint i; + + for (i = 0; i < G_N_ELEMENTS (G_settings_desc); i++) { + G_settings_desc[i].read (kf, G_settings_desc[i].group, + G_settings_desc[i].key, + G_settings_desc[i].value); + } + } + g_key_file_free (kf); + g_free (filename); +} + +static void +save_config (void) +{ + gchar *filename = get_config_filename (); + GKeyFile *kf = g_key_file_new (); + guint i; + + read_keyfile (kf, filename, G_KEY_FILE_KEEP_COMMENTS); + for (i = 0; i < G_N_ELEMENTS (G_settings_desc); i++) { + G_settings_desc[i].write (kf, G_settings_desc[i].group, + G_settings_desc[i].key, + G_settings_desc[i].value); + } + write_keyfile (kf, filename); + + g_key_file_free (kf); + g_free (filename); +} + +/* --- plugin initialization and cleanup --- */ + void plugin_init (GeanyData *data) { @@ -822,6 +991,8 @@ plugin_init (GeanyData *data) return; } + load_config (); + plugin_signal_connect (geany_plugin, NULL, "editor-notify", TRUE, G_CALLBACK (on_editor_notify), NULL); plugin_signal_connect (geany_plugin, NULL, "document-activate", TRUE, @@ -864,5 +1035,7 @@ plugin_cleanup (void) release_resources (documents[i]->editor->sci); } + save_config (); + git_threads_shutdown (); } -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] 09f936: git-ui: Use the plugin name from the build system
by Colomban Wendling 16 Feb '15

16 Feb '15

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Mon, 16 Feb 2015 13:37:32 UTC Commit: 09f9363515f23dee9abf4e0d6da6bff861570711 https://github.com/geany/geany-plugins/commit/09f9363515f23dee9abf4e0d6da6b… Log Message: ----------- git-ui: Use the plugin name from the build system Modified Paths: -------------- git-ui/src/Makefile.am git-ui/src/ggu-plugin.c Modified: git-ui/src/Makefile.am 3 lines changed, 2 insertions(+), 1 deletions(-) =================================================================== @@ -4,7 +4,8 @@ plugin = git-ui geanyplugins_LTLIBRARIES = git-ui.la git_ui_la_SOURCES = ggu-plugin.c -git_ui_la_CPPFLAGS = $(AM_CPPFLAGS) -DG_LOG_DOMAIN=\"GitUI\" +git_ui_la_CPPFLAGS = $(AM_CPPFLAGS) -DG_LOG_DOMAIN=\"GitUI\" \ + -DPLUGIN=\""$(plugin)"\" git_ui_la_CFLAGS = $(AM_CFLAGS) $(GITUI_CFLAGS) git_ui_la_LIBADD = $(COMMONLIBS) \ $(GITUI_LIBS) Modified: git-ui/src/ggu-plugin.c 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -54,7 +54,7 @@ PLUGIN_SET_TRANSLATABLE_INFO ( #define QUIT_THREAD_JOB ((AsyncBlobJob *) (&G_queue)) #define RESOURCES_ALLOCATED_QTAG \ - (g_quark_from_static_string ("ggu-git-resources-allocated")) + (g_quark_from_static_string (PLUGIN"/git-resources-allocated")) enum { @@ -318,7 +318,7 @@ get_cached_blob_async (const gchar *path, if (! G_thread) { G_queue = g_async_queue_new (); #if GLIB_CHECK_VERSION (2, 32, 0) - G_thread = g_thread_new ("ggu-git/blob-worker", worker_thread, G_queue); + G_thread = g_thread_new (PLUGIN"/blob-worker", worker_thread, G_queue); #else G_thread = g_thread_create (worker_thread, G_queue, NULL, NULL); #endif -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] 50c88f: git-ui: Properly change which ref is monitored when HEAD changes
by Colomban Wendling 15 Feb '15

15 Feb '15

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Sun, 15 Feb 2015 14:14:16 UTC Commit: 50c88fc025f139e47e8e331365dfc189a834911a https://github.com/geany/geany-plugins/commit/50c88fc025f139e47e8e331365dfc… Log Message: ----------- git-ui: Properly change which ref is monitored when HEAD changes This fixes ref monitoring after switching branches. While in most cases it doesn't matter because either the file has not changed or it has to be reloaded from disk anyway, it happens when the user uses `checkout -b`, as this will change the ref HEAD points to without touching the tree or index. Modified Paths: -------------- git-ui/src/ggu-plugin.c Modified: git-ui/src/ggu-plugin.c 184 lines changed, 137 insertions(+), 47 deletions(-) =================================================================== @@ -70,6 +70,7 @@ typedef void (*BlobReadyFunc) (const gchar *path, typedef struct AsyncBlobJob AsyncBlobJob; struct AsyncBlobJob { + gboolean force; gchar *path; git_blob *blob; BlobReadyFunc callback; @@ -111,6 +112,11 @@ static void on_git_head_changed (GFileMonitor *monitor, GFile *other_file, GFileMonitorEvent event_type, gpointer user_data); +static void on_git_ref_changed (GFileMonitor *monitor, + GFile *file, + GFile *other_file, + GFileMonitorEvent event_type, + gpointer user_data); static gboolean on_sci_query_tooltip (GtkWidget *widget, gint x, gint y, @@ -182,24 +188,73 @@ report_work_in_idle (gpointer data) return FALSE; } +static GFileMonitor * +monitor_repo_file (git_repository *repo, + const gchar *subpath, + GCallback changed_callback, + gpointer user_data) +{ + GFile *file = NULL; + GError *err = NULL; + GFileMonitor *monitor = NULL; + gchar *path = g_build_filename (git_repository_path (repo), + subpath, NULL); + + file = g_file_new_for_path (path); + monitor = g_file_monitor (file, 0, NULL, &err); + if (err) { + g_warning ("Failed to monitor %s: %s", path, err->message); + g_error_free (err); + } else { + g_signal_connect (monitor, "changed", changed_callback, user_data); + } + g_object_unref (file); + g_free (path); + + return monitor; +} + +/* monitors the current reference HEAD points to (probably a branch) */ +static GFileMonitor * +monitor_head_ref (git_repository *repo, + GCallback changed_callback, + gpointer user_data) +{ + git_reference *head = NULL; + GFileMonitor *monitor = NULL; + + if (! git_repository_head_detached (repo) && + git_repository_head (&head, repo) == 0) { + monitor = monitor_repo_file (repo, git_reference_name (head), + changed_callback, user_data); + git_reference_free (head); + } + + return monitor; +} + static gpointer worker_thread (gpointer data) { - GAsyncQueue *queue = data; - git_repository *repo = NULL; - GFileMonitor *monitor = NULL; + GAsyncQueue *queue = data; + git_repository *repo = NULL; + GFileMonitor *monitors[2] = { NULL, NULL }; AsyncBlobJob *job; + guint i; while ((job = g_async_queue_pop (queue)) != QUIT_THREAD_JOB) { const gchar *path = job->path; - if (repo && ! g_str_has_prefix (path, git_repository_workdir (repo))) { + if (repo && (job->force || + ! g_str_has_prefix (path, git_repository_workdir (repo)))) { /* FIXME: this can fail with nested repositories */ git_repository_free (repo); repo = NULL; - if (monitor) { - g_object_unref (monitor); - monitor = NULL; + for (i = 0; i < G_N_ELEMENTS (monitors); i++) { + if (monitors[i]) { + g_object_unref (monitors[i]); + monitors[i] = NULL; + } } } if (! repo && git_repository_open_ext (&repo, path, 0, NULL) == 0) { @@ -207,33 +262,14 @@ worker_thread (gpointer data) git_repository_free (repo); repo = NULL; } else { - gchar *path = NULL; - git_reference *head = NULL; - GFile *file = NULL; - GError *err = NULL; - - if (! git_repository_head_detached (repo) && - git_repository_head (&head, repo) == 0) { - path = g_build_filename (git_repository_path (repo), - git_reference_name (head), NULL); - git_reference_free (head); - } - - if (! path) { - path = g_build_filename (git_repository_path (repo), "HEAD", NULL); - } - - file = g_file_new_for_path (path); - monitor = g_file_monitor_file (file, 0, NULL, &err); - if (err) { - g_warning ("Failed to monitor %s: %s", path, err->message); - g_error_free (err); - } else { - g_signal_connect (monitor, "changed", - G_CALLBACK (on_git_head_changed), job->user_data); - } - g_object_unref (file); - g_free (path); + /* we need to monitor HEAD, in case of e.g. branch switch (e.g. + * git checkout -b will switch the ref we need to watch) */ + monitors[0] = monitor_repo_file (repo, "HEAD", + G_CALLBACK (on_git_head_changed), + job->user_data); + /* and of course the real ref (branch) for when changes get committed */ + monitors[1] = monitor_head_ref (repo, G_CALLBACK (on_git_ref_changed), + job->user_data); } } @@ -248,8 +284,11 @@ worker_thread (gpointer data) g_idle_add_full (G_PRIORITY_LOW, report_work_in_idle, job, free_job); } - if (monitor) { - g_object_unref (monitor); + for (i = 0; i < G_N_ELEMENTS (monitors); i++) { + if (monitors[i]) { + g_object_unref (monitors[i]); + monitors[i] = NULL; + } } if (repo) { git_repository_free (repo); @@ -261,14 +300,16 @@ worker_thread (gpointer data) /* @user_data will also be used to the file monitor callback */ static void get_cached_blob_async (const gchar *path, + gboolean force, BlobReadyFunc callback, gpointer user_data) { - if (G_file_blob || ! path) { + if ((! force && G_file_blob) || ! path) { callback (path, G_file_blob, user_data); } else { AsyncBlobJob *job = g_slice_alloc (sizeof *job); + job->force = force; job->path = g_strdup (path); job->blob = NULL; job->callback = callback; @@ -642,20 +683,52 @@ update_diff (const gchar *path, } static gboolean -update_diff_idle (gpointer id) +do_update_diff_idle (guint doc_id, + gboolean force) { GeanyDocument *doc = document_get_current (); G_source_id = 0; /* make sure the document is still valid and current */ - if (doc && doc->id == GPOINTER_TO_UINT (id)) - get_cached_blob_async (doc->real_path, update_diff, id); + if (doc && doc->id == doc_id) { + get_cached_blob_async (doc->real_path, force, update_diff, + GUINT_TO_POINTER (doc->id)); + } return FALSE; } +static gboolean +update_diff_idle (gpointer id) +{ + return do_update_diff_idle (GPOINTER_TO_UINT (id), FALSE); +} + +static gboolean +update_diff_force_idle (gpointer id) +{ + return do_update_diff_idle (GPOINTER_TO_UINT (id), TRUE); +} + +/* + * @brief Pushes a request for updating the diff + * @param doc The document for which update the diff + * @param force Whether to force reloading the repository information. This + * is used to e.g. force re-setting up monitors after a repository + * change. + * + * Pushes a request for updating the diff. Typically this should be called + * after the user modified the buffer to keep the diff in sync. + * + * Pass @c TRUE to @p force if the repository might have changed in a way that + * requires reloading it. Note that generally you don't need to do so when the + * file might have changed in the repository (e.g. when the user checked out + * another ref) because then the diff is either still valid or the buffer needs + * reloading from disk anyway. + */ static void -update_diff_push (GeanyDocument *doc) +update_diff_push (GeanyDocument *doc, + gboolean force) { g_return_if_fail (DOC_VALID (doc)); @@ -664,7 +737,9 @@ update_diff_push (GeanyDocument *doc) G_source_id = 0; } if (doc->real_path) { - G_source_id = g_timeout_add_full (G_PRIORITY_LOW, 100, update_diff_idle, + G_source_id = g_timeout_add_full (G_PRIORITY_LOW, 100, + force ? update_diff_force_idle + : update_diff_idle, GUINT_TO_POINTER (doc->id), NULL); } } @@ -678,7 +753,7 @@ on_editor_notify (GObject *obj, if (nt->nmhdr.code == SCN_CHARADDED || (nt->nmhdr.code == SCN_MODIFIED && nt->modificationType & (SC_MOD_INSERTTEXT | SC_MOD_DELETETEXT))) { - update_diff_push (editor->document); + update_diff_push (editor->document, FALSE); } return FALSE; @@ -690,7 +765,7 @@ on_document_activate (GObject *obj, gpointer user_data) { clear_cached_blob (); - update_diff_push (doc); + update_diff_push (doc, FALSE); } static void @@ -698,7 +773,7 @@ on_document_reload (GObject *obj, GeanyDocument *doc, gpointer user_data) { - update_diff_push (doc); + update_diff_push (doc, FALSE); } static void @@ -712,7 +787,22 @@ on_git_head_changed (GFileMonitor *monitor, if (doc) { clear_cached_blob (); - update_diff_push (doc); + update_diff_push (doc, TRUE); + } +} + +static void +on_git_ref_changed (GFileMonitor *monitor, + GFile *file, + GFile *other_file, + GFileMonitorEvent event_type, + gpointer user_data) +{ + GeanyDocument *doc = document_find_by_id (GPOINTER_TO_UINT (user_data)); + + if (doc) { + clear_cached_blob (); + update_diff_push (doc, FALSE); } } @@ -745,7 +835,7 @@ plugin_init (GeanyData *data) * of a session */ doc = document_get_current (); if (doc) { - update_diff_push (doc); + update_diff_push (doc, FALSE); } } -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] e9cb0f: Don't use "echo -n" in shell scripts
by Jiří Techet 13 Feb '15

13 Feb '15

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Fri, 13 Feb 2015 11:34:05 UTC Commit: e9cb0f9ed07bae1f52fbc0893023542ba01eb6fc https://github.com/geany/geany-plugins/commit/e9cb0f9ed07bae1f52fbc08930235… Log Message: ----------- Don't use "echo -n" in shell scripts The standard says: If the first operand is -n, or if any of the operands contain a backslash ( '\' ) character, the results are implementation-defined. On OS X it simply prints the "-n" string and everything which follows, including the newline. Use printf instead. Modified Paths: -------------- build/status.m4 po/intl_stats.sh Modified: build/status.m4 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -28,9 +28,9 @@ AC_DEFUN([_GP_STATUS_PRINT_INDENT_], plugin=" ${line%:*}:" status=${line#*:} let extracols=$2-${#plugin} - echo -n "$plugin" + printf "$plugin" for (( i=0; $i<$extracols; i++ )); do - echo -n ' ' + printf ' ' done echo $status done << GPEOF Modified: po/intl_stats.sh 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -92,7 +92,7 @@ else do # maybe the regexp can be optimized, regexps are not my best friends creationdate=`grep "PO-Revision-Date:" po/$lang.po | sed 's/.*: $[0-9]\{4\}-[0-9]\{2\}-[0-9]\{2\} [0-9]\{2\}:[0-9]\{2\}[+|-][0-9]\{4\}$.*/\1/'` - echo -n $eswitch $lang"\t("$creationdate"):\t" + printf "%s %s\t(%s):\t" "$eswitch" "$lang" "$creationdate" msgfmt --check --statistics po/$lang.po; done fi -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] 18936f: geanylua: Do not accept Lua5.2 as the plugin doesn't build with it
by Colomban Wendling 12 Feb '15

12 Feb '15

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Thu, 12 Feb 2015 14:01:34 UTC Commit: 18936f6db14989b49a5a3899ecd6f95becda5b76 https://github.com/geany/geany-plugins/commit/18936f6db14989b49a5a3899ecd6f… Log Message: ----------- geanylua: Do not accept Lua5.2 as the plugin doesn't build with it Make sure the found Lua package is version 5.1 and not newer, as 5.2 breaks compilation. The issue with 5.2 was reported by an user on IRC. Modified Paths: -------------- build/geanylua.m4 geanylua/wscript_configure Modified: build/geanylua.m4 4 lines changed, 3 insertions(+), 1 deletions(-) =================================================================== @@ -14,8 +14,10 @@ AC_DEFUN([GP_CHECK_GEANYLUA], done]) LUA_VERSION=5.1 + LUA_VERSION_BOUNDARY=5.2 GP_CHECK_PLUGIN_DEPS([GeanyLua], [LUA], - [${LUA_PKG_NAME} >= ${LUA_VERSION}]) + [${LUA_PKG_NAME} >= ${LUA_VERSION} + ${LUA_PKG_NAME} < ${LUA_VERSION_BOUNDARY}]) GP_CHECK_PLUGIN_DEPS([GeanyLua], [GMODULE], [gmodule-2.0]) GP_COMMIT_PLUGIN_STATUS([GeanyLua]) Modified: geanylua/wscript_configure 6 lines changed, 4 insertions(+), 2 deletions(-) =================================================================== @@ -30,10 +30,12 @@ def try_to_find_lua_package(): for package_name in package_names: check_cfg_cached(conf, package=package_name, - atleast_version='5.1', mandatory=False, uselib_store='LUA', - args='--cflags --libs') + args='%s >= 5.1 %s < 5.2 --cflags --libs' % + (package_name, package_name), + msg="Checking for '%s' >= 5.1 and < 5.2" % + package_name) if conf.env['HAVE_LUA'] == 1: return True return False -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

Plugins-Commits February 2015