lists.geany.org
Sign In
Sign Up
Sign In
Sign Up
Manage this list
×
Keyboard Shortcuts
Thread View
j
: Next unread message
k
: Previous unread message
j a
: Jump to all threads
j l
: Jump to MailingList overview
2024
May
April
March
February
January
2023
December
November
October
September
August
July
June
May
April
March
February
January
2022
December
November
October
September
August
July
June
May
April
March
February
January
2021
December
November
October
September
August
July
June
May
April
March
February
January
2020
December
November
October
September
August
July
June
May
April
March
February
January
2019
December
November
October
September
August
July
June
May
April
March
February
January
2018
December
November
October
September
August
July
June
May
April
March
February
January
2017
December
November
October
September
August
July
June
May
April
March
February
January
2016
December
November
October
September
August
July
June
May
April
March
February
January
2015
December
November
October
September
August
July
June
May
April
March
February
January
2014
December
November
October
September
August
July
June
May
April
March
February
January
2013
December
November
October
September
August
July
June
May
April
March
February
January
2012
December
November
October
September
August
July
June
May
April
March
February
January
2011
December
November
October
September
August
July
June
May
April
March
February
January
2010
December
November
October
September
August
July
June
May
April
March
February
January
2009
December
November
October
September
August
July
June
May
April
March
February
January
2008
December
November
October
September
August
July
June
May
April
List overview
Plugins-Commits
June 2012
----- 2024 -----
May 2024
April 2024
March 2024
February 2024
January 2024
----- 2023 -----
December 2023
November 2023
October 2023
September 2023
August 2023
July 2023
June 2023
May 2023
April 2023
March 2023
February 2023
January 2023
----- 2022 -----
December 2022
November 2022
October 2022
September 2022
August 2022
July 2022
June 2022
May 2022
April 2022
March 2022
February 2022
January 2022
----- 2021 -----
December 2021
November 2021
October 2021
September 2021
August 2021
July 2021
June 2021
May 2021
April 2021
March 2021
February 2021
January 2021
----- 2020 -----
December 2020
November 2020
October 2020
September 2020
August 2020
July 2020
June 2020
May 2020
April 2020
March 2020
February 2020
January 2020
----- 2019 -----
December 2019
November 2019
October 2019
September 2019
August 2019
July 2019
June 2019
May 2019
April 2019
March 2019
February 2019
January 2019
----- 2018 -----
December 2018
November 2018
October 2018
September 2018
August 2018
July 2018
June 2018
May 2018
April 2018
March 2018
February 2018
January 2018
----- 2017 -----
December 2017
November 2017
October 2017
September 2017
August 2017
July 2017
June 2017
May 2017
April 2017
March 2017
February 2017
January 2017
----- 2016 -----
December 2016
November 2016
October 2016
September 2016
August 2016
July 2016
June 2016
May 2016
April 2016
March 2016
February 2016
January 2016
----- 2015 -----
December 2015
November 2015
October 2015
September 2015
August 2015
July 2015
June 2015
May 2015
April 2015
March 2015
February 2015
January 2015
----- 2014 -----
December 2014
November 2014
October 2014
September 2014
August 2014
July 2014
June 2014
May 2014
April 2014
March 2014
February 2014
January 2014
----- 2013 -----
December 2013
November 2013
October 2013
September 2013
August 2013
July 2013
June 2013
May 2013
April 2013
March 2013
February 2013
January 2013
----- 2012 -----
December 2012
November 2012
October 2012
September 2012
August 2012
July 2012
June 2012
May 2012
April 2012
March 2012
February 2012
January 2012
----- 2011 -----
December 2011
November 2011
October 2011
September 2011
August 2011
July 2011
June 2011
May 2011
April 2011
March 2011
February 2011
January 2011
----- 2010 -----
December 2010
November 2010
October 2010
September 2010
August 2010
July 2010
June 2010
May 2010
April 2010
March 2010
February 2010
January 2010
----- 2009 -----
December 2009
November 2009
October 2009
September 2009
August 2009
July 2009
June 2009
May 2009
April 2009
March 2009
February 2009
January 2009
----- 2008 -----
December 2008
November 2008
October 2008
September 2008
August 2008
July 2008
June 2008
May 2008
April 2008
plugins-commits@lists.geany.org
1 participants
93 discussions
Start a n
N
ew thread
[geany/geany-plugins] 0ca2d5: geniuspaste: fix the author name display in the configuration menu
by Enrico
27 Jun '12
27 Jun '12
Branch: refs/heads/master Author: Enrico <enrico.trt(a)gmail.com> Committer: Frank Lanitz <frank(a)frank.uvena.de> Date: Wed, 27 Jun 2012 08:01:19 Commit: 0ca2d59bb6841f7c81f0a592cf668500f91649a5
https://github.com/geany/geany-plugins/commit/0ca2d59bb6841f7c81f0a592cf668…
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).
1
0
0
0
[geany/geany-plugins] 2cc707: Merge pull request #47 from Enrix835/master
by Frank Lanitz
24 Jun '12
24 Jun '12
Branch: refs/heads/master Author: Frank Lanitz <frank(a)frank.uvena.de> Committer: Frank Lanitz <frank(a)frank.uvena.de> Date: Sun, 24 Jun 2012 19:33:22 Commit: 2cc707aa1a0885d66cbeb0b7f8ca479b59c77017
https://github.com/geany/geany-plugins/commit/2cc707aa1a0885d66cbeb0b7f8ca4…
Log Message: ----------- Merge pull request #47 from Enrix835/master GeniusPaste fixes Modified Paths: -------------- geniuspaste/src/geniuspaste.c Modified: geniuspaste/src/geniuspaste.c 36 files changed, 16 insertions(+), 20 deletions(-) =================================================================== @@ -33,6 +33,10 @@ #include <geanyplugin.h> + +#define PLUGIN_NAME "GeniusPaste" +#define PLUGIN_VERSION "0.2" + #ifdef G_OS_WIN32 #define USERNAME getenv("USERNAME") #else @@ -84,9 +88,9 @@ static gboolean check_button_is_checked = FALSE; PLUGIN_VERSION_CHECK(147) -PLUGIN_SET_TRANSLATABLE_INFO(LOCALEDIR, GETTEXT_PACKAGE, "GeniusPaste", +PLUGIN_SET_TRANSLATABLE_INFO(LOCALEDIR, GETTEXT_PACKAGE, PLUGIN_NAME, _("Paste your code on your favorite pastebin"), - "0.2", "Enrico Trotta"); + PLUGIN_VERSION, "Enrico Trotta"); static gint indexof(const gchar * string, gchar c) { @@ -97,29 +101,15 @@ static gint indexof(const gchar * string, gchar c) 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); + website_selected = utils_get_setting_integer(config, "geniuspaste", "website", 2); + check_button_is_checked = utils_get_setting_boolean(config, "geniuspaste", "open_browser", FALSE); + author_name = utils_get_setting_string(config, "geniuspaste", "author_name", NULL); - 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); } @@ -174,7 +164,7 @@ static gchar *get_paste_text(GeanyDocument *doc, gsize *text_len) static void paste(GeanyDocument * doc, const gchar * website) { - SoupSession *session = soup_session_async_new(); + SoupSession *session; SoupMessage *msg = NULL; gchar *f_content; @@ -182,6 +172,7 @@ static void paste(GeanyDocument * doc, const gchar * website) gchar *f_title; gchar *p_url; gchar *formdata = NULL; + gchar *user_agent = NULL; gchar *temp_body; gchar **tokens_array; @@ -287,6 +278,10 @@ static void paste(GeanyDocument * doc, const gchar * website) } + user_agent = g_strconcat(PLUGIN_NAME, " ", PLUGIN_VERSION, " / Geany ", GEANY_VERSION, NULL); + session = soup_session_async_new_with_options(SOUP_SESSION_USER_AGENT, user_agent, NULL); + g_free(user_agent); + soup_message_set_request(msg, "application/x-www-form-urlencoded", SOUP_MEMORY_COPY, formdata, strlen(formdata)); @@ -376,6 +371,7 @@ static void paste(GeanyDocument * doc, const gchar * website) g_free(f_content); g_free(p_url); + g_object_unref(session); } static void item_activate(GtkMenuItem * menuitem, gpointer gdata) @@ Diff output truncated at 100000 characters. @@ -------------- This E-Mail was brought to you by github_commit_mail.py (Source: TBD).
1
0
0
0
[geany/geany-plugins] afd8e2: geniuspaste: set a user agent for the HTTP request and initialize the SOUP session only when it's needed
by Enrico
24 Jun '12
24 Jun '12
Branch: refs/heads/master Author: Enrico <enrico.trt(a)gmail.com> Committer: Enrico <enrico.trt(a)gmail.com> Date: Sun, 24 Jun 2012 13:10:02 Commit: afd8e2906c38d945c961b2907d857edb7b26b3e6
https://github.com/geany/geany-plugins/commit/afd8e2906c38d945c961b2907d857…
Log Message: ----------- geniuspaste: set a user agent for the HTTP request and initialize the SOUP session only when it's needed Modified Paths: -------------- geniuspaste/src/geniuspaste.c Modified: geniuspaste/src/geniuspaste.c 16 files changed, 13 insertions(+), 3 deletions(-) =================================================================== @@ -33,6 +33,10 @@ #include <geanyplugin.h> + +#define PLUGIN_NAME "GeniusPaste" +#define PLUGIN_VERSION "0.2" + #ifdef G_OS_WIN32 #define USERNAME getenv("USERNAME") #else @@ -84,9 +88,9 @@ static gboolean check_button_is_checked = FALSE; PLUGIN_VERSION_CHECK(147) -PLUGIN_SET_TRANSLATABLE_INFO(LOCALEDIR, GETTEXT_PACKAGE, "GeniusPaste", +PLUGIN_SET_TRANSLATABLE_INFO(LOCALEDIR, GETTEXT_PACKAGE, PLUGIN_NAME, _("Paste your code on your favorite pastebin"), - "0.2", "Enrico Trotta"); + PLUGIN_VERSION, "Enrico Trotta"); static gint indexof(const gchar * string, gchar c) { @@ -160,7 +164,7 @@ static gchar *get_paste_text(GeanyDocument *doc, gsize *text_len) static void paste(GeanyDocument * doc, const gchar * website) { - SoupSession *session = soup_session_async_new(); + SoupSession *session; SoupMessage *msg = NULL; gchar *f_content; @@ -168,6 +172,7 @@ static void paste(GeanyDocument * doc, const gchar * website) gchar *f_title; gchar *p_url; gchar *formdata = NULL; + gchar *user_agent = NULL; gchar *temp_body; gchar **tokens_array; @@ -273,6 +278,10 @@ static void paste(GeanyDocument * doc, const gchar * website) } + user_agent = g_strconcat(PLUGIN_NAME, " ", PLUGIN_VERSION, " / Geany ", GEANY_VERSION, NULL); + session = soup_session_async_new_with_options(SOUP_SESSION_USER_AGENT, user_agent, NULL); + g_free(user_agent); + soup_message_set_request(msg, "application/x-www-form-urlencoded", SOUP_MEMORY_COPY, formdata, strlen(formdata)); @@ -362,6 +371,7 @@ static void paste(GeanyDocument * doc, const gchar * website) g_free(f_content); g_free(p_url); + g_object_unref(session); } static void item_activate(GtkMenuItem * menuitem, gpointer gdata) @@ Diff output truncated at 100000 characters. @@ -------------- This E-Mail was brought to you by github_commit_mail.py (Source: TBD).
1
0
0
0
[geany/geany-plugins] 6cf2e0: geniuspaste: replace g_key_file_get_* with utils_get_setting_*
by Enrico
24 Jun '12
24 Jun '12
Branch: refs/heads/master Author: Enrico <enrico.trt(a)gmail.com> Committer: Enrico <enrico.trt(a)gmail.com> Date: Sun, 24 Jun 2012 13:02:01 Commit: 6cf2e04b865fac2372289fdc5014fab28778a3cc
https://github.com/geany/geany-plugins/commit/6cf2e04b865fac2372289fdc5014f…
Log Message: ----------- geniuspaste: replace g_key_file_get_* with utils_get_setting_* Modified Paths: -------------- geniuspaste/src/geniuspaste.c Modified: geniuspaste/src/geniuspaste.c 20 files changed, 3 insertions(+), 17 deletions(-) =================================================================== @@ -97,29 +97,15 @@ static gint indexof(const gchar * string, gchar c) 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); + website_selected = utils_get_setting_integer(config, "geniuspaste", "website", 2); + check_button_is_checked = utils_get_setting_boolean(config, "geniuspaste", "open_browser", FALSE); + author_name = utils_get_setting_string(config, "geniuspaste", "author_name", NULL); - 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); } @@ Diff output truncated at 100000 characters. @@ -------------- This E-Mail was brought to you by github_commit_mail.py (Source: TBD).
1
0
0
0
[geany/geany-plugins] 89a442: Make path variable usage more consistent with the rest
by Enrico Tröger
24 Jun '12
24 Jun '12
Branch: refs/heads/master Author: Enrico Tröger <enrico.troeger(a)uvena.de> Committer: Enrico Tröger <enrico.troeger(a)uvena.de> Date: Sun, 24 Jun 2012 11:23:23 Commit: 89a442867ec054e93faaabc1c1da3e5e440b1ece
https://github.com/geany/geany-plugins/commit/89a442867ec054e93faaabc1c1da3…
Log Message: ----------- Make path variable usage more consistent with the rest Modified Paths: -------------- debugger/wscript_build Modified: debugger/wscript_build 2 files changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -26,7 +26,7 @@ name = 'Debugger' includes = ['debugger/src'] libraries = ['VTE', 'UTIL'] -pludin_datadir = conf.env['GEANYPLUGINS_DATADIR'] + '/geany-plugins/debugger' +pludin_datadir = '${PKGDATADIR}/debugger' defines=[ 'DBGPLUG_DATA_DIR="' + pludin_datadir + '"'] @@ Diff output truncated at 100000 characters. @@ -------------- This E-Mail was brought to you by github_commit_mail.py (Source: TBD).
1
0
0
0
[geany/geany-plugins] e64a38: Define INCLUDEDIR and DATAROOTDIR as they are used by Vala
by Enrico Tröger
24 Jun '12
24 Jun '12
Branch: refs/heads/master Author: Enrico Tröger <enrico.troeger(a)uvena.de> Committer: Enrico Tröger <enrico.troeger(a)uvena.de> Date: Sun, 24 Jun 2012 11:22:45 Commit: e64a38a4f048925bcfb42680e185ec837d323a85
https://github.com/geany/geany-plugins/commit/e64a38a4f048925bcfb42680e185e…
Log Message: ----------- Define INCLUDEDIR and DATAROOTDIR as they are used by Vala Modified Paths: -------------- wscript Modified: wscript 3 files changed, 3 insertions(+), 0 deletions(-) =================================================================== @@ -176,6 +176,9 @@ def setup_configuration_env(conf): # common pkgdatadir = os.path.join(conf.env['GEANYPLUGINS_DATADIR'], 'geany-plugins') pkglibdir = os.path.join(conf.env['LIBDIR'], 'geany-plugins') + pkgincludedir = os.path.join(conf.env['G_PREFIX'], 'include') + add_to_env_and_define(conf, 'INCLUDEDIR', pkgincludedir, quote=True) + add_to_env_and_define(conf, 'DATAROOTDIR', conf.env['GEANYPLUGINS_DATADIR'], quote=True) add_to_env_and_define(conf, 'PKGDATADIR', pkgdatadir, quote=True) add_to_env_and_define(conf, 'PKGLIBDIR', pkglibdir, quote=True) add_to_env_and_define(conf, 'VERSION', VERSION, quote=True) @@ Diff output truncated at 100000 characters. @@ -------------- This E-Mail was brought to you by github_commit_mail.py (Source: TBD).
1
0
0
0
[geany/geany-plugins] a63d62: Merge branch 'gproject_small_improvements' of https://github.com/frlan/geany-plugins
by Jiří Techet
21 Jun '12
21 Jun '12
Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Thu, 21 Jun 2012 10:59:25 Commit: a63d6246841b385fa92d1b3979da5aba8f33e69f
https://github.com/geany/geany-plugins/commit/a63d6246841b385fa92d1b3979da5…
Log Message: ----------- Merge branch 'gproject_small_improvements' of
https://github.com/frlan/geany-plugins
Modified Paths: -------------- gproject/src/gproject-main.c gproject/src/gproject-project.c gproject/src/gproject-sidebar.c gproject/src/gproject-utils.c Modified: gproject/src/gproject-main.c 12 files changed, 8 insertions(+), 4 deletions(-) =================================================================== @@ -55,7 +55,7 @@ static void on_doc_open(G_GNUC_UNUSED GObject * obj, G_GNUC_UNUSED GeanyDocument { g_return_if_fail(doc != NULL && doc->file_name != NULL); - //tags of open files managed by geany + /* tags of open files managed by geany*/ if (gprj_project_is_in_project(doc->file_name)) gprj_project_remove_file_tag(doc->file_name); @@ -75,9 +75,13 @@ static void on_doc_activate(G_GNUC_UNUSED GObject * obj, G_GNUC_UNUSED GeanyDocu static void on_doc_close(G_GNUC_UNUSED GObject * obj, GeanyDocument * doc, G_GNUC_UNUSED gpointer user_data) { - g_return_if_fail(doc != NULL && doc->file_name != NULL); + g_return_if_fail(doc != NULL); + + if (doc->file_name == NULL) + return; - //tags of open files managed by geany - when the file gets closed, we should take care of it + /* tags of open files managed by geany - when the file gets closed, + * we should take care of it */ if (gprj_project_is_in_project(doc->file_name)) gprj_project_add_file_tag(doc->file_name); @@ -152,7 +156,7 @@ static void on_project_save(G_GNUC_UNUSED GObject * obj, GKeyFile * config, { if (!g_prj) { - //happens when the project is created + /* happens when the project is created */ gprj_project_open(config); gprj_sidebar_update(TRUE); gprj_sidebar_activate(TRUE); Modified: gproject/src/gproject-project.c 2 files changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -144,7 +144,7 @@ static gboolean deferred_op_queue_flush(G_GNUC_UNUSED gpointer data) deferred_op_queue_clean(); flush_queued = FALSE; - return FALSE; // returning false removes this callback; it is a one-shot + return FALSE; /* returning false removes this callback; it is a one-shot */ } Modified: gproject/src/gproject-sidebar.c 16 files changed, 5 insertions(+), 11 deletions(-) =================================================================== @@ -351,7 +351,7 @@ static void on_open_clicked() if (!icon) { - // help string doesn't have icon + /* help string doesn't have icon */ return; } @@ -659,8 +659,6 @@ void gprj_sidebar_find_file_in_active() static gboolean on_button_release(G_GNUC_UNUSED GtkWidget * widget, GdkEventButton * event, G_GNUC_UNUSED gpointer user_data) { -// GeanyDocument *doc; - if (event->button == 3) { GtkTreeSelection *treesel; @@ -679,10 +677,6 @@ static gboolean on_button_release(G_GNUC_UNUSED GtkWidget * widget, GdkEventButt event->button, event->time); } -// doc = document_get_current(); -// if (doc) -// gtk_widget_grab_focus(GTK_WIDGET(doc->editor->sci)); - return FALSE; } @@ -697,7 +691,7 @@ void gprj_sidebar_init() s_file_view_vbox = gtk_vbox_new(FALSE, 0); - // *** toolbar *** + /**** toolbar ****/ toolbar = gtk_toolbar_new(); gtk_toolbar_set_icon_size(GTK_TOOLBAR(toolbar), GTK_ICON_SIZE_MENU); @@ -735,7 +729,7 @@ void gprj_sidebar_init() gtk_box_pack_start(GTK_BOX(s_file_view_vbox), toolbar, FALSE, FALSE, 0); - // *** tree view *** + /**** tree view ****/ s_file_view = gtk_tree_view_new(); @@ -771,7 +765,7 @@ void gprj_sidebar_init() g_signal_connect(G_OBJECT(s_file_view), "key-press-event", G_CALLBACK(on_key_press), NULL); - // *** popup menu *** + /**** popup menu ****/ s_popup_menu.widget = gtk_menu_new(); @@ -815,7 +809,7 @@ void gprj_sidebar_init() G_CALLBACK(keybindings_send_command), GINT_TO_POINTER(GEANY_KEYS_VIEW_SIDEBAR)); - // *** the rest *** + /**** the rest ****/ scrollwin = gtk_scrolled_window_new(NULL, NULL); gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrollwin), Modified: gproject/src/gproject-utils.c 4 files changed, 0 insertions(+), 4 deletions(-) =================================================================== @@ -139,7 +139,6 @@ void open_file(gchar *utf8_name) if (!doc) { -// doc = document_open_file(name, FALSE, NULL, NULL); document_open_file(name, FALSE, NULL, NULL); } else @@ -153,9 +152,6 @@ void open_file(gchar *utf8_name) gtk_notebook_set_current_page(notebook, page_num); } -// if (doc) -// gtk_widget_grab_focus(GTK_WIDGET(doc->editor->sci)); - g_free(name); } @@ Diff output truncated at 100000 characters. @@ -------------- This E-Mail was brought to you by github_commit_mail.py (Source: TBD).
1
0
0
0
[geany/geany-plugins] 6759dc: Merge pull request #46 from b4n/fixes/treebrowser
by Frank Lanitz
21 Jun '12
21 Jun '12
Branch: refs/heads/master Author: Frank Lanitz <frank(a)frank.uvena.de> Committer: Frank Lanitz <frank(a)frank.uvena.de> Date: Thu, 21 Jun 2012 09:22:36 Commit: 6759dc19e66b45b858d828d6844494346da24eb1
https://github.com/geany/geany-plugins/commit/6759dc19e66b45b858d828d684449…
Log Message: ----------- Merge pull request #46 from b4n/fixes/treebrowser Vraious TreeBrowser fixes Modified Paths: -------------- treebrowser/src/treebrowser.c Modified: treebrowser/src/treebrowser.c 59 files changed, 31 insertions(+), 28 deletions(-) =================================================================== @@ -145,13 +145,13 @@ enum static void project_change_cb(G_GNUC_UNUSED GObject *obj, G_GNUC_UNUSED GKeyFile *config, G_GNUC_UNUSED gpointer data); static void treebrowser_browse(gchar *directory, gpointer parent); -static void treebrowser_bookmarks_set_state(); -static void treebrowser_load_bookmarks(); +static void treebrowser_bookmarks_set_state(void); +static void treebrowser_load_bookmarks(void); static void gtk_tree_store_iter_clear_nodes(gpointer iter, gboolean delete_root); -static void treebrowser_rename_current(); -static void on_menu_create_new_object(GtkMenuItem *menuitem, gchar *type); -static void load_settings(); -static gboolean save_settings(); +static void treebrowser_rename_current(void); +static void on_menu_create_new_object(GtkMenuItem *menuitem, const gchar *type); +static void load_settings(void); +static gboolean save_settings(void); /* ------------------ @@ -358,7 +358,7 @@ enum } static gchar* -get_default_dir() +get_default_dir(void) { gchar *dir; GeanyProject *project = geany->app->project; @@ -388,7 +388,7 @@ enum } static gchar * -get_terminal() +get_terminal(void) { gchar *terminal; #ifdef G_OS_WIN32 @@ -571,7 +571,7 @@ enum } static void -treebrowser_bookmarks_set_state() +treebrowser_bookmarks_set_state(void) { if (gtk_tree_store_iter_is_valid(treestore, &bookmarks_iter)) bookmarks_expanded = tree_view_row_expanded_iter(GTK_TREE_VIEW(treeview), &bookmarks_iter); @@ -580,7 +580,7 @@ enum } static void -treebrowser_load_bookmarks() +treebrowser_load_bookmarks(void) { gchar *bookmarks; gchar *contents, *path_full; @@ -640,13 +640,16 @@ enum { if (g_file_test(path_full, G_FILE_TEST_EXISTS | G_FILE_TEST_IS_DIR)) { + gchar *file_name = g_path_get_basename(path_full); + gtk_tree_store_append(treestore, &iter, &bookmarks_iter); icon = CONFIG_SHOW_ICONS ? utils_pixbuf_from_stock(GTK_STOCK_DIRECTORY) : NULL; gtk_tree_store_set(treestore, &iter, TREEBROWSER_COLUMN_ICON, icon, - TREEBROWSER_COLUMN_NAME, g_basename(path_full), + TREEBROWSER_COLUMN_NAME, file_name, TREEBROWSER_COLUMN_URI, path_full, -1); + g_free(file_name); if (icon) g_object_unref(icon); gtk_tree_store_append(treestore, &iter, &iter); @@ -788,7 +791,7 @@ enum { int i = 0; gboolean founded = FALSE, global_founded = FALSE; - gchar *new = ""; + gchar *new = NULL; gchar **root_segments = NULL, **find_segments = NULL; guint root_segments_n = 0, find_segments_n = 0; @@ -801,7 +804,7 @@ enum for (i = 1; i<=find_segments_n; i++) { - new = g_strconcat(new, G_DIR_SEPARATOR_S, find_segments[i], NULL); + new = g_strconcat(new ? new : "", G_DIR_SEPARATOR_S, find_segments[i], NULL); if (founded) { @@ -821,7 +824,7 @@ enum } static gboolean -treebrowser_track_current() +treebrowser_track_current(void) { GeanyDocument *doc = document_get_current(); @@ -891,7 +894,7 @@ enum } static void -treebrowser_rename_current() +treebrowser_rename_current(void) { GtkTreeSelection *selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(treeview)); GtkTreeIter iter; @@ -904,7 +907,7 @@ enum } static void -treebrowser_create_new_current(gchar *type) +treebrowser_create_new_current(const gchar *type) { on_menu_create_new_object(NULL, type); } @@ -993,7 +996,7 @@ enum } static void -on_menu_create_new_object(GtkMenuItem *menuitem, gchar *type) +on_menu_create_new_object(GtkMenuItem *menuitem, const gchar *type) { GtkTreeSelection *selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(treeview)); GtkTreeIter iter; @@ -1307,7 +1310,7 @@ enum * ------------------ */ static void -on_button_go_up() +on_button_go_up(void) { gchar *uri; @@ -1317,13 +1320,13 @@ enum } static void -on_button_refresh() +on_button_refresh(void) { treebrowser_chroot(addressbar_last_address); } static void -on_button_go_home() +on_button_go_home(void) { gchar *uri; @@ -1333,7 +1336,7 @@ enum } static void -on_button_current_path() +on_button_current_path(void) { gchar *uri; @@ -1343,7 +1346,7 @@ enum } static void -on_button_hide_bars() +on_button_hide_bars(void) { showbars(FALSE); } @@ -1565,7 +1568,7 @@ enum } static void -treebrowser_track_current_cb() +treebrowser_track_current_cb(void) { if (CONFIG_FOLLOW_CURRENT_DOC) treebrowser_track_current(); @@ -1585,7 +1588,7 @@ enum } static GtkWidget* -create_view_and_model() +create_view_and_model(void) { GtkWidget *view; @@ -1630,7 +1633,7 @@ enum } static void -create_sidebar() +create_sidebar(void) { GtkWidget *scrollwin; GtkWidget *toolbar; @@ -1747,7 +1750,7 @@ enum } configure_widgets; static void -load_settings() +load_settings(void) { GKeyFile *config = g_key_file_new(); @@ -1770,7 +1773,7 @@ enum } static gboolean -save_settings() +save_settings(void) { GKeyFile *config = g_key_file_new(); gchar *config_dir = g_path_get_dirname(CONFIG_FILE); @@ -2026,7 +2029,7 @@ static void kb_activate(guint key_id) } void -plugin_cleanup() +plugin_cleanup(void) { g_free(addressbar_last_address); g_free(CONFIG_FILE); @@ Diff output truncated at 100000 characters. @@ -------------- This E-Mail was brought to you by github_commit_mail.py (Source: TBD).
1
0
0
0
[geany/geany-plugins] dc6c21: treebrowser: Fix a trivial constant string warning
by Colomban Wendling
20 Jun '12
20 Jun '12
Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Wed, 20 Jun 2012 20:53:55 Commit: dc6c21f7c39b9e2fd7300a708a7aff0fbf6e7821
https://github.com/geany/geany-plugins/commit/dc6c21f7c39b9e2fd7300a708a7af…
Log Message: ----------- treebrowser: Fix a trivial constant string warning Modified Paths: -------------- treebrowser/src/treebrowser.c Modified: treebrowser/src/treebrowser.c 6 files changed, 3 insertions(+), 3 deletions(-) =================================================================== @@ -149,7 +149,7 @@ enum static void treebrowser_load_bookmarks(void); static void gtk_tree_store_iter_clear_nodes(gpointer iter, gboolean delete_root); static void treebrowser_rename_current(void); -static void on_menu_create_new_object(GtkMenuItem *menuitem, gchar *type); +static void on_menu_create_new_object(GtkMenuItem *menuitem, const gchar *type); static void load_settings(void); static gboolean save_settings(void); @@ -907,7 +907,7 @@ enum } static void -treebrowser_create_new_current(gchar *type) +treebrowser_create_new_current(const gchar *type) { on_menu_create_new_object(NULL, type); } @@ -996,7 +996,7 @@ enum } static void -on_menu_create_new_object(GtkMenuItem *menuitem, gchar *type) +on_menu_create_new_object(GtkMenuItem *menuitem, const gchar *type) { GtkTreeSelection *selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(treeview)); GtkTreeIter iter; @@ Diff output truncated at 100000 characters. @@ -------------- This E-Mail was brought to you by github_commit_mail.py (Source: TBD).
1
0
0
0
[geany/geany-plugins] 8877f9: treebrowser: Don't user deprecated functions
by Colomban Wendling
20 Jun '12
20 Jun '12
Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Wed, 20 Jun 2012 20:53:55 Commit: 8877f91f511f5e8fae5fd669cb97b6618be13e2f
https://github.com/geany/geany-plugins/commit/8877f91f511f5e8fae5fd669cb97b…
Log Message: ----------- treebrowser: Don't user deprecated functions Modified Paths: -------------- treebrowser/src/treebrowser.c Modified: treebrowser/src/treebrowser.c 5 files changed, 4 insertions(+), 1 deletions(-) =================================================================== @@ -640,13 +640,16 @@ enum { if (g_file_test(path_full, G_FILE_TEST_EXISTS | G_FILE_TEST_IS_DIR)) { + gchar *file_name = g_path_get_basename(path_full); + gtk_tree_store_append(treestore, &iter, &bookmarks_iter); icon = CONFIG_SHOW_ICONS ? utils_pixbuf_from_stock(GTK_STOCK_DIRECTORY) : NULL; gtk_tree_store_set(treestore, &iter, TREEBROWSER_COLUMN_ICON, icon, - TREEBROWSER_COLUMN_NAME, g_basename(path_full), + TREEBROWSER_COLUMN_NAME, file_name, TREEBROWSER_COLUMN_URI, path_full, -1); + g_free(file_name); if (icon) g_object_unref(icon); gtk_tree_store_append(treestore, &iter, &iter); @@ Diff output truncated at 100000 characters. @@ -------------- This E-Mail was brought to you by github_commit_mail.py (Source: TBD).
1
0
0
0
← Newer
1
2
3
4
5
6
7
8
9
10
Older →
Jump to page:
1
2
3
4
5
6
7
8
9
10
Results per page:
10
25
50
100
200