Branch: refs/heads/master Author: zhekov dimitar.zhekov@gmail.com Committer: zhekov dimitar.zhekov@gmail.com Date: Wed, 22 Oct 2014 17:07:03 UTC Commit: 88021932f3cf4dfc0fecb5107b60281791b21881 https://github.com/geany/geany-plugins/commit/88021932f3cf4dfc0fecb5107b6028...

Log Message: ----------- Merge pull request #171 from b4n/scope/fixes

scope: Don't depend on Geany private prototypes

Modified Paths: -------------- scope/src/plugme.c scope/src/plugme.h

Modified: scope/src/plugme.c 8 lines changed, 2 insertions(+), 6 deletions(-) =================================================================== @@ -27,7 +27,6 @@ extern GeanyFunctions *geany_functions; /* This file must not depend on Scope */ #include "plugme.h"

-#ifndef ui_setup_open_button_callback static gchar *run_file_chooser(const gchar *title, GtkFileChooserAction action, const gchar *utf8_path) { @@ -101,7 +100,7 @@ static void ui_path_box_open_clicked(G_GNUC_UNUSED GtkButton *button, gpointer u /* Setup a GtkButton to run a GtkFileChooser, setting entry text if successful. * title can be NULL. * action is the file chooser mode to use. */ -void ui_setup_open_button_callback(GtkWidget *open_btn, const gchar *title, +void plugme_ui_setup_open_button_callback(GtkWidget *open_btn, const gchar *title, GtkFileChooserAction action, GtkEntry *entry) { GtkWidget *path_entry = GTK_WIDGET(entry); @@ -113,11 +112,9 @@ void ui_setup_open_button_callback(GtkWidget *open_btn, const gchar *title, ui_hookup_widget(open_btn, path_entry, "entry"); g_signal_connect(open_btn, "clicked", G_CALLBACK(ui_path_box_open_clicked), open_btn); } -#endif /* ui_setup_open_button_callback */

-#ifndef editor_get_default_selection /* Note: this is NOT the Geany function, only similar */ -gchar *editor_get_default_selection(GeanyEditor *editor, gboolean use_current_word, +gchar *plugme_editor_get_default_selection(GeanyEditor *editor, gboolean use_current_word, const gchar *wordchars) { ScintillaObject *sci = editor->sci; @@ -138,7 +135,6 @@ gchar *editor_get_default_selection(GeanyEditor *editor, gboolean use_current_wo

return text; } -#endif /* editor_get_default_selection */

static void on_config_file_clicked(G_GNUC_UNUSED GtkWidget *widget, gpointer user_data) {

Modified: scope/src/plugme.h 12 lines changed, 12 insertions(+), 0 deletions(-) =================================================================== @@ -19,6 +19,18 @@

#ifndef PLUGME_H

+#ifndef ui_setup_open_button_callback +void plugme_ui_setup_open_button_callback(GtkWidget *open_btn, const gchar *title, + GtkFileChooserAction action, GtkEntry *entry); +#define ui_setup_open_button_callback plugme_ui_setup_open_button_callback +#endif /* ui_setup_open_button_callback */ + +#ifndef editor_get_default_selection +gchar *plugme_editor_get_default_selection(GeanyEditor *editor, gboolean use_current_word, + const gchar *wordchars); +#define editor_get_default_selection plugme_editor_get_default_selection +#endif /* editor_get_default_selection */ + #ifndef ui_add_config_file_menu_item GtkWidget *plugme_ui_add_config_file_menu_item(const gchar *real_path, const gchar *label, GtkContainer *parent);

-------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).