Plugins-Commits May 2012

plugins-commits@lists.geany.org

1 participants
29 discussions

[geany/geany-plugins] 4174c8: multiterm: Fix compatibility with newer Vala
by Quentin Glidic 19 May '12

19 May '12

Branch: refs/heads/master Author: Quentin Glidic <sardemff7+git(a)sardemff7.net> Committer: Frank Lanitz <frank(a)frank.uvena.de> Date: Fri, 18 May 2012 21:54:11 Commit: 4174c865eba834ae4bf16e55f20cd45477d21d8c https://github.com/geany/geany-plugins/commit/4174c865eba834ae4bf16e55f20cd… Log Message: ----------- multiterm: Fix compatibility with newer Vala GLib.Menu was introduced in GLib/GIO 2.32 (Vala 0.16) We explicit Gtk namespacee here to avoid collision Signed-off-by: Frank Lanitz <frank(a)frank.uvena.de> Modified Paths: -------------- multiterm/src/context-menu.vala Modified: multiterm/src/context-menu.vala 26 files changed, 13 insertions(+), 13 deletions(-) =================================================================== @@ -2,7 +2,7 @@ using Gtk; namespace MultiTerm { - public class ContextMenu : Menu + public class ContextMenu : Gtk.Menu { public signal void new_shell_activate(ShellConfig sh); public signal void new_window_activate(); @@ -19,12 +19,12 @@ namespace MultiTerm show_tabs_activate(item.active); } - private void on_next_previous_tab_activate(MenuItem item, bool next) + private void on_next_previous_tab_activate(Gtk.MenuItem item, bool next) { item.sensitive = next ? next_tab_activate() : previous_tab_activate(); } - private void on_move_to_location(MenuItem item) + private void on_move_to_location(Gtk.MenuItem item) { if (item.get_data<bool>("location_is_msgwin")) { @@ -49,15 +49,15 @@ namespace MultiTerm public ContextMenu(Config? cfg) { - Menu menu; - MenuItem item; + Gtk.Menu menu; + Gtk.MenuItem item; ImageMenuItem image_item; CheckMenuItem check_item; - menu = new Menu(); + menu = new Gtk.Menu(); menu.show(); - item = new MenuItem.with_label("Open Tab"); + item = new Gtk.MenuItem.with_label("Open Tab"); item.set_submenu(menu); item.show(); this.append(item); @@ -66,25 +66,25 @@ namespace MultiTerm for (uint i = 0; i < len; i++) { ShellConfig sh = cfg.shell_configs.nth_data(i); - item = new MenuItem.with_label(sh.name); + item = new Gtk.MenuItem.with_label(sh.name); item.activate.connect(() => new_shell_activate(sh)); menu.append(item); item.show(); } - item = new MenuItem.with_label("Open Window"); + item = new Gtk.MenuItem.with_label("Open Window"); item.activate.connect(() => new_window_activate()); this.append(item); item.show(); add_separator(); - item = new MenuItem.with_label("Next tab"); + item = new Gtk.MenuItem.with_label("Next tab"); item.activate.connect(() => on_next_previous_tab_activate(item, true)); //this.append(item); //item.show(); - item = new MenuItem.with_label("Previous tab"); + item = new Gtk.MenuItem.with_label("Previous tab"); item.activate.connect(() => on_next_previous_tab_activate(item, false)); //this.append(item); //item.show(); @@ -111,12 +111,12 @@ namespace MultiTerm if (cfg.location == "msgwin") { - item = new MenuItem.with_label("Move to sidebar"); + item = new Gtk.MenuItem.with_label("Move to sidebar"); item.set_data<bool>("location_is_msgwin", true); } else { - item = new MenuItem.with_label("Move to message window"); + item = new Gtk.MenuItem.with_label("Move to message window"); item.set_data<bool>("location_is_msgwin", false); } item.activate.connect(() => on_move_to_location(item)); @@ 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] ea9221: Minor restructuredText format fixes
by Enrico Tröger 18 May '12

18 May '12

Branch: refs/heads/master Author: Enrico Tröger <enrico.troeger(a)uvena.de> Committer: Enrico Tröger <enrico.troeger(a)uvena.de> Date: Fri, 18 May 2012 11:10:18 Commit: ea922192a0af51d3bf662f24650ccc69989293c0 https://github.com/geany/geany-plugins/commit/ea922192a0af51d3bf662f24650cc… Log Message: ----------- Minor restructuredText format fixes Modified Paths: -------------- README Modified: README 5 files changed, 3 insertions(+), 2 deletions(-) =================================================================== @@ -10,7 +10,8 @@ Building with autotools You can use Autotools to build the Geany plugins in this repository. -Usage: +Usage:: + ./configure [arguments] or alternatively ./autogen.sh [arguments] make sudo make install @@ -93,7 +94,7 @@ Building with waf ^^^^^^^^^^^^^^^^^ Geany-Plugins can also being build using Python based build system waf. -For doing this you have similar to building with autotools run three steps: +For doing this you have similar to building with autotools run three steps:: ./waf configure ./waf build @@ 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] fa46db: Update OpenOffice dictionary download link and rephrase dictionary installation instructions (closes #3525162)
by Enrico Tröger 18 May '12

18 May '12

Branch: refs/heads/master Author: Enrico Tröger <enrico.troeger(a)uvena.de> Committer: Enrico Tröger <enrico.troeger(a)uvena.de> Date: Fri, 18 May 2012 11:08:30 Commit: fa46dbc7b0bea9cf70004cf6026fd75d24ce0fa7 https://github.com/geany/geany-plugins/commit/fa46dbc7b0bea9cf70004cf6026fd… Log Message: ----------- Update OpenOffice dictionary download link and rephrase dictionary installation instructions (closes #3525162) Modified Paths: -------------- spellcheck/README Modified: spellcheck/README 19 files changed, 11 insertions(+), 8 deletions(-) =================================================================== @@ -81,18 +81,21 @@ Configuring dictionaries on Windows On Windows, you might need to install the dictionaries (the files containing the information for spell checking) manually. First, you need to download the dictionary files for the -languages you want, e.g. from http://wiki.services.openoffice.org/wiki/Dictionaries. +languages you want, e.g. from +http://extensions.services.openoffice.org/en/dictionaries. Be sure to download the "Spelling" archives from this site. The downloaded archive should contain one or more .dic and .aff files. -Once you downloaded the dictionaries, extract them into a folder of -your choice, e.g. C:\dictionaries. Then open to the Spell Check plugin -preferences dialog in Geany and choose the folder you just created. -You may need to restart Geany and then the installed dictionaries should -be available. +Instructions:: -Currently, installing dictionaries into a custom folder only works -with Myspell/Hunspell dictionaries (http://hunspell.sourceforge.net/). + 1. Download the archive you want to use + 2. The downloaded archive with the extension .oxt is actually a ZIP + archive, so extract it as usual (e.g. with 7-Zip or another ZIP + unpacker). Extract the contents into a folder of your choice, + e.g. C:\dictionaries + 3. Then open to the Spell Check plugin preferences dialog in Geany and + choose the folder you just created. You may need to restart Geany + and then the installed dictionaries should be available Known issues @@ 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] cdf09a: Merge pull request #34 from Enrix835/master
by Frank Lanitz 11 May '12

11 May '12

Branch: refs/heads/master Author: Frank Lanitz <frank(a)frank.uvena.de> Committer: Frank Lanitz <frank(a)frank.uvena.de> Date: Thu, 10 May 2012 19:21:17 Commit: cdf09af0a44149045242dbe06969c6930ff7ea16 https://github.com/geany/geany-plugins/commit/cdf09af0a44149045242dbe06969c… Log Message: ----------- Merge pull request #34 from Enrix835/master GeniusPaste: new features Modified Paths: -------------- geniuspaste/src/geniuspaste.c Modified: geniuspaste/src/geniuspaste.c 232 files changed, 173 insertions(+), 59 deletions(-) =================================================================== @@ -19,9 +19,13 @@ * MA 02110-1301, USA. */ -#include "libsoup/soup.h" -#include "stdlib.h" -#include "string.h" +#include <libsoup/soup.h> +#include <stdlib.h> +#include <string.h> + +#ifdef HAVE_LOCALE_H +#include <locale.h> +#endif #ifdef HAVE_CONFIG_H #include "config.h" /* for the gettext domain */ @@ -50,7 +54,8 @@ static GtkWidget *main_menu_item = NULL; -static const gchar *websites[] = { +static const gchar *websites[] = +{ "http://codepad.org", "http://pastebin.com/api_public.php", "http://pastebin.geany.org/api/", @@ -58,18 +63,23 @@ "http://sprunge.us/", }; -static struct { +static struct +{ GtkWidget *combo; GtkWidget *check_button; + GtkWidget *author_entry; } widgets; +static gchar *config_file = NULL; +static gchar *author_name = NULL; + static gint website_selected; static gboolean check_button_is_checked = FALSE; PLUGIN_VERSION_CHECK(147) PLUGIN_SET_TRANSLATABLE_INFO(LOCALEDIR, GETTEXT_PACKAGE, "GeniusPaste", - _("Paste your code on your favorite pastebin"), - "0.1", "Enrico Trotta"); + _("Paste your code on your favorite pastebin"), + "0.2", "Enrico Trotta"); static gint indexof(const gchar * string, gchar c) { @@ -83,6 +93,62 @@ static gint last_indexof(const gchar * string, gchar c) return occ ? occ - string : -1; } +static void load_settings(void) +{ + GKeyFile *config = g_key_file_new(); + GError *err = NULL; + gint tmp_website; + gboolean tmp_open_browser; + gchar *tmp_author_name; + + 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); + + tmp_website = g_key_file_get_integer(config, "geniuspaste", "website", &err); + tmp_open_browser = g_key_file_get_boolean(config, "geniuspaste", "open_browser", &err); + tmp_author_name = g_key_file_get_string(config, "geniuspaste", "author_name", &err); + + if (err) + { + g_error_free(err); + } + else + { + website_selected = tmp_website; + check_button_is_checked = tmp_open_browser; + author_name = tmp_author_name; + } + g_key_file_free(config); +} + +static void save_settings(void) +{ + GKeyFile *config = g_key_file_new(); + gchar *data; + gchar *config_dir = g_path_get_dirname(config_file); + + g_key_file_load_from_file(config, config_file, G_KEY_FILE_NONE, NULL); + + g_key_file_set_integer(config, "geniuspaste", "website", website_selected); + g_key_file_set_boolean(config, "geniuspaste", "open_browser", check_button_is_checked); + g_key_file_set_string(config, "geniuspaste", "author_name", author_name); + + 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 + { + 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); +} + static void paste(const gchar * website) { SoupSession *session = soup_session_async_new(); @@ -90,14 +156,14 @@ static void paste(const gchar * website) GeanyDocument *doc = document_get_current(); - if(doc == NULL) { - dialogs_show_msgbox(GTK_MESSAGE_ERROR, "There are no opened documents. Open one and retry.\n"); + if(doc == NULL) + { + dialogs_show_msgbox(GTK_MESSAGE_ERROR, _("There are no opened documents. Open one and retry.\n")); return; } GeanyFiletype *ft = doc->file_type; - - GError *error; + GError *error = NULL; gchar *f_content; gchar *f_type = g_strdup(ft->name); @@ -109,15 +175,19 @@ static void paste(const gchar * website) gchar *temp_body; gchar **tokens_array; - const gchar *langs_supported_codepad[] = { "C", "C++", "D", "Haskell", - "Lua", "OCaml", "PHP", "Perl", "Plain Text", - "Python", "Ruby", "Scheme", "Tcl" + const gchar *langs_supported_codepad[] = + { + "C", "C++", "D", "Haskell", + "Lua", "OCaml", "PHP", "Perl", "Plain Text", + "Python", "Ruby", "Scheme", "Tcl" }; - const gchar *langs_supported_dpaste[] = { "Bash", "C", "CSS", "Diff", - "Django/Jinja", "HTML", "IRC logs", "JavaScript", "PHP", - "Python console session", "Python Traceback", "Python", - "Python3", "Restructured Text", "SQL", "Text only" + const gchar *langs_supported_dpaste[] = + { + "Bash", "C", "CSS", "Diff", + "Django/Jinja", "HTML", "IRC logs", "JavaScript", "PHP", + "Python console session", "Python Traceback", "Python", + "Python3", "Restructured Text", "SQL", "Text only" }; gint occ_position; @@ -129,11 +199,15 @@ static void paste(const gchar * website) occ_position = last_indexof(f_name, G_DIR_SEPARATOR); f_title = f_name + occ_position + 1; - switch (website_selected) { + load_settings(); + + switch (website_selected) + { case CODEPAD_ORG: - for (i = 0; i < G_N_ELEMENTS(langs_supported_codepad); i++) { + for (i = 0; i < G_N_ELEMENTS(langs_supported_codepad); i++) + { if (g_strcmp0(f_type, langs_supported_codepad[i]) == 0) break; else @@ -141,8 +215,9 @@ static void paste(const gchar * website) } result = g_file_get_contents(f_path, &f_content, &f_lenght, &error); - if(result == FALSE) { - dialogs_show_msgbox(GTK_MESSAGE_ERROR, "Unable to the the content of the file"); + if(result == FALSE) + { + dialogs_show_msgbox(GTK_MESSAGE_ERROR, _("Unable to get the the content of the file")); g_error_free(error); return; } @@ -156,8 +231,9 @@ static void paste(const gchar * website) case PASTEBIN_COM: result = g_file_get_contents(f_path, &f_content, &f_lenght, &error); - if(result == FALSE) { - dialogs_show_msgbox(GTK_MESSAGE_ERROR, "Unable to the the content of the file"); + if(result == FALSE) + { + dialogs_show_msgbox(GTK_MESSAGE_ERROR, _("Unable to get the the content of the file")); g_error_free(error); return; } @@ -171,7 +247,8 @@ static void paste(const gchar * website) case DPASTE_DE: - for (i = 0; i < G_N_ELEMENTS(langs_supported_dpaste); i++) { + for (i = 0; i < G_N_ELEMENTS(langs_supported_dpaste); i++) + { if (g_strcmp0(f_type, langs_supported_dpaste[i]) == 0) break; else @@ -180,7 +257,7 @@ static void paste(const gchar * website) result = g_file_get_contents(f_path, &f_content, &f_lenght, &error); if(result == FALSE) { - dialogs_show_msgbox(GTK_MESSAGE_ERROR, "Unable to the the content of the file"); + dialogs_show_msgbox(GTK_MESSAGE_ERROR, _("Unable to get the the content of the file")); g_error_free(error); return; } @@ -197,8 +274,9 @@ static void paste(const gchar * website) case SPRUNGE_US: result = g_file_get_contents(f_path, &f_content, &f_lenght, &error); - if(result == FALSE) { - dialogs_show_msgbox(GTK_MESSAGE_ERROR, "Unable to the the content of the file"); + if(result == FALSE) + { + dialogs_show_msgbox(GTK_MESSAGE_ERROR, _("Unable to get the the content of the file")); g_error_free(error); return; } @@ -211,14 +289,15 @@ static void paste(const gchar * website) case PASTEBIN_GEANY_ORG: result = g_file_get_contents(f_path, &f_content, &f_lenght, &error); - if(result == FALSE) { - dialogs_show_msgbox(GTK_MESSAGE_ERROR, "Unable to the the content of the file"); + if(result == FALSE) + { + dialogs_show_msgbox(GTK_MESSAGE_ERROR, _("Unable to get the the content of the file")); g_error_free(error); return; } msg = soup_message_new("POST", website); - formdata = soup_form_encode("content", f_content, "author", USERNAME, + formdata = soup_form_encode("content", f_content, "author", author_name, "title", f_title, "lexer", f_type, NULL); break; @@ -230,16 +309,17 @@ static void paste(const gchar * website) status = soup_session_send_message(session, msg); p_url = g_strdup(msg->response_body->data); - g_free(f_content); - - if(status == SOUP_STATUS_OK) { + + if(status == SOUP_STATUS_OK) + { /* * codepad.org doesn't return only the url of the new snippet pasted * but an html page. This minimal parser will get the bare url. */ - if (website_selected == CODEPAD_ORG) { + if (website_selected == CODEPAD_ORG) + { temp_body = g_strdup(p_url); tokens_array = g_strsplit(temp_body, "<a href=\"", 0); @@ -249,23 +329,29 @@ static void paste(const gchar * website) p_url = g_strdup(tokens_array[5]); occ_position = indexof(tokens_array[5], '\"'); - + g_free(temp_body); g_strfreev(tokens_array); - - if(occ_position != -1) { + + if(occ_position != -1) + { p_url[occ_position] = '\0'; - } else { - dialogs_show_msgbox(GTK_MESSAGE_ERROR, "Unable to paste the code on codepad.org\n" - "Retry or select another pastebin."); - g_free(p_url); + } + else + { + dialogs_show_msgbox(GTK_MESSAGE_ERROR, _("Unable to paste the code on codepad.org\n" + "Retry or select another pastebin.")); return; } - } else if(website_selected == DPASTE_DE) { + } + else if(website_selected == DPASTE_DE) + { p_url = g_strndup(p_url + 1, strlen(p_url) - 2); - } else if(website_selected == SPRUNGE_US) { + } + else if(website_selected == SPRUNGE_US) + { /* in order to enable the syntax highlightning on sprunge.us * it is necessary to append at the returned url a question @@ -281,17 +367,22 @@ static void paste(const gchar * website) g_free(temp_body); } - if (check_button_is_checked) { + if (check_button_is_checked) + { utils_open_browser(p_url); - } else { + } + else + { dialogs_show_msgbox(GTK_MESSAGE_INFO, "%s", p_url); } - - } else { - dialogs_show_msgbox(GTK_MESSAGE_ERROR, "Unable to paste the code. Check your connection and retry.\n" - "Error code: %d\n", status); + } + else + { + dialogs_show_msgbox(GTK_MESSAGE_ERROR, _("Unable to paste the code. Check your connection and retry.\n" + "Error code: %d\n"), status); } + g_free(f_content); g_free(p_url); } @@ -302,11 +393,19 @@ static void item_activate(GtkMenuItem * menuitem, gpointer gdata) static void on_configure_response(GtkDialog * dialog, gint response, gpointer * user_data) { - if (response == GTK_RESPONSE_OK || response == GTK_RESPONSE_APPLY) { - website_selected = gtk_combo_box_get_active(GTK_COMBO_BOX(widgets.combo)); - - if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widgets.check_button))) { - check_button_is_checked = TRUE; + if (response == GTK_RESPONSE_OK || response == GTK_RESPONSE_APPLY) + { + if(g_strcmp0(gtk_entry_get_text(GTK_ENTRY(widgets.author_entry)), "") == 0) + { + dialogs_show_msgbox(GTK_MESSAGE_ERROR, _("The author name field is empty!")); + } + else + { + website_selected = gtk_combo_box_get_active(GTK_COMBO_BOX(widgets.combo)); + check_button_is_checked = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widgets.check_button)); + author_name = g_strdup(gtk_entry_get_text(GTK_ENTRY(widgets.author_entry))); + save_settings(); + g_free(author_name); } } } @@ -314,26 +413,39 @@ static void on_configure_response(GtkDialog * dialog, gint response, gpointer * GtkWidget *plugin_configure(GtkDialog * dialog) { gint i; - GtkWidget *label, *vbox; + GtkWidget *label, *vbox, *author_label; vbox = gtk_vbox_new(FALSE, 6); label = gtk_label_new(_("Select a pastebin:")); gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5); + author_label = gtk_label_new(_("Enter the author name:")); + gtk_misc_set_alignment(GTK_MISC(author_label), 0, 0.5); + + widgets.author_entry = gtk_entry_new(); + + if(author_name == NULL) + author_name = USERNAME; + + gtk_entry_set_text(GTK_ENTRY(widgets.author_entry), author_name); + widgets.combo = gtk_combo_box_text_new(); for (i = 0; i < G_N_ELEMENTS(websites); i++) gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(widgets.combo), websites[i]); - gtk_combo_box_set_active(GTK_COMBO_BOX(widgets.combo), 0); - - widgets.check_button = gtk_check_button_new_with_label("show your paste in a new browser tab"); + widgets.check_button = gtk_check_button_new_with_label(_("Show your paste in a new browser tab")); gtk_container_add(GTK_CONTAINER(vbox), label); gtk_container_add(GTK_CONTAINER(vbox), widgets.combo); + gtk_container_add(GTK_CONTAINER(vbox), author_label); + gtk_container_add(GTK_CONTAINER(vbox), widgets.author_entry); gtk_container_add(GTK_CONTAINER(vbox), widgets.check_button); + gtk_combo_box_set_active(GTK_COMBO_BOX(widgets.combo), website_selected); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widgets.check_button), check_button_is_checked); + gtk_widget_show_all(vbox); g_signal_connect(dialog, "response", G_CALLBACK(on_configure_response), NULL); @@ -357,6 +469,8 @@ static void add_menu_item() void plugin_init(GeanyData * data) { + load_settings(); + main_locale_init(LOCALEDIR, GETTEXT_PACKAGE); add_menu_item(); } @@ 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] 405d45: GeniusPaste: fixed indentation
by Enrico 07 May '12

07 May '12

Branch: refs/heads/master Author: Enrico <enrico.trt(a)gmail.com> Committer: Enrico <enrico.trt(a)gmail.com> Date: Mon, 07 May 2012 16:45:23 Commit: 405d45ccc1f10f3d5575a6c532e3fe17fc697454 https://github.com/geany/geany-plugins/commit/405d45ccc1f10f3d5575a6c532e3f… Log Message: ----------- GeniusPaste: fixed indentation Modified Paths: -------------- geniuspaste/src/geniuspaste.c Modified: geniuspaste/src/geniuspaste.c 94 files changed, 46 insertions(+), 48 deletions(-) =================================================================== @@ -24,19 +24,19 @@ #include <string.h> #ifdef HAVE_LOCALE_H - #include <locale.h> +#include <locale.h> #endif #ifdef HAVE_CONFIG_H - #include "config.h" /* for the gettext domain */ +#include "config.h" /* for the gettext domain */ #endif #include <geanyplugin.h> #ifdef G_OS_WIN32 - #define USERNAME getenv("USERNAME") +#define USERNAME getenv("USERNAME") #else - #define USERNAME getenv("USER") +#define USERNAME getenv("USER") #endif #define CODEPAD_ORG 0 @@ -78,8 +78,8 @@ PLUGIN_VERSION_CHECK(147) PLUGIN_SET_TRANSLATABLE_INFO(LOCALEDIR, GETTEXT_PACKAGE, "GeniusPaste", - _("Paste your code on your favorite pastebin"), - "0.2", "Enrico Trotta"); + _("Paste your code on your favorite pastebin"), + "0.2", "Enrico Trotta"); static gint indexof(const gchar * string, gchar c) { @@ -95,59 +95,58 @@ static gint last_indexof(const gchar * string, gchar c) static void load_settings(void) { - GKeyFile *config = g_key_file_new(); - GError *err = NULL; + GKeyFile *config = g_key_file_new(); + GError *err = NULL; gint tmp_website; gboolean tmp_open_browser; gchar *tmp_author_name; - 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); + 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); - tmp_website = g_key_file_get_integer(config, "geniuspaste", "website", &err); + tmp_website = g_key_file_get_integer(config, "geniuspaste", "website", &err); tmp_open_browser = g_key_file_get_boolean(config, "geniuspaste", "open_browser", &err); tmp_author_name = g_key_file_get_string(config, "geniuspaste", "author_name", &err); - if (err) + if (err) { - g_error_free(err); - } - else + g_error_free(err); + } + else { - website_selected = tmp_website; + website_selected = tmp_website; check_button_is_checked = tmp_open_browser; author_name = tmp_author_name; } - g_key_file_free(config); + g_key_file_free(config); } - static void save_settings(void) { - GKeyFile *config = g_key_file_new(); - gchar *data; - gchar *config_dir = g_path_get_dirname(config_file); + GKeyFile *config = g_key_file_new(); + gchar *data; + gchar *config_dir = g_path_get_dirname(config_file); - g_key_file_load_from_file(config, config_file, G_KEY_FILE_NONE, NULL); + g_key_file_load_from_file(config, config_file, G_KEY_FILE_NONE, NULL); - g_key_file_set_integer(config, "geniuspaste", "website", website_selected); + g_key_file_set_integer(config, "geniuspaste", "website", website_selected); g_key_file_set_boolean(config, "geniuspaste", "open_browser", check_button_is_checked); g_key_file_set_string(config, "geniuspaste", "author_name", author_name); - 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 - { - 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); + 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 + { + 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); } static void paste(const gchar * website) @@ -178,17 +177,17 @@ static void paste(const gchar * website) const gchar *langs_supported_codepad[] = { - "C", "C++", "D", "Haskell", - "Lua", "OCaml", "PHP", "Perl", "Plain Text", - "Python", "Ruby", "Scheme", "Tcl" + "C", "C++", "D", "Haskell", + "Lua", "OCaml", "PHP", "Perl", "Plain Text", + "Python", "Ruby", "Scheme", "Tcl" }; const gchar *langs_supported_dpaste[] = { - "Bash", "C", "CSS", "Diff", - "Django/Jinja", "HTML", "IRC logs", "JavaScript", "PHP", - "Python console session", "Python Traceback", "Python", - "Python3", "Restructured Text", "SQL", "Text only" + "Bash", "C", "CSS", "Diff", + "Django/Jinja", "HTML", "IRC logs", "JavaScript", "PHP", + "Python console session", "Python Traceback", "Python", + "Python3", "Restructured Text", "SQL", "Text only" }; gint occ_position; @@ -376,12 +375,11 @@ static void paste(const gchar * website) { dialogs_show_msgbox(GTK_MESSAGE_INFO, "%s", p_url); } - } else { dialogs_show_msgbox(GTK_MESSAGE_ERROR, _("Unable to paste the code. Check your connection and retry.\n" - "Error code: %d\n"), status); + "Error code: %d\n"), status); } g_free(f_content); @@ -426,10 +424,10 @@ GtkWidget *plugin_configure(GtkDialog * dialog) gtk_misc_set_alignment(GTK_MISC(author_label), 0, 0.5); widgets.author_entry = gtk_entry_new(); - + if(author_name == NULL) author_name = USERNAME; - + gtk_entry_set_text(GTK_ENTRY(widgets.author_entry), author_name); widgets.combo = gtk_combo_box_text_new(); @@ 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] 3247e8: GeniusPaste: added saving/loading of settings
by Enrico 07 May '12

07 May '12

Branch: refs/heads/master Author: Enrico <enrico.trt(a)gmail.com> Committer: Enrico <enrico.trt(a)gmail.com> Date: Sun, 06 May 2012 22:52:30 Commit: 3247e8090bc3f33babe6d37c72fc3d9fa3517469 https://github.com/geany/geany-plugins/commit/3247e8090bc3f33babe6d37c72fc3… Log Message: ----------- GeniusPaste: added saving/loading of settings now the user can change the author name of the pasted code complete support to i18n fixed some alert's messages changed the code style to match the style of the other plugins Modified Paths: -------------- geniuspaste/src/geniuspaste.c Modified: geniuspaste/src/geniuspaste.c 226 files changed, 171 insertions(+), 55 deletions(-) =================================================================== @@ -19,20 +19,24 @@ * MA 02110-1301, USA. */ -#include "libsoup/soup.h" -#include "stdlib.h" -#include "string.h" +#include <libsoup/soup.h> +#include <stdlib.h> +#include <string.h> + +#ifdef HAVE_LOCALE_H + #include <locale.h> +#endif #ifdef HAVE_CONFIG_H -#include "config.h" /* for the gettext domain */ + #include "config.h" /* for the gettext domain */ #endif #include <geanyplugin.h> #ifdef G_OS_WIN32 -#define USERNAME getenv("USERNAME") + #define USERNAME getenv("USERNAME") #else -#define USERNAME getenv("USER") + #define USERNAME getenv("USER") #endif #define CODEPAD_ORG 0 @@ -50,7 +54,8 @@ static GtkWidget *main_menu_item = NULL; -static const gchar *websites[] = { +static const gchar *websites[] = +{ "http://codepad.org", "http://pastebin.com/api_public.php", "http://pastebin.geany.org/api/", @@ -58,18 +63,23 @@ "http://sprunge.us/", }; -static struct { +static struct +{ GtkWidget *combo; GtkWidget *check_button; + GtkWidget *author_entry; } widgets; +static gchar *config_file = NULL; +static gchar *author_name = NULL; + static gint website_selected; static gboolean check_button_is_checked = FALSE; PLUGIN_VERSION_CHECK(147) PLUGIN_SET_TRANSLATABLE_INFO(LOCALEDIR, GETTEXT_PACKAGE, "GeniusPaste", _("Paste your code on your favorite pastebin"), - "0.1", "Enrico Trotta"); + "0.2", "Enrico Trotta"); static gint indexof(const gchar * string, gchar c) { @@ -83,6 +93,63 @@ static gint last_indexof(const gchar * string, gchar c) return occ ? occ - string : -1; } +static void load_settings(void) +{ + GKeyFile *config = g_key_file_new(); + GError *err = NULL; + gint tmp_website; + gboolean tmp_open_browser; + gchar *tmp_author_name; + + 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); + + tmp_website = g_key_file_get_integer(config, "geniuspaste", "website", &err); + tmp_open_browser = g_key_file_get_boolean(config, "geniuspaste", "open_browser", &err); + tmp_author_name = g_key_file_get_string(config, "geniuspaste", "author_name", &err); + + if (err) + { + g_error_free(err); + } + else + { + website_selected = tmp_website; + check_button_is_checked = tmp_open_browser; + author_name = tmp_author_name; + } + g_key_file_free(config); +} + + +static void save_settings(void) +{ + GKeyFile *config = g_key_file_new(); + gchar *data; + gchar *config_dir = g_path_get_dirname(config_file); + + g_key_file_load_from_file(config, config_file, G_KEY_FILE_NONE, NULL); + + g_key_file_set_integer(config, "geniuspaste", "website", website_selected); + g_key_file_set_boolean(config, "geniuspaste", "open_browser", check_button_is_checked); + g_key_file_set_string(config, "geniuspaste", "author_name", author_name); + + 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 + { + 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); +} + static void paste(const gchar * website) { SoupSession *session = soup_session_async_new(); @@ -90,14 +157,14 @@ static void paste(const gchar * website) GeanyDocument *doc = document_get_current(); - if(doc == NULL) { - dialogs_show_msgbox(GTK_MESSAGE_ERROR, "There are no opened documents. Open one and retry.\n"); + if(doc == NULL) + { + dialogs_show_msgbox(GTK_MESSAGE_ERROR, _("There are no opened documents. Open one and retry.\n")); return; } GeanyFiletype *ft = doc->file_type; - - GError *error; + GError *error = NULL; gchar *f_content; gchar *f_type = g_strdup(ft->name); @@ -109,12 +176,16 @@ static void paste(const gchar * website) gchar *temp_body; gchar **tokens_array; - const gchar *langs_supported_codepad[] = { "C", "C++", "D", "Haskell", + const gchar *langs_supported_codepad[] = + { + "C", "C++", "D", "Haskell", "Lua", "OCaml", "PHP", "Perl", "Plain Text", "Python", "Ruby", "Scheme", "Tcl" }; - const gchar *langs_supported_dpaste[] = { "Bash", "C", "CSS", "Diff", + const gchar *langs_supported_dpaste[] = + { + "Bash", "C", "CSS", "Diff", "Django/Jinja", "HTML", "IRC logs", "JavaScript", "PHP", "Python console session", "Python Traceback", "Python", "Python3", "Restructured Text", "SQL", "Text only" @@ -129,11 +200,15 @@ static void paste(const gchar * website) occ_position = last_indexof(f_name, G_DIR_SEPARATOR); f_title = f_name + occ_position + 1; - switch (website_selected) { + load_settings(); + + switch (website_selected) + { case CODEPAD_ORG: - for (i = 0; i < G_N_ELEMENTS(langs_supported_codepad); i++) { + for (i = 0; i < G_N_ELEMENTS(langs_supported_codepad); i++) + { if (g_strcmp0(f_type, langs_supported_codepad[i]) == 0) break; else @@ -141,8 +216,9 @@ static void paste(const gchar * website) } result = g_file_get_contents(f_path, &f_content, &f_lenght, &error); - if(result == FALSE) { - dialogs_show_msgbox(GTK_MESSAGE_ERROR, "Unable to the the content of the file"); + if(result == FALSE) + { + dialogs_show_msgbox(GTK_MESSAGE_ERROR, _("Unable to get the the content of the file")); g_error_free(error); return; } @@ -156,8 +232,9 @@ static void paste(const gchar * website) case PASTEBIN_COM: result = g_file_get_contents(f_path, &f_content, &f_lenght, &error); - if(result == FALSE) { - dialogs_show_msgbox(GTK_MESSAGE_ERROR, "Unable to the the content of the file"); + if(result == FALSE) + { + dialogs_show_msgbox(GTK_MESSAGE_ERROR, _("Unable to get the the content of the file")); g_error_free(error); return; } @@ -171,7 +248,8 @@ static void paste(const gchar * website) case DPASTE_DE: - for (i = 0; i < G_N_ELEMENTS(langs_supported_dpaste); i++) { + for (i = 0; i < G_N_ELEMENTS(langs_supported_dpaste); i++) + { if (g_strcmp0(f_type, langs_supported_dpaste[i]) == 0) break; else @@ -180,7 +258,7 @@ static void paste(const gchar * website) result = g_file_get_contents(f_path, &f_content, &f_lenght, &error); if(result == FALSE) { - dialogs_show_msgbox(GTK_MESSAGE_ERROR, "Unable to the the content of the file"); + dialogs_show_msgbox(GTK_MESSAGE_ERROR, _("Unable to get the the content of the file")); g_error_free(error); return; } @@ -197,8 +275,9 @@ static void paste(const gchar * website) case SPRUNGE_US: result = g_file_get_contents(f_path, &f_content, &f_lenght, &error); - if(result == FALSE) { - dialogs_show_msgbox(GTK_MESSAGE_ERROR, "Unable to the the content of the file"); + if(result == FALSE) + { + dialogs_show_msgbox(GTK_MESSAGE_ERROR, _("Unable to get the the content of the file")); g_error_free(error); return; } @@ -211,14 +290,15 @@ static void paste(const gchar * website) case PASTEBIN_GEANY_ORG: result = g_file_get_contents(f_path, &f_content, &f_lenght, &error); - if(result == FALSE) { - dialogs_show_msgbox(GTK_MESSAGE_ERROR, "Unable to the the content of the file"); + if(result == FALSE) + { + dialogs_show_msgbox(GTK_MESSAGE_ERROR, _("Unable to get the the content of the file")); g_error_free(error); return; } msg = soup_message_new("POST", website); - formdata = soup_form_encode("content", f_content, "author", USERNAME, + formdata = soup_form_encode("content", f_content, "author", author_name, "title", f_title, "lexer", f_type, NULL); break; @@ -230,16 +310,17 @@ static void paste(const gchar * website) status = soup_session_send_message(session, msg); p_url = g_strdup(msg->response_body->data); - g_free(f_content); - - if(status == SOUP_STATUS_OK) { + + if(status == SOUP_STATUS_OK) + { /* * codepad.org doesn't return only the url of the new snippet pasted * but an html page. This minimal parser will get the bare url. */ - if (website_selected == CODEPAD_ORG) { + if (website_selected == CODEPAD_ORG) + { temp_body = g_strdup(p_url); tokens_array = g_strsplit(temp_body, "<a href=\"", 0); @@ -249,23 +330,29 @@ static void paste(const gchar * website) p_url = g_strdup(tokens_array[5]); occ_position = indexof(tokens_array[5], '\"'); - + g_free(temp_body); g_strfreev(tokens_array); - - if(occ_position != -1) { + + if(occ_position != -1) + { p_url[occ_position] = '\0'; - } else { - dialogs_show_msgbox(GTK_MESSAGE_ERROR, "Unable to paste the code on codepad.org\n" - "Retry or select another pastebin."); - g_free(p_url); + } + else + { + dialogs_show_msgbox(GTK_MESSAGE_ERROR, _("Unable to paste the code on codepad.org\n" + "Retry or select another pastebin.")); return; } - } else if(website_selected == DPASTE_DE) { + } + else if(website_selected == DPASTE_DE) + { p_url = g_strndup(p_url + 1, strlen(p_url) - 2); - } else if(website_selected == SPRUNGE_US) { + } + else if(website_selected == SPRUNGE_US) + { /* in order to enable the syntax highlightning on sprunge.us * it is necessary to append at the returned url a question @@ -281,17 +368,23 @@ static void paste(const gchar * website) g_free(temp_body); } - if (check_button_is_checked) { + if (check_button_is_checked) + { utils_open_browser(p_url); - } else { + } + else + { dialogs_show_msgbox(GTK_MESSAGE_INFO, "%s", p_url); } - } else { - dialogs_show_msgbox(GTK_MESSAGE_ERROR, "Unable to paste the code. Check your connection and retry.\n" - "Error code: %d\n", status); + } + else + { + dialogs_show_msgbox(GTK_MESSAGE_ERROR, _("Unable to paste the code. Check your connection and retry.\n" + "Error code: %d\n"), status); } + g_free(f_content); g_free(p_url); } @@ -302,11 +395,19 @@ static void item_activate(GtkMenuItem * menuitem, gpointer gdata) static void on_configure_response(GtkDialog * dialog, gint response, gpointer * user_data) { - if (response == GTK_RESPONSE_OK || response == GTK_RESPONSE_APPLY) { - website_selected = gtk_combo_box_get_active(GTK_COMBO_BOX(widgets.combo)); - - if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widgets.check_button))) { - check_button_is_checked = TRUE; + if (response == GTK_RESPONSE_OK || response == GTK_RESPONSE_APPLY) + { + if(g_strcmp0(gtk_entry_get_text(GTK_ENTRY(widgets.author_entry)), "") == 0) + { + dialogs_show_msgbox(GTK_MESSAGE_ERROR, _("The author name field is empty!")); + } + else + { + website_selected = gtk_combo_box_get_active(GTK_COMBO_BOX(widgets.combo)); + check_button_is_checked = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widgets.check_button)); + author_name = g_strdup(gtk_entry_get_text(GTK_ENTRY(widgets.author_entry))); + save_settings(); + g_free(author_name); } } } @@ -314,26 +415,39 @@ static void on_configure_response(GtkDialog * dialog, gint response, gpointer * GtkWidget *plugin_configure(GtkDialog * dialog) { gint i; - GtkWidget *label, *vbox; + GtkWidget *label, *vbox, *author_label; vbox = gtk_vbox_new(FALSE, 6); label = gtk_label_new(_("Select a pastebin:")); gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5); + author_label = gtk_label_new(_("Enter the author name:")); + gtk_misc_set_alignment(GTK_MISC(author_label), 0, 0.5); + + widgets.author_entry = gtk_entry_new(); + + if(author_name == NULL) + author_name = USERNAME; + + gtk_entry_set_text(GTK_ENTRY(widgets.author_entry), author_name); + widgets.combo = gtk_combo_box_text_new(); for (i = 0; i < G_N_ELEMENTS(websites); i++) gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(widgets.combo), websites[i]); - gtk_combo_box_set_active(GTK_COMBO_BOX(widgets.combo), 0); - - widgets.check_button = gtk_check_button_new_with_label("show your paste in a new browser tab"); + widgets.check_button = gtk_check_button_new_with_label(_("Show your paste in a new browser tab")); gtk_container_add(GTK_CONTAINER(vbox), label); gtk_container_add(GTK_CONTAINER(vbox), widgets.combo); + gtk_container_add(GTK_CONTAINER(vbox), author_label); + gtk_container_add(GTK_CONTAINER(vbox), widgets.author_entry); gtk_container_add(GTK_CONTAINER(vbox), widgets.check_button); + gtk_combo_box_set_active(GTK_COMBO_BOX(widgets.combo), website_selected); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widgets.check_button), check_button_is_checked); + gtk_widget_show_all(vbox); g_signal_connect(dialog, "response", G_CALLBACK(on_configure_response), NULL); @@ -357,6 +471,8 @@ static void add_menu_item() void plugin_init(GeanyData * data) { + load_settings(); + main_locale_init(LOCALEDIR, GETTEXT_PACKAGE); add_menu_item(); } @@ 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] 6736ad: GeniusPaste: Some improvements
by Frank Lanitz 06 May '12

06 May '12

Branch: refs/heads/master Author: Frank Lanitz <frank(a)frank.uvena.de> Committer: Frank Lanitz <frank(a)frank.uvena.de> Date: Sun, 06 May 2012 07:48:05 Commit: 6736add0a4b7527f8fea33c9b2b4c98f98f20599 https://github.com/geany/geany-plugins/commit/6736add0a4b7527f8fea33c9b2b4c… Log Message: ----------- GeniusPaste: Some improvements Modified Paths: -------------- geniuspaste/TODO geniuspaste/src/geniuspaste.c Modified: geniuspaste/TODO 4 files changed, 3 insertions(+), 1 deletions(-) =================================================================== @@ -1,4 +1,6 @@ TODO ---- - * Make the geany's pastebin the default pastebin + [!] Implement saving/loading of the settings + [-] Make the geany's pastebin the default pastebin + Modified: geniuspaste/src/geniuspaste.c 384 files changed, 190 insertions(+), 194 deletions(-) =================================================================== @@ -24,17 +24,15 @@ #include "string.h" #ifdef HAVE_CONFIG_H - #include "config.h" /* for the gettext domain */ +#include "config.h" /* for the gettext domain */ #endif #include <geanyplugin.h> #ifdef G_OS_WIN32 - #define OPEN_BROWSER "start" - #define USERNAME getenv("USERNAME") +#define USERNAME getenv("USERNAME") #else - #define OPEN_BROWSER "xdg-open" - #define USERNAME getenv("USER") +#define USERNAME getenv("USER") #endif #define CODEPAD_ORG 0 @@ -43,6 +41,9 @@ #define DPASTE_DE 3 #define SPRUNGE_US 4 +#define DEFAULT_TYPE_CODEPAD langs_supported_codepad[8]; +#define DEFAULT_TYPE_DPASTE langs_supported_dpaste[15]; + GeanyPlugin *geany_plugin; GeanyData *geany_data; GeanyFunctions *geany_functions; @@ -62,41 +63,46 @@ GtkWidget *check_button; } widgets; - -static gint websites_num = 5; static gint website_selected; -static gchar *welcome_text = NULL; static gboolean check_button_is_checked = FALSE; PLUGIN_VERSION_CHECK(147) PLUGIN_SET_TRANSLATABLE_INFO(LOCALEDIR, GETTEXT_PACKAGE, "GeniusPaste", - _("Paste your code on your favorite pastebin"), + _("Paste your code on your favorite pastebin"), "0.1", "Enrico Trotta"); +static gint indexof(const gchar * string, gchar c) +{ + gchar * occ = strchr(string, c); + return occ ? occ - string : -1; +} -static gint last_indexof(gchar * string, gchar c) +static gint last_indexof(const gchar * string, gchar c) { - gchar * occ = strrchr(string, c); - return occ ? strrchr(string, c) - string : -1; + gchar * occ = strrchr(string, c); + return occ ? occ - string : -1; } static void paste(const gchar * website) { - g_type_init(); - SoupSession *session = soup_session_async_new(); SoupMessage *msg = NULL; GeanyDocument *doc = document_get_current(); + + if(doc == NULL) { + dialogs_show_msgbox(GTK_MESSAGE_ERROR, "There are no opened documents. Open one and retry.\n"); + return; + } + GeanyFiletype *ft = doc->file_type; GError *error; - gchar *buffer_shell_command; gchar *f_content; gchar *f_type = g_strdup(ft->name); gchar *f_path = doc->real_path; - gchar *f_name = doc->file_name; + gchar *f_name = doc->file_name; gchar *f_title; gchar *p_url; gchar *formdata = NULL; @@ -104,18 +110,18 @@ static void paste(const gchar * website) gchar **tokens_array; const gchar *langs_supported_codepad[] = { "C", "C++", "D", "Haskell", - "Lua", "OCaml", "PHP", "Perl", "Plain Text", - "Python", "Ruby", "Scheme", "Tcl" + "Lua", "OCaml", "PHP", "Perl", "Plain Text", + "Python", "Ruby", "Scheme", "Tcl" }; const gchar *langs_supported_dpaste[] = { "Bash", "C", "CSS", "Diff", - "Django/Jinja", "HTML", "IRC logs", "JavaScript", "PHP", - "Python console session", "Python Traceback", "Python", - "Python3", "Restructured Text", "SQL", "Text only" + "Django/Jinja", "HTML", "IRC logs", "JavaScript", "PHP", + "Python console session", "Python Traceback", "Python", + "Python3", "Restructured Text", "SQL", "Text only" }; - gint i; gint occ_position; + gint i; guint status; gsize f_lenght; gboolean result; @@ -125,170 +131,168 @@ static void paste(const gchar * website) switch (website_selected) { - case CODEPAD_ORG: - - for (i = 0; i < G_N_ELEMENTS(langs_supported_codepad); i++) { - if (g_strcmp0(f_type, langs_supported_codepad[i]) == 0) - break; - else - f_type = langs_supported_codepad[8]; - } - - if ((result = - g_file_get_contents(f_path, &f_content, &f_lenght, - &error)) == FALSE) { - dialogs_show_msgbox(GTK_MESSAGE_ERROR, - "Unable to the the content of the file"); - g_error_free(error); - } - - msg = soup_message_new("POST", website); - formdata = - soup_form_encode("lang", f_type, "code", f_content, "submit", - "Submit", NULL); - break; - - case PASTEBIN_COM: - - if ((result = - g_file_get_contents(f_path, &f_content, &f_lenght, - &error)) == FALSE) { - dialogs_show_msgbox(GTK_MESSAGE_ERROR, - "Unable to the the content of the file"); - g_error_free(error); - } - - msg = soup_message_new("POST", website); - formdata = - soup_form_encode("paste_code", f_content, "paste_format", - f_type, "paste_name", f_title, NULL); - break; - - - case DPASTE_DE: - - for (i = 0; i < G_N_ELEMENTS(langs_supported_dpaste); i++) { - if (g_strcmp0(f_type, langs_supported_dpaste[i]) == 0) - break; - else - f_type = langs_supported_dpaste[15]; // Text only - } - - if ((result = - g_file_get_contents(f_path, &f_content, &f_lenght, - &error)) == FALSE) { - dialogs_show_msgbox(GTK_MESSAGE_ERROR, - "Unable to the the content of the file"); - g_error_free(error); - } - - msg = soup_message_new("POST", website); - formdata = - soup_form_encode("content", f_content, "title", f_title, - "lexer", f_type, NULL); - - break; - - case SPRUNGE_US: - - if ((result = - g_file_get_contents(f_path, &f_content, &f_lenght, - &error)) == FALSE) { - dialogs_show_msgbox(GTK_MESSAGE_ERROR, - "Unable to the the content of the file"); - g_error_free(error); - } - - msg = soup_message_new("POST", website); - formdata = - soup_form_encode("sprunge", f_content, NULL); - - break; - - case PASTEBIN_GEANY_ORG: - - if ((result = - g_file_get_contents(f_path, &f_content, &f_lenght, - &error)) == FALSE) { - dialogs_show_msgbox(GTK_MESSAGE_ERROR, - "Unable to the the content of the file"); - g_error_free(error); - } - - msg = soup_message_new("POST", website); - formdata = - soup_form_encode("content", f_content, "author", USERNAME, - "title", f_title, "lexer", f_type, NULL); - - break; + case CODEPAD_ORG: + + for (i = 0; i < G_N_ELEMENTS(langs_supported_codepad); i++) { + if (g_strcmp0(f_type, langs_supported_codepad[i]) == 0) + break; + else + f_type = DEFAULT_TYPE_CODEPAD; + } + + result = g_file_get_contents(f_path, &f_content, &f_lenght, &error); + if(result == FALSE) { + dialogs_show_msgbox(GTK_MESSAGE_ERROR, "Unable to the the content of the file"); + g_error_free(error); + return; + } + + msg = soup_message_new("POST", website); + formdata = soup_form_encode("lang", f_type, "code", f_content, + "submit", "Submit", NULL); + + break; + + case PASTEBIN_COM: + + result = g_file_get_contents(f_path, &f_content, &f_lenght, &error); + if(result == FALSE) { + dialogs_show_msgbox(GTK_MESSAGE_ERROR, "Unable to the the content of the file"); + g_error_free(error); + return; + } + + msg = soup_message_new("POST", website); + formdata = soup_form_encode("paste_code", f_content, "paste_format", + f_type, "paste_name", f_title, NULL); + + break; + + + case DPASTE_DE: + + for (i = 0; i < G_N_ELEMENTS(langs_supported_dpaste); i++) { + if (g_strcmp0(f_type, langs_supported_dpaste[i]) == 0) + break; + else + f_type = DEFAULT_TYPE_DPASTE; + } + + result = g_file_get_contents(f_path, &f_content, &f_lenght, &error); + if(result == FALSE) { + dialogs_show_msgbox(GTK_MESSAGE_ERROR, "Unable to the the content of the file"); + g_error_free(error); + return; + } + + msg = soup_message_new("POST", 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); + + break; + + case SPRUNGE_US: + + result = g_file_get_contents(f_path, &f_content, &f_lenght, &error); + if(result == FALSE) { + dialogs_show_msgbox(GTK_MESSAGE_ERROR, "Unable to the the content of the file"); + g_error_free(error); + return; + } + + msg = soup_message_new("POST", website); + formdata = soup_form_encode("sprunge", f_content, NULL); + + break; + + case PASTEBIN_GEANY_ORG: + + result = g_file_get_contents(f_path, &f_content, &f_lenght, &error); + if(result == FALSE) { + dialogs_show_msgbox(GTK_MESSAGE_ERROR, "Unable to the the content of the file"); + g_error_free(error); + return; + } + + msg = soup_message_new("POST", website); + formdata = soup_form_encode("content", f_content, "author", USERNAME, + "title", f_title, "lexer", f_type, NULL); + + break; } soup_message_set_request(msg, "application/x-www-form-urlencoded", - SOUP_MEMORY_COPY, formdata, strlen(formdata)); + SOUP_MEMORY_COPY, formdata, strlen(formdata)); status = soup_session_send_message(session, msg); - - if(status == 200) { - - p_url = msg->response_body->data; - - /* - * codepad.org doesn't return only the url of the new snippet pasted - * but an html page. This minimal parser will get the bare url. - */ - - if (website_selected == CODEPAD_ORG) { - temp_body = g_strdup(p_url); - tokens_array = g_strsplit(temp_body, "<a href=\"", 0); - - /* copy the first 27 chars because the url is composed by 27 characters. - * codepad.org/XXXXXXXX - */ - p_url = g_strndup(tokens_array[5], 27); - - 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); - - } else if(website_selected == SPRUNGE_US) { - - /* in order to enable the syntax highlightning on sprunge.us - * it is necessary to append at the returned url a question - * mark '?' followed by the file type. - * - * e.g. sprunge.us/xxxx?c - */ - p_url[strlen(p_url) - 1] = '\0'; - f_type[0] = g_ascii_tolower(f_type[0]); - temp_body = g_strdup_printf("?%s", f_type); - g_strlcat(p_url + 1, temp_body, -1); - p_url = g_strchomp(p_url); - free(temp_body); - } - - if (check_button_is_checked) { - buffer_shell_command = g_malloc(100 * sizeof(gchar)); - sprintf(buffer_shell_command, "%s %s", OPEN_BROWSER, p_url); - system(buffer_shell_command); - g_free(buffer_shell_command); - } else { - dialogs_show_msgbox(GTK_MESSAGE_INFO, "%s", p_url); - } - - if(website_selected == CODEPAD_ORG || website_selected == DPASTE_DE) { - g_free(p_url); - } + p_url = g_strdup(msg->response_body->data); + g_free(f_content); + + if(status == SOUP_STATUS_OK) { + + /* + * codepad.org doesn't return only the url of the new snippet pasted + * but an html page. This minimal parser will get the bare url. + */ + + if (website_selected == CODEPAD_ORG) { + temp_body = g_strdup(p_url); + tokens_array = g_strsplit(temp_body, "<a href=\"", 0); + + /* cuts the string when it finds the first occurrence of '/' + * It shoud work even if codepad would change its url. + */ + + p_url = g_strdup(tokens_array[5]); + occ_position = indexof(tokens_array[5], '\"'); + + g_free(temp_body); + g_strfreev(tokens_array); + + if(occ_position != -1) { + p_url[occ_position] = '\0'; + } else { + dialogs_show_msgbox(GTK_MESSAGE_ERROR, "Unable to paste the code on codepad.org\n" + "Retry or select another pastebin."); + g_free(p_url); + return; + } + + } else if(website_selected == DPASTE_DE) { + p_url = g_strndup(p_url + 1, strlen(p_url) - 2); + + } else if(website_selected == SPRUNGE_US) { + + /* in order to enable the syntax highlightning on sprunge.us + * it is necessary to append at the returned url a question + * mark '?' followed by the file type. + * + * e.g. sprunge.us/xxxx?c + */ + p_url[strlen(p_url) - 1] = '\0'; + f_type[0] = g_ascii_tolower(f_type[0]); + temp_body = g_strdup_printf("?%s", f_type); + g_strlcat(p_url + 1, temp_body, -1); + p_url = g_strchomp(p_url); + g_free(temp_body); + } + + if (check_button_is_checked) { + utils_open_browser(p_url); + } else { + dialogs_show_msgbox(GTK_MESSAGE_INFO, "%s", p_url); + } } else { - dialogs_show_msgbox(GTK_MESSAGE_INFO, "Unable to paste the code. Check your connection and retry.\n" - "Error code: %d\n", status); + dialogs_show_msgbox(GTK_MESSAGE_ERROR, "Unable to paste the code. Check your connection and retry.\n" + "Error code: %d\n", status); } - g_free(f_content); - + g_free(p_url); } static void item_activate(GtkMenuItem * menuitem, gpointer gdata) @@ -299,14 +303,11 @@ static void item_activate(GtkMenuItem * menuitem, gpointer gdata) static void on_configure_response(GtkDialog * dialog, gint response, gpointer * user_data) { if (response == GTK_RESPONSE_OK || response == GTK_RESPONSE_APPLY) { + website_selected = gtk_combo_box_get_active(GTK_COMBO_BOX(widgets.combo)); - website_selected = - gtk_combo_box_get_active - (GTK_COMBO_BOX(widgets.combo)); - - if (gtk_toggle_button_get_active - (GTK_TOGGLE_BUTTON(widgets.check_button))) - check_button_is_checked = TRUE; + if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widgets.check_button))) { + check_button_is_checked = TRUE; + } } } @@ -322,15 +323,12 @@ GtkWidget *plugin_configure(GtkDialog * dialog) widgets.combo = gtk_combo_box_text_new(); - for (i = 0; i < websites_num; i++) - gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(widgets.combo), - websites[i]); + for (i = 0; i < G_N_ELEMENTS(websites); i++) + gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(widgets.combo), websites[i]); gtk_combo_box_set_active(GTK_COMBO_BOX(widgets.combo), 0); - widgets.check_button = - gtk_check_button_new_with_label - ("show your paste in a new browser tab"); + widgets.check_button = gtk_check_button_new_with_label("show your paste in a new browser tab"); gtk_container_add(GTK_CONTAINER(vbox), label); gtk_container_add(GTK_CONTAINER(vbox), widgets.combo); @@ -338,8 +336,7 @@ GtkWidget *plugin_configure(GtkDialog * dialog) gtk_widget_show_all(vbox); - g_signal_connect(dialog, "response", G_CALLBACK(on_configure_response), - NULL); + g_signal_connect(dialog, "response", G_CALLBACK(on_configure_response), NULL); return vbox; } @@ -351,9 +348,9 @@ static void add_menu_item() paste_item = gtk_menu_item_new_with_mnemonic(_("_Paste it!")); gtk_widget_show(paste_item); gtk_container_add(GTK_CONTAINER(geany->main_widgets->tools_menu), - paste_item); + paste_item); g_signal_connect(paste_item, "activate", G_CALLBACK(item_activate), - NULL); + NULL); main_menu_item = paste_item; } @@ -367,5 +364,4 @@ void plugin_init(GeanyData * data) void plugin_cleanup(void) { gtk_widget_destroy(main_menu_item); - g_free(welcome_text); } @@ 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] 6e1f08: added g_free () before return statement in order to free p_url
by Enrico Trotta 05 May '12

05 May '12

Branch: refs/heads/master Author: Enrico Trotta <enrico.trt(a)gmail.com> Committer: Enrico Trotta <enrico.trt(a)gmail.com> Date: Sat, 05 May 2012 16:23:35 Commit: 6e1f08f676301062577556e3767a21b0ce85d60a https://github.com/geany/geany-plugins/commit/6e1f08f676301062577556e3767a2… Log Message: ----------- added g_free () before return statement in order to free p_url Modified Paths: -------------- geniuspaste/src/geniuspaste.c Modified: geniuspaste/src/geniuspaste.c 5 files changed, 3 insertions(+), 2 deletions(-) =================================================================== @@ -230,7 +230,8 @@ static void paste(const gchar * website) status = soup_session_send_message(session, msg); p_url = g_strdup(msg->response_body->data); - + g_free(f_content); + if(status == SOUP_STATUS_OK) { /* @@ -257,6 +258,7 @@ static void paste(const gchar * website) } else { dialogs_show_msgbox(GTK_MESSAGE_ERROR, "Unable to paste the code on codepad.org\n" "Retry or select another pastebin."); + g_free(p_url); return; } @@ -290,7 +292,6 @@ static void paste(const gchar * website) "Error code: %d\n", status); } - g_free(f_content); g_free(p_url); } @@ 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] ceb0a3: fix for tokens_array[] freed too early
by Enrico Trotta 04 May '12

04 May '12

Branch: refs/heads/master Author: Enrico Trotta <enrico.trt(a)gmail.com> Committer: Enrico Trotta <enrico.trt(a)gmail.com> Date: Fri, 04 May 2012 12:01:18 Commit: ceb0a33f66b544eb162a98e9042589c8f35d10e2 https://github.com/geany/geany-plugins/commit/ceb0a33f66b544eb162a98e904258… Log Message: ----------- fix for tokens_array[] freed too early Modified Paths: -------------- geniuspaste/src/geniuspaste.c Modified: geniuspaste/src/geniuspaste.c 6 files changed, 3 insertions(+), 3 deletions(-) =================================================================== @@ -247,11 +247,11 @@ static void paste(const gchar * website) */ p_url = g_strdup(tokens_array[5]); - + occ_position = indexof(tokens_array[5], '\"'); + g_free(temp_body); g_strfreev(tokens_array); - - occ_position = indexof(tokens_array[5], '\"'); + if(occ_position != -1) { p_url[occ_position] = '\0'; } else { @@ 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] fe2a08: added PLUGIN_SET_TRANSLATABLE_INFO
by Enrico 04 May '12

04 May '12

Branch: refs/heads/master Author: Enrico <enrico.trt(a)gmail.com> Committer: Enrico <enrico.trt(a)gmail.com> Date: Thu, 03 May 2012 20:54:59 Commit: fe2a08276d1359698faaf7e83ff30697ffdd5349 https://github.com/geany/geany-plugins/commit/fe2a08276d1359698faaf7e83ff30… Log Message: ----------- added PLUGIN_SET_TRANSLATABLE_INFO Modified Paths: -------------- geniuspaste/src/geniuspaste.c Modified: geniuspaste/src/geniuspaste.c 7 files changed, 3 insertions(+), 4 deletions(-) =================================================================== @@ -67,10 +67,9 @@ static gboolean check_button_is_checked = FALSE; PLUGIN_VERSION_CHECK(147) -PLUGIN_SET_INFO("GeniusPaste", - "Paste your code on your favorite pastebin", - "0.1", - "Enrico Trotta"); +PLUGIN_SET_TRANSLATABLE_INFO(LOCALEDIR, GETTEXT_PACKAGE, "GeniusPaste", + _("Paste your code on your favorite pastebin"), + "0.1", "Enrico Trotta"); static gint indexof(const gchar * string, gchar c) { @@ Diff output truncated at 100000 characters. @@ -------------- This E-Mail was brought to you by github_commit_mail.py (Source: TBD).

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

Plugins-Commits May 2012