[geany/geany-plugins] 944654: Merge branch 'master' of github.com:geany/geany-plugins

[Dimitar Zhekov]

Branch:      refs/heads/master
Author:      Dimitar Zhekov <dimitar.zhekov at gmail.com>
Committer:   Dimitar Zhekov <dimitar.zhekov at gmail.com>
Date:        Mon, 02 Jun 2014 17:22:24 UTC
Commit:      944654e21a9f8d09cd3d6639522c8015aa0f6b68
             https://github.com/geany/geany-plugins/commit/944654e21a9f8d09cd3d6639522c8015aa0f6b68

Log Message:
-----------
Merge branch 'master' of github.com:geany/geany-plugins


Modified Paths:
--------------
    HACKING
    geniuspaste/src/geniuspaste.c
    pairtaghighlighter/src/pair_tag_highlighter.c

Modified: HACKING
26 lines changed, 25 insertions(+), 1 deletions(-)
===================================================================
@@ -192,13 +192,37 @@ build files, which macro is called from configure.ac::
  AC_DEFUN([GP_CHECK_YOURFANCYPLUGINNAME],
  [
      GP_ARG_DISABLE([yourfancypluginname], [auto])
-     GP_STATUS_PLUGIN_ADD([yourfancypluginname], [$enable_yourfancxpluginname])
+     GP_COMMIT_PLUGIN_STATUS([yourfancypluginname])
      AC_CONFIG_FILES([
          yourplugin/Makefile
          yourplugin/src/Makefile
      ])
  ])
 
+You may add checks for dependencies of your plugin between the
+``GP_ARG_DISABLE`` and ``GP_COMMIT_PLUGIN_STATUS`` calls.  Note that you
+must respect the ``$enable_yourfancypluginname`` (lowercase) variable
+and try to avoid performing checks if it is set to ``no``, and never
+abort unless it is set to ``yes``.  If a required dependency is not met
+and ``$enable_yourfancypluginname`` is not set to ``yes``, you should
+update ``enable_yourfancypluginname`` and set it to ``no`` to disable
+building of your plugin.
+
+To ease checking for modules using *pkg-config*, the
+``GP_CHECK_PLUGIN_DEPS`` macro is provided, which wraps
+``PKG_CHECK_MODULES`` and follows the above rules about plugin
+enabling/disabling.
+
+While we recommend plugins to work with both GTK 2 and 3, you can use
+the ``GP_CHECK_PLUGIN_GTK2_ONLY`` or ``GP_CHECK_PLUGIN_GTK3_ONLY``
+macros if your plugin only works with one version.
+
+You may also check which GTK version is used for the build using either
+the ``$GP_GTK_VERSION`` or ``$GP_GTK_PACKAGE`` variables, or the
+``GP_CHECK_GTK3`` macro.  For example, if your plugin works with both
+GTK 2 and 3 but you want to check for a minimal GTK2 version, you may
+use ``$GP_GTK_PACKAGE >= 2.XX`` in a ``GP_CHECK_PLUGIN_DEPS`` call.
+
 
 Makefile inside your plugin folder
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^


Modified: geniuspaste/src/geniuspaste.c
4 lines changed, 2 insertions(+), 2 deletions(-)
===================================================================
@@ -201,7 +201,7 @@ static void paste(GeanyDocument * doc, const gchar * website)
     };
 
     gint occ_position;
-    gint i;
+    guint i;
     guint status;
     gsize f_length;
 
@@ -440,7 +440,7 @@ static void on_configure_response(GtkDialog * dialog, gint response, gpointer *
 
 GtkWidget *plugin_configure(GtkDialog * dialog)
 {
-    gint i;
+    guint i;
     GtkWidget *label, *vbox, *author_label;
 
     vbox = gtk_vbox_new(FALSE, 6);


Modified: pairtaghighlighter/src/pair_tag_highlighter.c
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -171,7 +171,7 @@ static gboolean is_tag_empty(gchar *tagName)
                          "hr", "img", "input", "keygen", "link", "meta",
                          "param", "source", "track", "wbr", "!DOCTYPE"};
 
-    int i;
+    unsigned int i;
     for(i=0; i<(sizeof(emptyTags)/sizeof(emptyTags[0])); i++)
     {
         if(strcmp(tagName, emptyTags[i]) == 0)



--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).