Plugins-Commits July 2012

plugins-commits@lists.geany.org

1 participants
220 discussions

[geany/geany-plugins] a14fb4: Merge pull request #53 from b4n/news
by Chow Loong Jin 05 Jul '12

05 Jul '12

Branch: refs/heads/master Author: Chow Loong Jin <hyperair(a)debian.org> Committer: Chow Loong Jin <hyperair(a)debian.org> Date: Thu, 05 Jul 2012 19:12:33 Commit: a14fb480a6bab0967a403847027ea011e4d8a87f https://github.com/geany/geany-plugins/commit/a14fb480a6bab0967a403847027ea… Log Message: ----------- Merge pull request #53 from b4n/news First NEWS update for upcoming 1.22 release Modified Paths: -------------- NEWS Modified: NEWS 68 files changed, 68 insertions(+), 0 deletions(-) =================================================================== @@ -1,3 +1,71 @@ +Geany Plugins 1.22 (unreleased) + + General: + * Autotools build system improvements + * Add new plugin GeanyMiniScript + * Add new plugin GeniusPaste + * Add new plugin MultiTerm + * Disable GeanyGDB by default + + Addons: + * Add word wrapping addon + + Debugger: + * Fix build with --as-needed + * Fix crash on 64 bit platform (#3449480) + * Use asynchronous methods when possible not to freeze the UI + * Display thread information in the stack window + * Properly handle spaces in filenames + * Various other bugfixes and improvements + + Devhelp: + * Bundle libdevhelp 2.32 + * Remove support for Google Code Search + + GeanyLaTeX: + * Fix crash with recent Geany versions + * Ignore files autogenerated by biblatex in suggestions for cite + + GeanyLua: + * Fix build with recent GLib + + GeanyMacro: + * Add support for editing macros events + * Support search next/search prev + + GeanyNumberedBookmarks: + * Only save file status if non-empty + * Add support for saving file status next to the file itself + * Save non-numbered bookmarks too + + GeanyPG: + * Fix build with --as-needed + * Fix encryption to an untrusted key + + GeanyPrj: + * Add "find in project" keybinding + * Add a setting to hide the sidebar + + GeanyVC: + * Go to the selected line upon blame + * Add support for displaying the VC menu in the menubar + + GProject: + * Fix a crash when a project file is missing + * Support Geany 1.22 + + Tableconvert: + * Fix SQL tables generation + + TreeBrowser: + * Fix permissions on new files + * Add "create new file" and "create new directory" keybindings + + WebHelper: + * Fix crash with recent versions of WebKitGTK + * Save and restore inspector docking state + + Geany Plugins 0.21.1 (2011-10-30) General: @@ Diff output truncated at 100000 characters. @@ -------------- This E-Mail was brought to you by github_commit_mail.py (Source: TBD).

1 0

[geany/geany-plugins] a14fb4: Merge pull request #53 from b4n/news
by Chow Loong Jin 05 Jul '12

05 Jul '12

Branch: refs/heads/1.22_release Author: Chow Loong Jin <hyperair(a)debian.org> Committer: Chow Loong Jin <hyperair(a)debian.org> Date: Thu, 05 Jul 2012 19:12:33 Commit: a14fb480a6bab0967a403847027ea011e4d8a87f https://github.com/geany/geany-plugins/commit/a14fb480a6bab0967a403847027ea… Log Message: ----------- Merge pull request #53 from b4n/news First NEWS update for upcoming 1.22 release Modified Paths: -------------- NEWS Modified: NEWS 68 files changed, 68 insertions(+), 0 deletions(-) =================================================================== @@ -1,3 +1,71 @@ +Geany Plugins 1.22 (unreleased) + + General: + * Autotools build system improvements + * Add new plugin GeanyMiniScript + * Add new plugin GeniusPaste + * Add new plugin MultiTerm + * Disable GeanyGDB by default + + Addons: + * Add word wrapping addon + + Debugger: + * Fix build with --as-needed + * Fix crash on 64 bit platform (#3449480) + * Use asynchronous methods when possible not to freeze the UI + * Display thread information in the stack window + * Properly handle spaces in filenames + * Various other bugfixes and improvements + + Devhelp: + * Bundle libdevhelp 2.32 + * Remove support for Google Code Search + + GeanyLaTeX: + * Fix crash with recent Geany versions + * Ignore files autogenerated by biblatex in suggestions for cite + + GeanyLua: + * Fix build with recent GLib + + GeanyMacro: + * Add support for editing macros events + * Support search next/search prev + + GeanyNumberedBookmarks: + * Only save file status if non-empty + * Add support for saving file status next to the file itself + * Save non-numbered bookmarks too + + GeanyPG: + * Fix build with --as-needed + * Fix encryption to an untrusted key + + GeanyPrj: + * Add "find in project" keybinding + * Add a setting to hide the sidebar + + GeanyVC: + * Go to the selected line upon blame + * Add support for displaying the VC menu in the menubar + + GProject: + * Fix a crash when a project file is missing + * Support Geany 1.22 + + Tableconvert: + * Fix SQL tables generation + + TreeBrowser: + * Fix permissions on new files + * Add "create new file" and "create new directory" keybindings + + WebHelper: + * Fix crash with recent versions of WebKitGTK + * Save and restore inspector docking state + + Geany Plugins 0.21.1 (2011-10-30) General: @@ Diff output truncated at 100000 characters. @@ -------------- This E-Mail was brought to you by github_commit_mail.py (Source: TBD).

1 0

[geany/geany-plugins] a09e9e: First NEWS update for upcoming 1.22 release
by Colomban Wendling 05 Jul '12

05 Jul '12

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Thu, 05 Jul 2012 18:53:26 Commit: a09e9e198066a9886654710abe26862ef2b019ad https://github.com/geany/geany-plugins/commit/a09e9e198066a9886654710abe268… Log Message: ----------- First NEWS update for upcoming 1.22 release Modified Paths: -------------- NEWS Modified: NEWS 68 files changed, 68 insertions(+), 0 deletions(-) =================================================================== @@ -1,3 +1,71 @@ +Geany Plugins 1.22 (unreleased) + + General: + * Autotools build system improvements + * Add new plugin GeanyMiniScript + * Add new plugin GeniusPaste + * Add new plugin MultiTerm + * Disable GeanyGDB by default + + Addons: + * Add word wrapping addon + + Debugger: + * Fix build with --as-needed + * Fix crash on 64 bit platform (#3449480) + * Use asynchronous methods when possible not to freeze the UI + * Display thread information in the stack window + * Properly handle spaces in filenames + * Various other bugfixes and improvements + + Devhelp: + * Bundle libdevhelp 2.32 + * Remove support for Google Code Search + + GeanyLaTeX: + * Fix crash with recent Geany versions + * Ignore files autogenerated by biblatex in suggestions for cite + + GeanyLua: + * Fix build with recent GLib + + GeanyMacro: + * Add support for editing macros events + * Support search next/search prev + + GeanyNumberedBookmarks: + * Only save file status if non-empty + * Add support for saving file status next to the file itself + * Save non-numbered bookmarks too + + GeanyPG: + * Fix build with --as-needed + * Fix encryption to an untrusted key + + GeanyPrj: + * Add "find in project" keybinding + * Add a setting to hide the sidebar + + GeanyVC: + * Go to the selected line upon blame + * Add support for displaying the VC menu in the menubar + + GProject: + * Fix a crash when a project file is missing + * Support Geany 1.22 + + Tableconvert: + * Fix SQL tables generation + + TreeBrowser: + * Fix permissions on new files + * Add "create new file" and "create new directory" keybindings + + WebHelper: + * Fix crash with recent versions of WebKitGTK + * Save and restore inspector docking state + + Geany Plugins 0.21.1 (2011-10-30) General: @@ Diff output truncated at 100000 characters. @@ -------------- This E-Mail was brought to you by github_commit_mail.py (Source: TBD).

1 0

[geany/geany-plugins] a09e9e: First NEWS update for upcoming 1.22 release
by Colomban Wendling 05 Jul '12

05 Jul '12

Branch: refs/heads/1.22_release Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Thu, 05 Jul 2012 18:53:26 Commit: a09e9e198066a9886654710abe26862ef2b019ad https://github.com/geany/geany-plugins/commit/a09e9e198066a9886654710abe268… Log Message: ----------- First NEWS update for upcoming 1.22 release Modified Paths: -------------- NEWS Modified: NEWS 68 files changed, 68 insertions(+), 0 deletions(-) =================================================================== @@ -1,3 +1,71 @@ +Geany Plugins 1.22 (unreleased) + + General: + * Autotools build system improvements + * Add new plugin GeanyMiniScript + * Add new plugin GeniusPaste + * Add new plugin MultiTerm + * Disable GeanyGDB by default + + Addons: + * Add word wrapping addon + + Debugger: + * Fix build with --as-needed + * Fix crash on 64 bit platform (#3449480) + * Use asynchronous methods when possible not to freeze the UI + * Display thread information in the stack window + * Properly handle spaces in filenames + * Various other bugfixes and improvements + + Devhelp: + * Bundle libdevhelp 2.32 + * Remove support for Google Code Search + + GeanyLaTeX: + * Fix crash with recent Geany versions + * Ignore files autogenerated by biblatex in suggestions for cite + + GeanyLua: + * Fix build with recent GLib + + GeanyMacro: + * Add support for editing macros events + * Support search next/search prev + + GeanyNumberedBookmarks: + * Only save file status if non-empty + * Add support for saving file status next to the file itself + * Save non-numbered bookmarks too + + GeanyPG: + * Fix build with --as-needed + * Fix encryption to an untrusted key + + GeanyPrj: + * Add "find in project" keybinding + * Add a setting to hide the sidebar + + GeanyVC: + * Go to the selected line upon blame + * Add support for displaying the VC menu in the menubar + + GProject: + * Fix a crash when a project file is missing + * Support Geany 1.22 + + Tableconvert: + * Fix SQL tables generation + + TreeBrowser: + * Fix permissions on new files + * Add "create new file" and "create new directory" keybindings + + WebHelper: + * Fix crash with recent versions of WebKitGTK + * Save and restore inspector docking state + + Geany Plugins 0.21.1 (2011-10-30) General: @@ Diff output truncated at 100000 characters. @@ -------------- This E-Mail was brought to you by github_commit_mail.py (Source: TBD).

1 0

[geany/geany-plugins] 9688f5: Merge pull request #50 from b4n/wip/webhelper
by Frank Lanitz 02 Jul '12

02 Jul '12

Branch: refs/heads/master Author: Frank Lanitz <frank(a)frank.uvena.de> Committer: Frank Lanitz <frank(a)frank.uvena.de> Date: Mon, 02 Jul 2012 19:24:24 Commit: 9688f577dc352be84b040ce7da5039500313f75b https://github.com/geany/geany-plugins/commit/9688f577dc352be84b040ce7da503… Log Message: ----------- Merge pull request #50 from b4n/wip/webhelper WebHelper: Remember inspector docking state Modified Paths: -------------- webhelper/src/gwh-browser.c webhelper/src/gwh-plugin.c Modified: webhelper/src/gwh-browser.c 52 files changed, 45 insertions(+), 7 deletions(-) =================================================================== @@ -97,6 +97,9 @@ enum { G_IMPLEMENT_INTERFACE (GTK_TYPE_ORIENTABLE, NULL)) +static void inspector_set_detached (GwhBrowser *self, + gboolean detached); + static void set_location_icon (GwhBrowser *self, @@ -186,6 +189,17 @@ enum { } static void +on_settings_inspector_detached_notify (GObject *object, + GParamSpec *pspec, + GwhBrowser *self) +{ + gboolean detached; + + g_object_get (object, pspec->name, &detached, NULL); + inspector_set_detached (self, detached); +} + +static void on_settings_wm_windows_skip_taskbar_notify (GObject *object, GParamSpec *pspec, GwhBrowser *self) @@ -261,6 +275,25 @@ enum { } } +static void +inspector_set_detached (GwhBrowser *self, + gboolean detached) +{ + if (detached != INSPECTOR_DETACHED (self)) { + if (detached) { + gtk_widget_reparent (self->priv->inspector_view, + self->priv->inspector_window); + if (INSPECTOR_VISIBLE (self)) { + inspector_show_window (self); + } + } else { + gtk_widget_reparent (self->priv->inspector_view, self->priv->paned); + inspector_hide_window (self); + } + g_object_set (self->priv->settings, "inspector-detached", detached, NULL); + } +} + static WebKitWebView * on_inspector_inspect_web_view (WebKitWebInspector *inspector, WebKitWebView *view, @@ -309,9 +342,7 @@ enum { on_inspector_detach_window (WebKitWebInspector *inspector, GwhBrowser *self) { - gtk_widget_reparent (self->priv->inspector_view, - self->priv->inspector_window); - inspector_show_window (self); + inspector_set_detached (self, TRUE); return TRUE; } @@ -320,8 +351,7 @@ enum { on_inspector_attach_window (WebKitWebInspector *inspector, GwhBrowser *self) { - gtk_widget_reparent (self->priv->inspector_view, self->priv->paned); - inspector_hide_window (self); + inspector_set_detached (self, FALSE); return TRUE; } @@ -848,8 +878,6 @@ enum { G_CALLBACK (on_settings_wm_windows_skip_taskbar_notify), self); g_signal_connect (self->priv->settings, "notify::wm-secondary-windows-type", G_CALLBACK (on_settings_wm_windows_type_notify), self); - gtk_container_add (GTK_CONTAINER (self->priv->inspector_window), - self->priv->inspector_view); return self->priv->inspector_window; } @@ -859,6 +887,7 @@ enum { { GtkWidget *scrolled; WebKitWebSettings *wkws; + gboolean inspector_detached; self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, GWH_TYPE_BROWSER, GwhBrowserPrivate); @@ -870,6 +899,9 @@ enum { g_object_set (wkws, "enable-developer-extras", TRUE, NULL); self->priv->settings = gwh_settings_get_default (); + g_object_get (self->priv->settings, + "inspector-detached", &inspector_detached, + NULL); self->priv->toolbar = create_toolbar (self); self->priv->paned = gtk_vpaned_new (); @@ -890,6 +922,10 @@ enum { self->priv->inspector_web_view = NULL; self->priv->inspector_window = create_inspector_window (self); + gtk_container_add (GTK_CONTAINER (inspector_detached + ? self->priv->inspector_window + : self->priv->paned), + self->priv->inspector_view); g_signal_connect (self, "notify::orientation", G_CALLBACK (on_orientation_notify), self); @@ -932,6 +968,8 @@ enum { G_CALLBACK (on_settings_browser_last_uri_notify), self); g_signal_connect (self->priv->settings, "notify::browser-orientation", G_CALLBACK (on_settings_browser_orientation_notify), self); + g_signal_connect (self->priv->settings, "notify::inspector-detached", + G_CALLBACK (on_settings_inspector_detached_notify), self); g_signal_connect (self->priv->settings, "notify::inspector-window-geometry", G_CALLBACK (on_settings_inspector_window_geometry_notify), self); } Modified: webhelper/src/gwh-plugin.c 6 files changed, 6 insertions(+), 0 deletions(-) =================================================================== @@ -339,6 +339,12 @@ enum { "400x300", G_PARAM_READWRITE)); gwh_settings_install_property (G_settings, g_param_spec_boolean ( + "inspector-detached", + _("Inspector detached"), + _("Whether the inspector is in a separate window or docked in the browser"), + FALSE, + G_PARAM_READWRITE)); + gwh_settings_install_property (G_settings, g_param_spec_boolean ( "wm-secondary-windows-skip-taskbar", _("Secondary windows skip task bar"), _("Whether to tell the window manager not to show the secondary windows in the task bar"), @@ Diff output truncated at 100000 characters. @@ -------------- This E-Mail was brought to you by github_commit_mail.py (Source: TBD).

1 0

[geany/geany-plugins] 9688f5: Merge pull request #50 from b4n/wip/webhelper
by Frank Lanitz 02 Jul '12

02 Jul '12

Branch: refs/heads/1.22_release Author: Frank Lanitz <frank(a)frank.uvena.de> Committer: Frank Lanitz <frank(a)frank.uvena.de> Date: Mon, 02 Jul 2012 19:24:24 Commit: 9688f577dc352be84b040ce7da5039500313f75b https://github.com/geany/geany-plugins/commit/9688f577dc352be84b040ce7da503… Log Message: ----------- Merge pull request #50 from b4n/wip/webhelper WebHelper: Remember inspector docking state Modified Paths: -------------- webhelper/src/gwh-browser.c webhelper/src/gwh-plugin.c Modified: webhelper/src/gwh-browser.c 52 files changed, 45 insertions(+), 7 deletions(-) =================================================================== @@ -97,6 +97,9 @@ enum { G_IMPLEMENT_INTERFACE (GTK_TYPE_ORIENTABLE, NULL)) +static void inspector_set_detached (GwhBrowser *self, + gboolean detached); + static void set_location_icon (GwhBrowser *self, @@ -186,6 +189,17 @@ enum { } static void +on_settings_inspector_detached_notify (GObject *object, + GParamSpec *pspec, + GwhBrowser *self) +{ + gboolean detached; + + g_object_get (object, pspec->name, &detached, NULL); + inspector_set_detached (self, detached); +} + +static void on_settings_wm_windows_skip_taskbar_notify (GObject *object, GParamSpec *pspec, GwhBrowser *self) @@ -261,6 +275,25 @@ enum { } } +static void +inspector_set_detached (GwhBrowser *self, + gboolean detached) +{ + if (detached != INSPECTOR_DETACHED (self)) { + if (detached) { + gtk_widget_reparent (self->priv->inspector_view, + self->priv->inspector_window); + if (INSPECTOR_VISIBLE (self)) { + inspector_show_window (self); + } + } else { + gtk_widget_reparent (self->priv->inspector_view, self->priv->paned); + inspector_hide_window (self); + } + g_object_set (self->priv->settings, "inspector-detached", detached, NULL); + } +} + static WebKitWebView * on_inspector_inspect_web_view (WebKitWebInspector *inspector, WebKitWebView *view, @@ -309,9 +342,7 @@ enum { on_inspector_detach_window (WebKitWebInspector *inspector, GwhBrowser *self) { - gtk_widget_reparent (self->priv->inspector_view, - self->priv->inspector_window); - inspector_show_window (self); + inspector_set_detached (self, TRUE); return TRUE; } @@ -320,8 +351,7 @@ enum { on_inspector_attach_window (WebKitWebInspector *inspector, GwhBrowser *self) { - gtk_widget_reparent (self->priv->inspector_view, self->priv->paned); - inspector_hide_window (self); + inspector_set_detached (self, FALSE); return TRUE; } @@ -848,8 +878,6 @@ enum { G_CALLBACK (on_settings_wm_windows_skip_taskbar_notify), self); g_signal_connect (self->priv->settings, "notify::wm-secondary-windows-type", G_CALLBACK (on_settings_wm_windows_type_notify), self); - gtk_container_add (GTK_CONTAINER (self->priv->inspector_window), - self->priv->inspector_view); return self->priv->inspector_window; } @@ -859,6 +887,7 @@ enum { { GtkWidget *scrolled; WebKitWebSettings *wkws; + gboolean inspector_detached; self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, GWH_TYPE_BROWSER, GwhBrowserPrivate); @@ -870,6 +899,9 @@ enum { g_object_set (wkws, "enable-developer-extras", TRUE, NULL); self->priv->settings = gwh_settings_get_default (); + g_object_get (self->priv->settings, + "inspector-detached", &inspector_detached, + NULL); self->priv->toolbar = create_toolbar (self); self->priv->paned = gtk_vpaned_new (); @@ -890,6 +922,10 @@ enum { self->priv->inspector_web_view = NULL; self->priv->inspector_window = create_inspector_window (self); + gtk_container_add (GTK_CONTAINER (inspector_detached + ? self->priv->inspector_window + : self->priv->paned), + self->priv->inspector_view); g_signal_connect (self, "notify::orientation", G_CALLBACK (on_orientation_notify), self); @@ -932,6 +968,8 @@ enum { G_CALLBACK (on_settings_browser_last_uri_notify), self); g_signal_connect (self->priv->settings, "notify::browser-orientation", G_CALLBACK (on_settings_browser_orientation_notify), self); + g_signal_connect (self->priv->settings, "notify::inspector-detached", + G_CALLBACK (on_settings_inspector_detached_notify), self); g_signal_connect (self->priv->settings, "notify::inspector-window-geometry", G_CALLBACK (on_settings_inspector_window_geometry_notify), self); } Modified: webhelper/src/gwh-plugin.c 6 files changed, 6 insertions(+), 0 deletions(-) =================================================================== @@ -339,6 +339,12 @@ enum { "400x300", G_PARAM_READWRITE)); gwh_settings_install_property (G_settings, g_param_spec_boolean ( + "inspector-detached", + _("Inspector detached"), + _("Whether the inspector is in a separate window or docked in the browser"), + FALSE, + G_PARAM_READWRITE)); + gwh_settings_install_property (G_settings, g_param_spec_boolean ( "wm-secondary-windows-skip-taskbar", _("Secondary windows skip task bar"), _("Whether to tell the window manager not to show the secondary windows in the task bar"), @@ Diff output truncated at 100000 characters. @@ -------------- This E-Mail was brought to you by github_commit_mail.py (Source: TBD).

1 0

[geany/geany-plugins] 9688f5: Merge pull request #50 from b4n/wip/webhelper
by Frank Lanitz 02 Jul '12

02 Jul '12

1 0

[geany/geany-plugins] f506ba: Merge pull request #52 from Enrix835/master
by Frank Lanitz 02 Jul '12

02 Jul '12

Branch: refs/heads/master Author: Frank Lanitz <frank(a)frank.uvena.de> Committer: Frank Lanitz <frank(a)frank.uvena.de> Date: Mon, 02 Jul 2012 19:22:26 Commit: f506bad67aac7296fc32e8128203776b8911af81 https://github.com/geany/geany-plugins/commit/f506bad67aac7296fc32e81282037… Log Message: ----------- Merge pull request #52 from Enrix835/master GeniusPaste fixes Modified Paths: -------------- geniuspaste/src/geniuspaste.c Modified: geniuspaste/src/geniuspaste.c 74 files changed, 56 insertions(+), 18 deletions(-) =================================================================== @@ -38,9 +38,9 @@ #define PLUGIN_VERSION "0.2" #ifdef G_OS_WIN32 -#define USERNAME getenv("USERNAME") +#define USERNAME g_getenv("USERNAME") #else -#define USERNAME getenv("USER") +#define USERNAME g_getenv("USER") #endif /* stay compatible with GTK < 2.24 */ @@ -51,7 +51,7 @@ #endif #define CODEPAD_ORG 0 -#define PASTEBIN_COM 1 +#define TINYPASTE_COM 1 #define PASTEBIN_GEANY_ORG 2 #define DPASTE_DE 3 #define SPRUNGE_US 4 @@ -67,8 +67,17 @@ static const gchar *websites[] = { + "codepad.org", + "tinypaste.com", + "pastebin.geany.org", + "dpaste.de", + "sprunge.us", +}; + +static const gchar *websites_api[] = +{ "http://codepad.org/", - "http://pastebin.com/api_public.php", + "http://tinypaste.com/api/create.xml", "http://pastebin.geany.org/api/", "http://dpaste.de/api/", "http://sprunge.us/", @@ -105,11 +114,11 @@ static void load_settings(void) config_file = g_strconcat(geany->app->configdir, G_DIR_SEPARATOR_S, "plugins", G_DIR_SEPARATOR_S, "geniuspaste", G_DIR_SEPARATOR_S, "geniuspaste.conf", NULL); g_key_file_load_from_file(config, config_file, G_KEY_FILE_NONE, NULL); - + website_selected = utils_get_setting_integer(config, "geniuspaste", "website", PASTEBIN_GEANY_ORG); check_button_is_checked = utils_get_setting_boolean(config, "geniuspaste", "open_browser", FALSE); author_name = utils_get_setting_string(config, "geniuspaste", "author_name", USERNAME); - + g_key_file_free(config); } @@ -136,6 +145,7 @@ static void save_settings(void) utils_write_file(config_file, data); g_free(data); } + g_free(config_dir); g_key_file_free(config); } @@ -206,7 +216,7 @@ static void paste(GeanyDocument * doc, const gchar * website) f_title = g_path_get_basename(doc->file_name); load_settings(); - + f_content = get_paste_text(doc, &f_length); if (f_content == NULL || f_content[0] == '\0') { @@ -228,16 +238,20 @@ static void paste(GeanyDocument * doc, const gchar * website) } msg = soup_message_new("POST", website); - formdata = soup_form_encode("lang", f_type, "code", f_content, - "submit", "Submit", NULL); + formdata = soup_form_encode("lang", f_type, + "code", f_content, + "submit", "Submit", + NULL); break; - case PASTEBIN_COM: + case TINYPASTE_COM: msg = soup_message_new("POST", website); - formdata = soup_form_encode("paste_code", f_content, "paste_format", - f_type, "paste_name", f_title, NULL); + formdata = soup_form_encode("paste", f_content, + "title", f_title, + "is_code", g_strcmp0(f_type, "None") == 0 ? "0" : "1", + NULL); break; @@ -256,8 +270,10 @@ static void paste(GeanyDocument * doc, const gchar * website) /* apparently dpaste.de detects automatically the syntax of the * pasted code so 'lexer' should be unneeded */ - formdata = soup_form_encode("content", f_content, "title", f_title, - "lexer", f_type, NULL); + formdata = soup_form_encode("content", f_content, + "title", f_title, + "lexer", f_type, + NULL); break; @@ -271,8 +287,11 @@ static void paste(GeanyDocument * doc, const gchar * website) case PASTEBIN_GEANY_ORG: msg = soup_message_new("POST", website); - formdata = soup_form_encode("content", f_content, "author", author_name, - "title", f_title, "lexer", f_type, NULL); + formdata = soup_form_encode("content", f_content, + "author", author_name, + "title", f_title, + "lexer", f_type, + NULL); break; @@ -324,6 +343,25 @@ static void paste(GeanyDocument * doc, const gchar * website) } } + else if(website_selected == TINYPASTE_COM) + { + /* tinypaste.com returns a XML response which looks + * like this: + * + * <?xml version="1.0" encoding="utf-8"?> + * <result> + * <response>xxxxx</response> + * </result> + */ + temp_body = g_strdup(p_url); + tokens_array = g_strsplit_set(temp_body, "<>", 0); + + p_url = g_strdup_printf("http://%s/%s", websites[TINYPASTE_COM], tokens_array[6]); + + g_free(temp_body); + g_strfreev(tokens_array); + } + else if(website_selected == DPASTE_DE) { p_url = g_strndup(p_url + 1, strlen(p_url) - 2); @@ -384,7 +422,7 @@ static void item_activate(GtkMenuItem * menuitem, gpointer gdata) return; } - paste(doc, websites[website_selected]); + paste(doc, websites_api[website_selected]); } static void on_configure_response(GtkDialog * dialog, gint response, gpointer * user_data) @@ -421,7 +459,7 @@ GtkWidget *plugin_configure(GtkDialog * dialog) widgets.author_entry = gtk_entry_new(); if(author_name == NULL) - author_name = USERNAME; + author_name = g_strdup(USERNAME); gtk_entry_set_text(GTK_ENTRY(widgets.author_entry), author_name); @@ Diff output truncated at 100000 characters. @@ -------------- This E-Mail was brought to you by github_commit_mail.py (Source: TBD).

1 0

[geany/geany-plugins] f506ba: Merge pull request #52 from Enrix835/master
by Frank Lanitz 02 Jul '12

02 Jul '12

Branch: refs/heads/1.22_release Author: Frank Lanitz <frank(a)frank.uvena.de> Committer: Frank Lanitz <frank(a)frank.uvena.de> Date: Mon, 02 Jul 2012 19:22:26 Commit: f506bad67aac7296fc32e8128203776b8911af81 https://github.com/geany/geany-plugins/commit/f506bad67aac7296fc32e81282037… Log Message: ----------- Merge pull request #52 from Enrix835/master GeniusPaste fixes Modified Paths: -------------- geniuspaste/src/geniuspaste.c Modified: geniuspaste/src/geniuspaste.c 74 files changed, 56 insertions(+), 18 deletions(-) =================================================================== @@ -38,9 +38,9 @@ #define PLUGIN_VERSION "0.2" #ifdef G_OS_WIN32 -#define USERNAME getenv("USERNAME") +#define USERNAME g_getenv("USERNAME") #else -#define USERNAME getenv("USER") +#define USERNAME g_getenv("USER") #endif /* stay compatible with GTK < 2.24 */ @@ -51,7 +51,7 @@ #endif #define CODEPAD_ORG 0 -#define PASTEBIN_COM 1 +#define TINYPASTE_COM 1 #define PASTEBIN_GEANY_ORG 2 #define DPASTE_DE 3 #define SPRUNGE_US 4 @@ -67,8 +67,17 @@ static const gchar *websites[] = { + "codepad.org", + "tinypaste.com", + "pastebin.geany.org", + "dpaste.de", + "sprunge.us", +}; + +static const gchar *websites_api[] = +{ "http://codepad.org/", - "http://pastebin.com/api_public.php", + "http://tinypaste.com/api/create.xml", "http://pastebin.geany.org/api/", "http://dpaste.de/api/", "http://sprunge.us/", @@ -105,11 +114,11 @@ static void load_settings(void) config_file = g_strconcat(geany->app->configdir, G_DIR_SEPARATOR_S, "plugins", G_DIR_SEPARATOR_S, "geniuspaste", G_DIR_SEPARATOR_S, "geniuspaste.conf", NULL); g_key_file_load_from_file(config, config_file, G_KEY_FILE_NONE, NULL); - + website_selected = utils_get_setting_integer(config, "geniuspaste", "website", PASTEBIN_GEANY_ORG); check_button_is_checked = utils_get_setting_boolean(config, "geniuspaste", "open_browser", FALSE); author_name = utils_get_setting_string(config, "geniuspaste", "author_name", USERNAME); - + g_key_file_free(config); } @@ -136,6 +145,7 @@ static void save_settings(void) utils_write_file(config_file, data); g_free(data); } + g_free(config_dir); g_key_file_free(config); } @@ -206,7 +216,7 @@ static void paste(GeanyDocument * doc, const gchar * website) f_title = g_path_get_basename(doc->file_name); load_settings(); - + f_content = get_paste_text(doc, &f_length); if (f_content == NULL || f_content[0] == '\0') { @@ -228,16 +238,20 @@ static void paste(GeanyDocument * doc, const gchar * website) } msg = soup_message_new("POST", website); - formdata = soup_form_encode("lang", f_type, "code", f_content, - "submit", "Submit", NULL); + formdata = soup_form_encode("lang", f_type, + "code", f_content, + "submit", "Submit", + NULL); break; - case PASTEBIN_COM: + case TINYPASTE_COM: msg = soup_message_new("POST", website); - formdata = soup_form_encode("paste_code", f_content, "paste_format", - f_type, "paste_name", f_title, NULL); + formdata = soup_form_encode("paste", f_content, + "title", f_title, + "is_code", g_strcmp0(f_type, "None") == 0 ? "0" : "1", + NULL); break; @@ -256,8 +270,10 @@ static void paste(GeanyDocument * doc, const gchar * website) /* apparently dpaste.de detects automatically the syntax of the * pasted code so 'lexer' should be unneeded */ - formdata = soup_form_encode("content", f_content, "title", f_title, - "lexer", f_type, NULL); + formdata = soup_form_encode("content", f_content, + "title", f_title, + "lexer", f_type, + NULL); break; @@ -271,8 +287,11 @@ static void paste(GeanyDocument * doc, const gchar * website) case PASTEBIN_GEANY_ORG: msg = soup_message_new("POST", website); - formdata = soup_form_encode("content", f_content, "author", author_name, - "title", f_title, "lexer", f_type, NULL); + formdata = soup_form_encode("content", f_content, + "author", author_name, + "title", f_title, + "lexer", f_type, + NULL); break; @@ -324,6 +343,25 @@ static void paste(GeanyDocument * doc, const gchar * website) } } + else if(website_selected == TINYPASTE_COM) + { + /* tinypaste.com returns a XML response which looks + * like this: + * + * <?xml version="1.0" encoding="utf-8"?> + * <result> + * <response>xxxxx</response> + * </result> + */ + temp_body = g_strdup(p_url); + tokens_array = g_strsplit_set(temp_body, "<>", 0); + + p_url = g_strdup_printf("http://%s/%s", websites[TINYPASTE_COM], tokens_array[6]); + + g_free(temp_body); + g_strfreev(tokens_array); + } + else if(website_selected == DPASTE_DE) { p_url = g_strndup(p_url + 1, strlen(p_url) - 2); @@ -384,7 +422,7 @@ static void item_activate(GtkMenuItem * menuitem, gpointer gdata) return; } - paste(doc, websites[website_selected]); + paste(doc, websites_api[website_selected]); } static void on_configure_response(GtkDialog * dialog, gint response, gpointer * user_data) @@ -421,7 +459,7 @@ GtkWidget *plugin_configure(GtkDialog * dialog) widgets.author_entry = gtk_entry_new(); if(author_name == NULL) - author_name = USERNAME; + author_name = g_strdup(USERNAME); gtk_entry_set_text(GTK_ENTRY(widgets.author_entry), author_name); @@ Diff output truncated at 100000 characters. @@ -------------- This E-Mail was brought to you by github_commit_mail.py (Source: TBD).

1 0

[geany/geany-plugins] f506ba: Merge pull request #52 from Enrix835/master
by Frank Lanitz 02 Jul '12

02 Jul '12

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

Plugins-Commits July 2012