[gtk+/gtk-2-24] filechooserentry: Don't override activate
- From: Federico Mena Quintero <federico src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+/gtk-2-24] filechooserentry: Don't override activate
- Date: Thu, 10 Mar 2016 21:30:29 +0000 (UTC)
commit 6ae5aa74291e85a8806553aa1b4a38e54b87dadd
Author: Benjamin Otte <otte redhat com>
Date: Mon Nov 7 02:53:05 2011 +0100
filechooserentry: Don't override activate
The code is no longer necessary, because the relevant parts for inline
completion are now handled by GtkEntry.
gtk/gtkfilechooserentry.c | 20 --------------------
1 files changed, 0 insertions(+), 20 deletions(-)
---
diff --git a/gtk/gtkfilechooserentry.c b/gtk/gtkfilechooserentry.c
index c60f1c4..49110eb 100644
--- a/gtk/gtkfilechooserentry.c
+++ b/gtk/gtkfilechooserentry.c
@@ -100,7 +100,6 @@ static gboolean gtk_file_chooser_entry_key_press_event (GtkWidget *widget,
GdkEventKey *event);
static gboolean gtk_file_chooser_entry_focus_out_event (GtkWidget *widget,
GdkEventFocus *event);
-static void gtk_file_chooser_entry_activate (GtkEntry *entry);
#ifdef G_OS_WIN32
static gint insert_text_callback (GtkFileChooserEntry *widget,
@@ -174,7 +173,6 @@ _gtk_file_chooser_entry_class_init (GtkFileChooserEntryClass *class)
{
GObjectClass *gobject_class = G_OBJECT_CLASS (class);
GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (class);
- GtkEntryClass *entry_class = GTK_ENTRY_CLASS (class);
gobject_class->finalize = gtk_file_chooser_entry_finalize;
gobject_class->dispose = gtk_file_chooser_entry_dispose;
@@ -183,8 +181,6 @@ _gtk_file_chooser_entry_class_init (GtkFileChooserEntryClass *class)
widget_class->grab_focus = gtk_file_chooser_entry_grab_focus;
widget_class->key_press_event = gtk_file_chooser_entry_key_press_event;
widget_class->focus_out_event = gtk_file_chooser_entry_focus_out_event;
-
- entry_class->activate = gtk_file_chooser_entry_activate;
}
static void
@@ -793,22 +789,6 @@ gtk_file_chooser_entry_focus_out_event (GtkWidget *widget,
}
static void
-commit_completion_and_refresh (GtkFileChooserEntry *chooser_entry)
-{
- /* Here we ignore the result of refresh_current_folder_and_file_part(); there is nothing we can do with it
*/
- refresh_current_folder_and_file_part (chooser_entry, gtk_entry_get_text (GTK_ENTRY (chooser_entry)));
-}
-
-static void
-gtk_file_chooser_entry_activate (GtkEntry *entry)
-{
- GtkFileChooserEntry *chooser_entry = GTK_FILE_CHOOSER_ENTRY (entry);
-
- commit_completion_and_refresh (chooser_entry);
- GTK_ENTRY_CLASS (_gtk_file_chooser_entry_parent_class)->activate (entry);
-}
-
-static void
discard_completion_store (GtkFileChooserEntry *chooser_entry)
{
if (!chooser_entry->completion_store)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]