diff options
author | Matthew Barnes <mbarnes@src.gnome.org> | 2007-09-14 23:29:05 +0800 |
---|---|---|
committer | Matthew Barnes <mbarnes@src.gnome.org> | 2007-09-14 23:29:05 +0800 |
commit | 5ad1bf8506772c6e02da2e48391d0a9e03b80048 (patch) | |
tree | d1842e355beb2431b16c587a5add7434ef24179b /filter | |
parent | 3cf65fa9b41612c0a126503fae88b85a9f3d8ae0 (diff) | |
download | gsoc2013-evolution-5ad1bf8506772c6e02da2e48391d0a9e03b80048.tar.gz gsoc2013-evolution-5ad1bf8506772c6e02da2e48391d0a9e03b80048.tar.zst gsoc2013-evolution-5ad1bf8506772c6e02da2e48391d0a9e03b80048.zip |
Remove the --enable-file-chooser configure option.
GtkFileChooser has been around since 2004.
svn path=/trunk/; revision=34257
Diffstat (limited to 'filter')
-rw-r--r-- | filter/ChangeLog | 8 | ||||
-rw-r--r-- | filter/filter-file.c | 18 |
2 files changed, 8 insertions, 18 deletions
diff --git a/filter/ChangeLog b/filter/ChangeLog index ccbe4b0e11..7801937c0c 100644 --- a/filter/ChangeLog +++ b/filter/ChangeLog @@ -1,3 +1,11 @@ +2007-09-14 Matthew Barnes <mbarnes@redhat.com> + + ** Fixes part of bug #476231 + + * filter-file.c: + Remove non-USE_GTKFILECHOOSER code. + GtkFileChooser has been around since 2004. + 2007-09-12 Milan Crha <mcrha@redhat.com> ** Fix for bug #473514 diff --git a/filter/filter-file.c b/filter/filter-file.c index 1c7a76a180..ec4c736479 100644 --- a/filter/filter-file.c +++ b/filter/filter-file.c @@ -274,11 +274,7 @@ filename_changed (GtkWidget *widget, FilterElement *fe) FilterFile *file = (FilterFile *) fe; const char *new; -#ifdef USE_GTKFILECHOOSER new = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (widget)); -#else - new = gtk_entry_get_text (GTK_ENTRY (widget)); -#endif g_free (file->path); file->path = g_strdup (new); } @@ -288,26 +284,12 @@ get_widget (FilterElement *fe) { FilterFile *file = (FilterFile *) fe; GtkWidget *filewidget; -#ifndef USE_GTKFILECHOOSER GtkWidget *entry; -#endif -#ifdef USE_GTKFILECHOOSER filewidget = (GtkWidget *) gtk_file_chooser_button_new (_("Choose a file"), GTK_FILE_CHOOSER_ACTION_OPEN); gtk_file_chooser_set_filename (GTK_FILE_CHOOSER (filewidget), file->path); g_signal_connect (GTK_FILE_CHOOSER_BUTTON (filewidget), "selection-changed", G_CALLBACK (filename_changed), fe); -#else - filewidget = gnome_file_entry_new (NULL, _("Choose a file")); - g_object_set (G_OBJECT (filewidget), "use_filechooser", TRUE, NULL); - gnome_file_entry_set_default_path (GNOME_FILE_ENTRY (filewidget), file->path); - gnome_file_entry_set_modal (GNOME_FILE_ENTRY (filewidget), TRUE); - - entry = gnome_file_entry_gtk_entry (GNOME_FILE_ENTRY (filewidget)); - gtk_entry_set_text (GTK_ENTRY (entry), file->path); - - g_signal_connect (entry, "changed", G_CALLBACK (filename_changed), fe); -#endif return filewidget; } |