Plugins-Commits March 2011

plugins-commits@lists.geany.org

6 participants
67 discussions

SF.net SVN: geany-plugins:[2009] trunk/geany-plugins
by colombanw＠users.sourceforge.net 30 Mar '11

30 Mar '11

Revision: 2009 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=2009&view=rev Author: colombanw Date: 2011-03-30 22:03:34 +0000 (Wed, 30 Mar 2011) Log Message: ----------- Fix `make distcheck` and VPATH builds Patch against geanyprj/tests/Makefile.am is from Nathan Phillip Brink, thanks. Modified Paths: -------------- trunk/geany-plugins/build/cppcheck.mk trunk/geany-plugins/devhelp/src/Makefile.am trunk/geany-plugins/geanyprj/tests/Makefile.am Added Paths: ----------- trunk/geany-plugins/tableconvert/wscript_configure Modified: trunk/geany-plugins/build/cppcheck.mk =================================================================== --- trunk/geany-plugins/build/cppcheck.mk 2011-03-28 08:22:04 UTC (rev 2008) +++ trunk/geany-plugins/build/cppcheck.mk 2011-03-30 22:03:34 UTC (rev 2009) @@ -1,7 +1,7 @@ if HAVE_CPPCHECK -check-cppcheck: . +check-cppcheck: $(srcdir) $(CPPCHECK) -q --template gcc --error-exitcode=2 $^ check-local: check-cppcheck Modified: trunk/geany-plugins/devhelp/src/Makefile.am =================================================================== --- trunk/geany-plugins/devhelp/src/Makefile.am 2011-03-28 08:22:04 UTC (rev 2008) +++ trunk/geany-plugins/devhelp/src/Makefile.am 2011-03-30 22:03:34 UTC (rev 2009) @@ -13,10 +13,17 @@ plugin.c \ devhelpplugin.c \ main-notebook.c + +noinst_HEADERS = \ + plugin.h \ + devhelpplugin.h \ + main-notebook.h + devhelp_la_CFLAGS = \ $(AM_CFLAGS) \ $(DEVHELP_CFLAGS) \ -DDHPLUG_DATA_DIR=\"$(plugindatadir)\" + devhelp_la_LIBADD = $(DEVHELP_LIBS) include $(top_srcdir)/build/cppcheck.mk Modified: trunk/geany-plugins/geanyprj/tests/Makefile.am =================================================================== --- trunk/geany-plugins/geanyprj/tests/Makefile.am 2011-03-28 08:22:04 UTC (rev 2008) +++ trunk/geany-plugins/geanyprj/tests/Makefile.am 2011-03-30 22:03:34 UTC (rev 2009) @@ -1,6 +1,6 @@ if UNITTESTS include $(top_srcdir)/build/vars.build.mk -INCLUDES = $(GEANY_CFLAGS) -I../src -DUNITTESTS +INCLUDES = $(GEANY_CFLAGS) -I$(srcdir)/../src -DUNITTESTS TESTS=unittests noinst_PROGRAMS=unittests unittests_SOURCES = unittests.c ../src/utils.c Added: trunk/geany-plugins/tableconvert/wscript_configure =================================================================== 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:[2008] trunk/geany-plugins/devhelp/wscript_build
by frlan＠users.sourceforge.net 28 Mar '11

28 Mar '11

Revision: 2008 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=2008&view=rev Author: frlan Date: 2011-03-28 08:22:04 +0000 (Mon, 28 Mar 2011) Log Message: ----------- Fix build with waf Modified Paths: -------------- trunk/geany-plugins/devhelp/wscript_build Modified: trunk/geany-plugins/devhelp/wscript_build =================================================================== --- trunk/geany-plugins/devhelp/wscript_build 2011-03-27 17:56:34 UTC (rev 2007) +++ trunk/geany-plugins/devhelp/wscript_build 2011-03-28 08:22:04 UTC (rev 2008) @@ -26,6 +26,6 @@ name = 'Devhelp' includes = ['devhelp/src'] -libraries = ['DEVHELP', 'GTHREAD'] +libraries = ['LIBDEVHELP', 'GTHREAD'] build_plugin(bld, name, includes=includes, libraries=libraries) 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:[2007] trunk/geany-plugins/updatechecker
by frlan＠users.sourceforge.net 27 Mar '11

27 Mar '11

Revision: 2007 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=2007&view=rev Author: frlan Date: 2011-03-27 17:56:34 +0000 (Sun, 27 Mar 2011) Log Message: ----------- Fix year @ header Modified Paths: -------------- trunk/geany-plugins/updatechecker/wscript_build trunk/geany-plugins/updatechecker/wscript_configure Modified: trunk/geany-plugins/updatechecker/wscript_build =================================================================== --- trunk/geany-plugins/updatechecker/wscript_build 2011-03-27 17:26:15 UTC (rev 2006) +++ trunk/geany-plugins/updatechecker/wscript_build 2011-03-27 17:56:34 UTC (rev 2007) @@ -3,7 +3,7 @@ # WAF build script for geany-plugins - Update Checker # # Copyright 2010 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> -# Copyright 2111 Frank Lanitz <frank(at)frank(dot)uvena(dot)de> +# Copyright 2011 Frank Lanitz <frank(at)frank(dot)uvena(dot)de> # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by Modified: trunk/geany-plugins/updatechecker/wscript_configure =================================================================== --- trunk/geany-plugins/updatechecker/wscript_configure 2011-03-27 17:26:15 UTC (rev 2006) +++ trunk/geany-plugins/updatechecker/wscript_configure 2011-03-27 17:56:34 UTC (rev 2007) @@ -3,7 +3,7 @@ # WAF build script for geany-plugins - Update Checker # # Copyright 2010 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> -# Copyright 2111 Frank Lanitz <frank(at)frank(dot)uvena(dot)de> +# Copyright 2011 Frank Lanitz <frank(at)frank(dot)uvena(dot)de> # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by 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:[2006] trunk/geany-plugins/updatechecker
by frlan＠users.sourceforge.net 27 Mar '11

27 Mar '11

Revision: 2006 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=2006&view=rev Author: frlan Date: 2011-03-27 17:26:15 +0000 (Sun, 27 Mar 2011) Log Message: ----------- Updatechecker: Make plugin depend on API v203 due some theading issue Modified Paths: -------------- trunk/geany-plugins/updatechecker/ChangeLog trunk/geany-plugins/updatechecker/src/updatechecker.c Modified: trunk/geany-plugins/updatechecker/ChangeLog =================================================================== --- trunk/geany-plugins/updatechecker/ChangeLog 2011-03-27 17:25:50 UTC (rev 2005) +++ trunk/geany-plugins/updatechecker/ChangeLog 2011-03-27 17:26:15 UTC (rev 2006) @@ -1,3 +1,8 @@ +2011-03-27 Frank Lanitz <frank(at)frank(dot)uvena(dot)de> + + * Make plugin depend on plugin API v203 due some threading changes. + + 2010-08-27 Frank Lanitz <frank(at)frank(dot)uvena(dot)de> * src/updatechecker.c: Submit an user agent on request. @@ -6,16 +11,14 @@ 2010-08-26 Frank Lanitz <frank(at)frank(dot)uvena(dot)de> * src/updatechecker.c: Cleaning up the code and removing redundant code - as well as fixing a typo. + as well as fixing a typo. 2010-08-23 Frank Lanitz <frank(at)frank(dot)uvena(dot)de> - * src/updatechecker.c: Some adjustments on a couple of strings. + * src/updatechecker.c: Some adjustments on a couple of strings. 2010-08-22 Frank Lanitz <frank(a)frank.uvena.de> * Initial release - - Modified: trunk/geany-plugins/updatechecker/src/updatechecker.c =================================================================== --- trunk/geany-plugins/updatechecker/src/updatechecker.c 2011-03-27 17:25:50 UTC (rev 2005) +++ trunk/geany-plugins/updatechecker/src/updatechecker.c 2011-03-27 17:26:15 UTC (rev 2006) @@ -28,7 +28,7 @@ GeanyData *geany_data; GeanyFunctions *geany_functions; -PLUGIN_VERSION_CHECK(188) +PLUGIN_VERSION_CHECK(203) PLUGIN_SET_TRANSLATABLE_INFO( LOCALEDIR, 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:[2005] trunk/geany-plugins
by frlan＠users.sourceforge.net 27 Mar '11

27 Mar '11

Revision: 2005 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=2005&view=rev Author: frlan Date: 2011-03-27 17:25:50 +0000 (Sun, 27 Mar 2011) Log Message: ----------- Updatechecker: Remove workaround for threading as its now done by Geany Modified Paths: -------------- trunk/geany-plugins/build/updatechecker.m4 trunk/geany-plugins/updatechecker/src/updatechecker.c trunk/geany-plugins/updatechecker/wscript_build trunk/geany-plugins/updatechecker/wscript_configure Modified: trunk/geany-plugins/build/updatechecker.m4 =================================================================== --- trunk/geany-plugins/build/updatechecker.m4 2011-03-27 11:14:38 UTC (rev 2004) +++ trunk/geany-plugins/build/updatechecker.m4 2011-03-27 17:25:50 UTC (rev 2005) @@ -3,8 +3,7 @@ GP_ARG_DISABLE([Updatechecker], [auto]) GP_CHECK_PLUGIN_DEPS([Updatechecker], UPDATECHECKER, - [libsoup-2.4 >= 2.4.0 - gthread-2.0]) + [libsoup-2.4 >= 2.4.0]) GP_STATUS_PLUGIN_ADD([Updatechecker], [$enable_updatechecker]) Modified: trunk/geany-plugins/updatechecker/src/updatechecker.c =================================================================== --- trunk/geany-plugins/updatechecker/src/updatechecker.c 2011-03-27 11:14:38 UTC (rev 2004) +++ trunk/geany-plugins/updatechecker/src/updatechecker.c 2011-03-27 17:25:50 UTC (rev 2005) @@ -310,14 +310,7 @@ void plugin_init(GeanyData *data) { init_configuration(); - /* soup uses threads but it seems to don't initialize the thread system - * Work around baesed on a patch Colomban Wendling and Matthew Brush */ - if (! g_thread_supported ()) - { - g_thread_init (NULL); - } - main_menu_item = gtk_menu_item_new_with_mnemonic(_("Check for Updates")); gtk_widget_show(main_menu_item); gtk_container_add(GTK_CONTAINER(geany->main_widgets->tools_menu), Modified: trunk/geany-plugins/updatechecker/wscript_build =================================================================== --- trunk/geany-plugins/updatechecker/wscript_build 2011-03-27 11:14:38 UTC (rev 2004) +++ trunk/geany-plugins/updatechecker/wscript_build 2011-03-27 17:25:50 UTC (rev 2005) @@ -3,6 +3,7 @@ # WAF build script for geany-plugins - Update Checker # # Copyright 2010 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> +# Copyright 2111 Frank Lanitz <frank(at)frank(dot)uvena(dot)de> # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -28,4 +29,3 @@ libraries = ['LIBSOUP'] build_plugin(bld, name, includes=includes, libraries=libraries) - Modified: trunk/geany-plugins/updatechecker/wscript_configure =================================================================== --- trunk/geany-plugins/updatechecker/wscript_configure 2011-03-27 11:14:38 UTC (rev 2004) +++ trunk/geany-plugins/updatechecker/wscript_configure 2011-03-27 17:25:50 UTC (rev 2005) @@ -24,7 +24,6 @@ from build.wafutils import check_cfg_cached packages = [ - ('gthread-2.0','','GTHREAD'), ('libsoup-2.4', '2.4.0', 'LIBSOUP') ] 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:[2004] trunk/geany-plugins/devhelp/wscript_build
by codebrainz＠users.sourceforge.net 27 Mar '11

27 Mar '11

Revision: 2004 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=2004&view=rev Author: codebrainz Date: 2011-03-27 11:14:38 +0000 (Sun, 27 Mar 2011) Log Message: ----------- Update wscript_build file. Modified Paths: -------------- trunk/geany-plugins/devhelp/wscript_build Modified: trunk/geany-plugins/devhelp/wscript_build =================================================================== --- trunk/geany-plugins/devhelp/wscript_build 2011-03-27 10:12:40 UTC (rev 2003) +++ trunk/geany-plugins/devhelp/wscript_build 2011-03-27 11:14:38 UTC (rev 2004) @@ -26,6 +26,6 @@ name = 'Devhelp' includes = ['devhelp/src'] -libraries = ['DEVHELP'] +libraries = ['DEVHELP', 'GTHREAD'] build_plugin(bld, name, includes=includes, libraries=libraries) 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:[2003] trunk/geany-plugins/devhelp/ wscript_configure
by codebrainz＠users.sourceforge.net 27 Mar '11

27 Mar '11

Revision: 2003 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=2003&view=rev Author: codebrainz Date: 2011-03-27 10:12:40 +0000 (Sun, 27 Mar 2011) Log Message: ----------- Update Waf build script. Modified Paths: -------------- trunk/geany-plugins/devhelp/wscript_configure Modified: trunk/geany-plugins/devhelp/wscript_configure =================================================================== --- trunk/geany-plugins/devhelp/wscript_configure 2011-03-27 10:12:14 UTC (rev 2002) +++ trunk/geany-plugins/devhelp/wscript_configure 2011-03-27 10:12:40 UTC (rev 2003) @@ -23,8 +23,15 @@ from build.wafutils import check_cfg_cached +packages = [ + ('gthread-2.0','','GTHREAD'), + ('libdevhelp-1.0', '', 'LIBDEVHELP') + ] -check_cfg_cached(conf, - package='libdevhelp-1.0', - uselib_store='DEVHELP', - args='--cflags --libs') +for package_name, package_version, uselib_store in packages: + check_cfg_cached(conf, + package=package_name, + atleast_version=package_version, + uselib_store=uselib_store, + mandatory=True, + args='--cflags --libs') 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:[2002] trunk/geany-plugins/updatechecker/ wscript_configure
by frlan＠users.sourceforge.net 27 Mar '11

27 Mar '11

Revision: 2002 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=2002&view=rev Author: frlan Date: 2011-03-27 10:12:14 +0000 (Sun, 27 Mar 2011) Log Message: ----------- Updatechecker: Fix a typo on waf build system Modified Paths: -------------- trunk/geany-plugins/updatechecker/wscript_configure Modified: trunk/geany-plugins/updatechecker/wscript_configure =================================================================== --- trunk/geany-plugins/updatechecker/wscript_configure 2011-03-27 09:56:11 UTC (rev 2001) +++ trunk/geany-plugins/updatechecker/wscript_configure 2011-03-27 10:12:14 UTC (rev 2002) @@ -3,6 +3,7 @@ # WAF build script for geany-plugins - Update Checker # # Copyright 2010 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> +# Copyright 2111 Frank Lanitz <frank(at)frank(dot)uvena(dot)de> # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -23,7 +24,7 @@ from build.wafutils import check_cfg_cached packages = [ - ('gthread-2.0','','GTHREAT'), + ('gthread-2.0','','GTHREAD'), ('libsoup-2.4', '2.4.0', 'LIBSOUP') ] 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:[2001] trunk/geany-plugins
by frlan＠users.sourceforge.net 27 Mar '11

27 Mar '11

Revision: 2001 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=2001&view=rev Author: frlan Date: 2011-03-27 09:56:11 +0000 (Sun, 27 Mar 2011) Log Message: ----------- Updatechecker: Try to fix build dependencies for threading Modified Paths: -------------- trunk/geany-plugins/build/updatechecker.m4 trunk/geany-plugins/updatechecker/wscript_configure Modified: trunk/geany-plugins/build/updatechecker.m4 =================================================================== --- trunk/geany-plugins/build/updatechecker.m4 2011-03-27 09:55:45 UTC (rev 2000) +++ trunk/geany-plugins/build/updatechecker.m4 2011-03-27 09:56:11 UTC (rev 2001) @@ -3,7 +3,8 @@ GP_ARG_DISABLE([Updatechecker], [auto]) GP_CHECK_PLUGIN_DEPS([Updatechecker], UPDATECHECKER, - [libsoup-2.4 >= 2.4.0]) + [libsoup-2.4 >= 2.4.0 + gthread-2.0]) GP_STATUS_PLUGIN_ADD([Updatechecker], [$enable_updatechecker]) Modified: trunk/geany-plugins/updatechecker/wscript_configure =================================================================== --- trunk/geany-plugins/updatechecker/wscript_configure 2011-03-27 09:55:45 UTC (rev 2000) +++ trunk/geany-plugins/updatechecker/wscript_configure 2011-03-27 09:56:11 UTC (rev 2001) @@ -22,10 +22,15 @@ from build.wafutils import check_cfg_cached +packages = [ + ('gthread-2.0','','GTHREAT'), + ('libsoup-2.4', '2.4.0', 'LIBSOUP') + ] -check_cfg_cached(conf, - package='libsoup-2.4', - atleast_version='2.4.0', - mandatory=True, - uselib_store='LIBSOUP', - args='--cflags --libs') +for package_name, package_version, uselib_store in packages: + check_cfg_cached(conf, + package=package_name, + atleast_version=package_version, + uselib_store=uselib_store, + mandatory=True, + args='--cflags --libs') 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:[2000] trunk/geany-plugins/updatechecker/src/ updatechecker.c
by frlan＠users.sourceforge.net 27 Mar '11

27 Mar '11

Revision: 2000 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=2000&view=rev Author: frlan Date: 2011-03-27 09:55:45 +0000 (Sun, 27 Mar 2011) Log Message: ----------- Updatechcker: Check and init threads as a workaround for old GTK/glib versions Modified Paths: -------------- trunk/geany-plugins/updatechecker/src/updatechecker.c Modified: trunk/geany-plugins/updatechecker/src/updatechecker.c =================================================================== --- trunk/geany-plugins/updatechecker/src/updatechecker.c 2011-03-22 15:36:59 UTC (rev 1999) +++ trunk/geany-plugins/updatechecker/src/updatechecker.c 2011-03-27 09:55:45 UTC (rev 2000) @@ -31,21 +31,21 @@ PLUGIN_VERSION_CHECK(188) PLUGIN_SET_TRANSLATABLE_INFO( - LOCALEDIR, - GETTEXT_PACKAGE, - _("Updatechecker"), - _("A plugin which is checking whether there are updates for Geany available."), - VERSION, - "Frank Lanitz <frank(a)frank.uvena.de>") + LOCALEDIR, + GETTEXT_PACKAGE, + _("Updatechecker"), + _("A plugin which is checking whether there are updates for Geany available."), + VERSION, + "Frank Lanitz <frank(a)frank.uvena.de>") enum { - UPDATECHECK_MANUAL, - UPDATECHECK_STARTUP + UPDATECHECK_MANUAL, + UPDATECHECK_STARTUP }; static GtkWidget *main_menu_item = NULL; static void update_check_result_cb(SoupSession *session, - SoupMessage *msg, gpointer user_data); + SoupMessage *msg, gpointer user_data); static gboolean check_on_startup = FALSE; @@ -55,48 +55,48 @@ static struct { - GtkWidget *run_on_startup; + GtkWidget *run_on_startup; } config_widgets; typedef struct { - gint major; - gint minor; - gint mini; - gchar *extra; + gint major; + gint minor; + gint mini; + gchar *extra; } version_struct; static void update_check(gint type) { - SoupSession *soup; - SoupMessage *msg; - gchar *user_agent = g_strconcat("Updatechecker ", VERSION, " at Geany ", - GEANY_VERSION, NULL); + SoupSession *soup; + SoupMessage *msg; + gchar *user_agent = g_strconcat("Updatechecker ", VERSION, " at Geany ", + GEANY_VERSION, NULL); - g_message("Starting checking for updates"); - soup = soup_session_async_new_with_options(SOUP_SESSION_USER_AGENT, - user_agent, NULL); + g_message("Starting checking for updates"); + soup = soup_session_async_new_with_options(SOUP_SESSION_USER_AGENT, + user_agent, NULL); - g_free(user_agent); - - msg = soup_message_new ("GET", "http://geany.org/service/version.php"); - - soup_session_queue_message (soup, msg, update_check_result_cb, GINT_TO_POINTER(type)); + g_free(user_agent); + + msg = soup_message_new ("GET", "http://geany.org/service/version.php"); + + soup_session_queue_message (soup, msg, update_check_result_cb, GINT_TO_POINTER(type)); } static void on_geany_startup_complete(G_GNUC_UNUSED GObject *obj, - G_GNUC_UNUSED gpointer user_data) + G_GNUC_UNUSED gpointer user_data) { - if (check_on_startup == TRUE) - { - update_check(UPDATECHECK_STARTUP); - } + if (check_on_startup == TRUE) + { + update_check(UPDATECHECK_STARTUP); + } } @@ -104,43 +104,43 @@ * http://sylpheed.sraoss.jp/en/ * GPL FTW! */ static void parse_version_string(const gchar *ver, gint *major, gint *minor, - gint *micro, gchar **extra) + gint *micro, gchar **extra) { - gchar **vers; - vers = g_strsplit(ver, ".", 4); - if (vers[0]) - { - *major = atoi(vers[0]); - if (vers[1]) - { - *minor = atoi(vers[1]); - if (vers[2]) - { - *micro = atoi(vers[2]); - if (vers[3]) - { - *extra = g_strdup(vers[3]); - } - else - { - *extra = NULL; - } - } - else - { - *micro = 0; - } - } - else - { - *minor = 0; - } - } - else - { - major = 0; - } - g_strfreev(vers); + gchar **vers; + vers = g_strsplit(ver, ".", 4); + if (vers[0]) + { + *major = atoi(vers[0]); + if (vers[1]) + { + *minor = atoi(vers[1]); + if (vers[2]) + { + *micro = atoi(vers[2]); + if (vers[3]) + { + *extra = g_strdup(vers[3]); + } + else + { + *extra = NULL; + } + } + else + { + *micro = 0; + } + } + else + { + *minor = 0; + } + } + else + { + major = 0; + } + g_strfreev(vers); } @@ -149,167 +149,175 @@ static gboolean version_compare(const gchar *current_version) { - version_struct geany_running; - version_struct geany_current; - - parse_version_string(GEANY_VERSION, &geany_running.major, - &geany_running.minor, &geany_running.mini, &geany_running.extra); + version_struct geany_running; + version_struct geany_current; - parse_version_string(current_version, &geany_current.major, - &geany_current.minor, &geany_current.mini, &geany_current.extra); + parse_version_string(GEANY_VERSION, &geany_running.major, + &geany_running.minor, &geany_running.mini, &geany_running.extra); - if ((geany_running.major < geany_current.major) || - (geany_running.minor < geany_current.minor) || - (geany_running.minor < geany_current.minor)) - { - return TRUE; - } - else - { - return FALSE; - } + parse_version_string(current_version, &geany_current.major, + &geany_current.minor, &geany_current.mini, &geany_current.extra); + + if ((geany_running.major < geany_current.major) || + (geany_running.minor < geany_current.minor) || + (geany_running.minor < geany_current.minor)) + { + return TRUE; + } + else + { + return FALSE; + } } static void update_check_result_cb(SoupSession *session, - SoupMessage *msg, gpointer user_data) + SoupMessage *msg, gpointer user_data) { - gint type = GPOINTER_TO_INT(user_data); - - /* Checking whether we did get a valid (200) result */ - if (msg->status_code == 200) - { - if (version_compare(msg->response_body->data) == TRUE) - { - dialogs_show_msgbox(GTK_MESSAGE_INFO, - _("There is a more recent version available")); - g_message("There is a more recent version available"); - } - else - { - if (type == UPDATECHECK_MANUAL) - { - dialogs_show_msgbox(GTK_MESSAGE_INFO, - _("No update available")); - } + gint type = GPOINTER_TO_INT(user_data); - g_message("No update available"); + /* Checking whether we did get a valid (200) result */ + if (msg->status_code == 200) + { + if (version_compare(msg->response_body->data) == TRUE) + { + dialogs_show_msgbox(GTK_MESSAGE_INFO, + _("There is a more recent version available")); + g_message("There is a more recent version available"); + } + else + { + if (type == UPDATECHECK_MANUAL) + { + dialogs_show_msgbox(GTK_MESSAGE_INFO, + _("No update available")); + } - } - } - else - { - if (type == UPDATECHECK_MANUAL) - { - dialogs_show_msgbox(GTK_MESSAGE_ERROR, - _("Wasn't able to catch some version information.\n" - "Error code: %d \n" - "Error message: »%s«"), msg->status_code, msg->reason_phrase); - } - g_warning("Connection error. Code: %d; Message: %s", - msg->status_code, msg->reason_phrase); - } + g_message("No update available"); + + } + } + else + { + if (type == UPDATECHECK_MANUAL) + { + dialogs_show_msgbox(GTK_MESSAGE_ERROR, + _("Wasn't able to catch some version information.\n" + "Error code: %d \n" + "Error message: »%s«"), msg->status_code, msg->reason_phrase); + } + g_warning("Connection error. Code: %d; Message: %s", + msg->status_code, msg->reason_phrase); + } } static void manual_check_activated_cb(GtkMenuItem *menuitem, gpointer gdata) { - update_check(UPDATECHECK_MANUAL); + update_check(UPDATECHECK_MANUAL); } static void on_configure_response(G_GNUC_UNUSED GtkDialog *dialog, gint response, - G_GNUC_UNUSED gpointer user_data) + G_GNUC_UNUSED gpointer user_data) { - if (response == GTK_RESPONSE_OK || response == GTK_RESPONSE_APPLY) - { - GKeyFile *config = g_key_file_new(); - gchar *data; - gchar *config_dir = g_path_get_dirname(config_file); + if (response == GTK_RESPONSE_OK || response == GTK_RESPONSE_APPLY) + { + GKeyFile *config = g_key_file_new(); + gchar *data; + gchar *config_dir = g_path_get_dirname(config_file); - config_file = g_strconcat(geany->app->configdir, - G_DIR_SEPARATOR_S, "plugins", G_DIR_SEPARATOR_S, - "updatechecker", G_DIR_SEPARATOR_S, "general.conf", NULL); + config_file = g_strconcat(geany->app->configdir, + G_DIR_SEPARATOR_S, "plugins", G_DIR_SEPARATOR_S, + "updatechecker", G_DIR_SEPARATOR_S, "general.conf", NULL); - /* Crabbing options that has been set */ - check_on_startup = - gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(config_widgets.run_on_startup)); + /* Crabbing options that has been set */ + check_on_startup = + gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(config_widgets.run_on_startup)); - /* write stuff to file */ - g_key_file_load_from_file(config, config_file, G_KEY_FILE_NONE, NULL); + /* write stuff to file */ + g_key_file_load_from_file(config, config_file, G_KEY_FILE_NONE, NULL); - g_key_file_set_boolean(config, "general", "check_for_updates_on_startup", - check_on_startup); + g_key_file_set_boolean(config, "general", "check_for_updates_on_startup", + check_on_startup); - if (!g_file_test(config_dir, G_FILE_TEST_IS_DIR) - && utils_mkdir(config_dir, TRUE) != 0) - { - dialogs_show_msgbox(GTK_MESSAGE_ERROR, - _("Plugin configuration directory could not be created.")); - } - else - { - /* write config to file */ - data = g_key_file_to_data(config, NULL, NULL); - utils_write_file(config_file, data); - g_free(data); - } + if (!g_file_test(config_dir, G_FILE_TEST_IS_DIR) + && utils_mkdir(config_dir, TRUE) != 0) + { + dialogs_show_msgbox(GTK_MESSAGE_ERROR, + _("Plugin configuration directory could not be created.")); + } + else + { + /* write config to file */ + data = g_key_file_to_data(config, NULL, NULL); + utils_write_file(config_file, data); + g_free(data); + } - g_free(config_dir); - g_key_file_free(config); - } + g_free(config_dir); + g_key_file_free(config); + } } GtkWidget * plugin_configure(GtkDialog * dialog) { - GtkWidget *vbox; - vbox = gtk_vbox_new(FALSE, 6); + GtkWidget *vbox; + vbox = gtk_vbox_new(FALSE, 6); - config_widgets.run_on_startup = gtk_check_button_new_with_label( - _("Run updatecheck on startup")); + config_widgets.run_on_startup = gtk_check_button_new_with_label( + _("Run updatecheck on startup")); - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(config_widgets.run_on_startup), - check_on_startup); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(config_widgets.run_on_startup), + check_on_startup); - gtk_box_pack_start(GTK_BOX(vbox), config_widgets.run_on_startup, FALSE, FALSE, 2); - gtk_widget_show_all(vbox); - g_signal_connect(dialog, "response", G_CALLBACK(on_configure_response), NULL); - return vbox; + gtk_box_pack_start(GTK_BOX(vbox), config_widgets.run_on_startup, FALSE, FALSE, 2); + gtk_widget_show_all(vbox); + g_signal_connect(dialog, "response", G_CALLBACK(on_configure_response), NULL); + return vbox; } /* Registering of callbacks for Geany events */ PluginCallback plugin_callbacks[] = { - { "geany-startup-complete", (GCallback) &on_geany_startup_complete, FALSE, NULL }, - { NULL, NULL, FALSE, NULL } + { "geany-startup-complete", (GCallback) &on_geany_startup_complete, FALSE, NULL }, + { NULL, NULL, FALSE, NULL } }; static void init_configuration() { - GKeyFile *config = g_key_file_new(); + GKeyFile *config = g_key_file_new(); - /* loading configurations from file ...*/ - config_file = g_strconcat(geany->app->configdir, G_DIR_SEPARATOR_S, - "plugins", G_DIR_SEPARATOR_S, - "updatechecker", G_DIR_SEPARATOR_S, "general.conf", NULL); + /* loading configurations from file ...*/ + config_file = g_strconcat(geany->app->configdir, G_DIR_SEPARATOR_S, + "plugins", G_DIR_SEPARATOR_S, + "updatechecker", G_DIR_SEPARATOR_S, "general.conf", NULL); - /* ... and Initialising options from config file */ - g_key_file_load_from_file(config, config_file, G_KEY_FILE_NONE, NULL); + /* ... and Initialising options from config file */ + g_key_file_load_from_file(config, config_file, G_KEY_FILE_NONE, NULL); - check_on_startup = utils_get_setting_boolean(config, "general", - "check_for_updates_on_startup", FALSE); + check_on_startup = utils_get_setting_boolean(config, "general", + "check_for_updates_on_startup", FALSE); - g_key_file_free(config); + g_key_file_free(config); } void plugin_init(GeanyData *data) { - init_configuration(); + init_configuration(); + /* soup uses threads but it seems to don't initialize the thread system + * Work around baesed on a patch Colomban Wendling and Matthew Brush */ + + if (! g_thread_supported ()) + { + g_thread_init (NULL); + } + main_menu_item = gtk_menu_item_new_with_mnemonic(_("Check for Updates")); gtk_widget_show(main_menu_item); gtk_container_add(GTK_CONTAINER(geany->main_widgets->tools_menu), This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

Plugins-Commits March 2011