diff options
| author | Benjamin Otte <otte@redhat.com> | 2011-11-07 02:53:05 +0100 |
|---|---|---|
| committer | Benjamin Otte <otte@redhat.com> | 2011-12-16 20:09:13 +0100 |
| commit | ad1672c194bdefb7969cb81662222f87926dc09e (patch) | |
| tree | 9aa21f3d9f0d98ad363c9f3dc8df698cc5a9476b /gtk/gtkfilechooserentry.c | |
| parent | 6e7b2de21e5a0251bdda82bb76d899d64e333143 (diff) | |
| download | gtk+-ad1672c194bdefb7969cb81662222f87926dc09e.tar.gz | |
filechooserentry: Don't override activate
The code is no longer necessary, because the relevant parts for inline
completion are now handled by GtkEntry.
Diffstat (limited to 'gtk/gtkfilechooserentry.c')
| -rw-r--r-- | gtk/gtkfilechooserentry.c | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/gtk/gtkfilechooserentry.c b/gtk/gtkfilechooserentry.c index d365927c0d..91089982f0 100644 --- a/gtk/gtkfilechooserentry.c +++ b/gtk/gtkfilechooserentry.c @@ -97,7 +97,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, @@ -171,7 +170,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; @@ -180,8 +178,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 @@ -790,22 +786,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) |