Branch: refs/heads/master Author: Colomban Wendling ban@herbesfolles.org Committer: Colomban Wendling ban@herbesfolles.org Date: Thu, 09 Jan 2014 16:50:30 UTC Commit: 17a7469b6870461766c9872791f743156e038760 https://github.com/geany/geany/commit/17a7469b6870461766c9872791f743156e0387...
Log Message: ----------- Avoid a few unnecessary widget lookups
Modified Paths: -------------- src/search.c src/ui_utils.c
Modified: src/search.c 13 files changed, 5 insertions(+), 8 deletions(-) =================================================================== @@ -476,13 +476,12 @@ static void create_find_dialog(void) gtk_label_set_mnemonic_widget(GTK_LABEL(label), entry); gtk_entry_set_width_chars(GTK_ENTRY(gtk_bin_get_child(GTK_BIN(entry))), 50); find_dlg.entry = gtk_bin_get_child(GTK_BIN(entry)); - ui_hookup_widget(find_dlg.dialog, entry, "entry");
g_signal_connect(gtk_bin_get_child(GTK_BIN(entry)), "activate", - G_CALLBACK(on_find_entry_activate), NULL); + G_CALLBACK(on_find_entry_activate), entry); ui_entry_add_activate_backward_signal(GTK_ENTRY(gtk_bin_get_child(GTK_BIN(entry)))); g_signal_connect(gtk_bin_get_child(GTK_BIN(entry)), "activate-backward", - G_CALLBACK(on_find_entry_activate_backward), NULL); + G_CALLBACK(on_find_entry_activate_backward), entry); g_signal_connect(find_dlg.dialog, "response", G_CALLBACK(on_find_dialog_response), entry); g_signal_connect(find_dlg.dialog, "delete-event", @@ -656,7 +655,7 @@ static void create_replace_dialog(void) g_signal_connect(gtk_bin_get_child(GTK_BIN(entry_replace)), "activate", G_CALLBACK(on_replace_entry_activate), NULL); g_signal_connect(replace_dlg.dialog, "response", - G_CALLBACK(on_replace_dialog_response), entry_replace); + G_CALLBACK(on_replace_dialog_response), NULL); g_signal_connect(replace_dlg.dialog, "delete-event", G_CALLBACK(gtk_widget_hide_on_delete), NULL);
@@ -1258,8 +1257,7 @@ gint search_mark_all(GeanyDocument *doc, const gchar *search_text, gint flags) static void on_find_entry_activate(GtkEntry *entry, gpointer user_data) { - on_find_dialog_response(NULL, GEANY_RESPONSE_FIND, - ui_lookup_widget(GTK_WIDGET(entry), "entry")); + on_find_dialog_response(NULL, GEANY_RESPONSE_FIND, user_data); }
@@ -1270,8 +1268,7 @@ gint search_mark_all(GeanyDocument *doc, const gchar *search_text, gint flags) if (search_data.flags & SCFIND_REGEXP) utils_beep(); else - on_find_dialog_response(NULL, GEANY_RESPONSE_FIND_PREVIOUS, - ui_lookup_widget(GTK_WIDGET(entry), "entry")); + on_find_dialog_response(NULL, GEANY_RESPONSE_FIND_PREVIOUS, user_data); }
Modified: src/ui_utils.c 10 files changed, 4 insertions(+), 6 deletions(-) =================================================================== @@ -1679,8 +1679,7 @@ void ui_setup_open_button_callback(GtkWidget *open_btn, const gchar *title, g_object_set_data_full(G_OBJECT(open_btn), "title", g_strdup(title), (GDestroyNotify) g_free); g_object_set_data(G_OBJECT(open_btn), "action", GINT_TO_POINTER(action)); - ui_hookup_widget(open_btn, path_entry, "entry"); - g_signal_connect(open_btn, "clicked", G_CALLBACK(ui_path_box_open_clicked), open_btn); + g_signal_connect(open_btn, "clicked", G_CALLBACK(ui_path_box_open_clicked), path_entry); }
@@ -1725,10 +1724,9 @@ static gchar *run_file_chooser(const gchar *title, GtkFileChooserAction action,
static void ui_path_box_open_clicked(GtkButton *button, gpointer user_data) { - GtkWidget *path_box = GTK_WIDGET(user_data); - GtkFileChooserAction action = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(path_box), "action")); - GtkEntry *entry = g_object_get_data(G_OBJECT(path_box), "entry"); - const gchar *title = g_object_get_data(G_OBJECT(path_box), "title"); + GtkFileChooserAction action = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(button), "action")); + GtkEntry *entry = user_data; + const gchar *title = g_object_get_data(G_OBJECT(button), "title"); gchar *utf8_path = NULL;
/* TODO: extend for other actions */
-------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).