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 /smime | |
| parent | 3cf65fa9b41612c0a126503fae88b85a9f3d8ae0 (diff) | |
| download | gsoc2013-evolution-5ad1bf8506772c6e02da2e48391d0a9e03b80048.tar gsoc2013-evolution-5ad1bf8506772c6e02da2e48391d0a9e03b80048.tar.gz gsoc2013-evolution-5ad1bf8506772c6e02da2e48391d0a9e03b80048.tar.bz2 gsoc2013-evolution-5ad1bf8506772c6e02da2e48391d0a9e03b80048.tar.lz gsoc2013-evolution-5ad1bf8506772c6e02da2e48391d0a9e03b80048.tar.xz 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 'smime')
| -rw-r--r-- | smime/ChangeLog | 8 | ||||
| -rw-r--r-- | smime/gui/certificate-manager.c | 24 |
2 files changed, 8 insertions, 24 deletions
diff --git a/smime/ChangeLog b/smime/ChangeLog index a2d00b9dc8..ea1d86266b 100644 --- a/smime/ChangeLog +++ b/smime/ChangeLog @@ -1,3 +1,11 @@ +2007-09-14 Matthew Barnes <mbarnes@redhat.com> + + ** Fixes part of bug #476231 + + * gui/certificate-manager.c: + Remove non-USE_GTKFILECHOOSER code. + GtkFileChooser has been around since 2004. + 2007-09-10 Srinivasa Ragavan <sragavan@novell.com> ** Fix for bug #471791 diff --git a/smime/gui/certificate-manager.c b/smime/gui/certificate-manager.c index 35cda21044..e417407c42 100644 --- a/smime/gui/certificate-manager.c +++ b/smime/gui/certificate-manager.c @@ -132,7 +132,6 @@ import_your (GtkWidget *widget, CertificateManagerData *cfm) GtkWidget *filesel; const char *filename; -#ifdef USE_GTKFILECHOOSER GtkFileFilter* filter; filesel = gtk_file_chooser_dialog_new (_("Select a certificate to import..."), @@ -152,16 +151,9 @@ import_your (GtkWidget *widget, CertificateManagerData *cfm) gtk_file_filter_set_name (filter, _("All files")); gtk_file_filter_add_pattern (filter, "*"); gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (filesel), filter); -#else - filesel = gtk_file_selection_new (_("Select a certificate to import...")); -#endif if (GTK_RESPONSE_OK == gtk_dialog_run (GTK_DIALOG (filesel))) { -#ifdef USE_GTKFILECHOOSER filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (filesel)); -#else - filename = gtk_file_selection_get_filename (GTK_FILE_SELECTION (filesel)); -#endif if (e_cert_db_import_pkcs12_file (e_cert_db_peek (), filename, NULL /* XXX */)) { @@ -383,7 +375,6 @@ import_contact (GtkWidget *widget, CertificateManagerData *cfm) GtkWidget *filesel; const char *filename; -#ifdef USE_GTKFILECHOOSER GtkFileFilter *filter; filesel = gtk_file_chooser_dialog_new (_("Select a certificate to import..."), @@ -403,16 +394,9 @@ import_contact (GtkWidget *widget, CertificateManagerData *cfm) gtk_file_filter_set_name (filter, _("All files")); gtk_file_filter_add_pattern (filter, "*"); gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (filesel), filter); -#else - filesel = gtk_file_selection_new (_("Select a certificate to import...")); -#endif if (GTK_RESPONSE_OK == gtk_dialog_run (GTK_DIALOG (filesel))) { -#ifdef USE_GTKFILECHOOSER filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (filesel)); -#else - filename = gtk_file_selection_get_filename (GTK_FILE_SELECTION (filesel)); -#endif if (e_cert_db_import_certs_from_file (e_cert_db_peek (), filename, @@ -615,7 +599,6 @@ import_ca (GtkWidget *widget, CertificateManagerData *cfm) GtkWidget *filesel; const char *filename; -#ifdef USE_GTKFILECHOOSER GtkFileFilter *filter; filesel = gtk_file_chooser_dialog_new (_("Select a certificate to import..."), @@ -635,16 +618,9 @@ import_ca (GtkWidget *widget, CertificateManagerData *cfm) gtk_file_filter_set_name (filter, _("All files")); gtk_file_filter_add_pattern (filter, "*"); gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (filesel), filter); -#else - filesel = gtk_file_selection_new (_("Select a certificate to import...")); -#endif if (GTK_RESPONSE_OK == gtk_dialog_run (GTK_DIALOG (filesel))) { -#ifdef USE_GTKFILECHOOSER filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (filesel)); -#else - filename = gtk_file_selection_get_filename (GTK_FILE_SELECTION (filesel)); -#endif if (e_cert_db_import_certs_from_file (e_cert_db_peek (), filename, |