HybridDog/geany
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Avoid a few unnecessary widget lookups

Browse Source
This commit is contained in:
Colomban Wendling 2014-01-09 17:50:30 +01:00
parent 680a556fff
commit 17a7469b68
2 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/search.c
View File

@ -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 @@ on_find_entry_activate_backward(GtkEntry *entry, gpointer user_data)
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);
}

10
src/ui_utils.c
View File

@ -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 */