Branch: refs/heads/master Author: Enrico enrico.trt@gmail.com Committer: Frank Lanitz frank@frank.uvena.de Date: Wed, 27 Jun 2012 08:01:19 Commit: 0ca2d59bb6841f7c81f0a592cf668500f91649a5 https://github.com/geany/geany-plugins/commit/0ca2d59bb6841f7c81f0a592cf6685...
Log Message: ----------- geniuspaste: fix the author name display in the configuration menu In the configuration menu the name of the author was not displayed because the string author_name was freed too soon
Modified Paths: -------------- geniuspaste/TODO geniuspaste/src/geniuspaste.c
Modified: geniuspaste/TODO 4 files changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -1,6 +1,6 @@ TODO ----
- [!] Implement saving/loading of the settings - [-] Make the geany's pastebin the default pastebin + - recent pastes history + - URL shortening
Modified: geniuspaste/src/geniuspaste.c 18 files changed, 9 insertions(+), 9 deletions(-) =================================================================== @@ -67,7 +67,7 @@
static const gchar *websites[] = { - "http://codepad.org", + "http://codepad.org/", "http://pastebin.com/api_public.php", "http://pastebin.geany.org/api/", "http://dpaste.de/api/", @@ -106,9 +106,9 @@ static void load_settings(void) "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", 2); + 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", NULL); + author_name = utils_get_setting_string(config, "geniuspaste", "author_name", USERNAME);
g_key_file_free(config); } @@ -401,7 +401,6 @@ static void on_configure_response(GtkDialog * dialog, gint response, gpointer * 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); } } } @@ -433,11 +432,11 @@ GtkWidget *plugin_configure(GtkDialog * dialog)
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_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 0); + gtk_box_pack_start(GTK_BOX(vbox), widgets.combo, FALSE, FALSE, 0); + gtk_box_pack_start(GTK_BOX(vbox), author_label, FALSE, FALSE, 0); + gtk_box_pack_start(GTK_BOX(vbox), widgets.author_entry, FALSE, FALSE, 0); + gtk_box_pack_start(GTK_BOX(vbox), widgets.check_button, FALSE, FALSE, 0);
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); @@ -473,5 +472,6 @@ void plugin_init(GeanyData * data)
void plugin_cleanup(void) { + g_free(author_name); gtk_widget_destroy(main_menu_item); }
@@ Diff output truncated at 100000 characters. @@
-------------- This E-Mail was brought to you by github_commit_mail.py (Source: TBD).