aboutsummaryrefslogtreecommitdiffstats
path: root/smime
diff options
context:
space:
mode:
Diffstat (limited to 'smime')
-rw-r--r--smime/ChangeLog31
-rw-r--r--smime/gui/certificate-manager.c40
-rw-r--r--smime/gui/e-cert-selector.c21
-rw-r--r--smime/gui/smime-ui.glade247
-rw-r--r--smime/lib/Makefile.am2
-rw-r--r--smime/lib/e-cert-db.c2
6 files changed, 306 insertions, 37 deletions
diff --git a/smime/ChangeLog b/smime/ChangeLog
index 249a44fb14..8310f3dbfb 100644
--- a/smime/ChangeLog
+++ b/smime/ChangeLog
@@ -1,3 +1,34 @@
+2009-04-24 Milan Crha <mcrha@redhat.com>
+
+ ** Fix for bug #572348
+
+ * gui/smime-ui.glade:
+ * gui/e-cert-selector.c:
+ Remove deprecated Gtk+ symbols.
+
+2009-04-07 Milan Crha <mcrha@redhat.com>
+
+ ** Fix for bug #539002
+
+ * gui/certificate-manager.c: (load_certs):
+ Show all other certificates in a contact tab.
+
+2009-04-07 Milan Crha <mcrha@redhat.com>
+
+ ** Fix for bug #529745
+
+ * gui/certificate-manager.c: (import_your), (import_contact):
+ Add more file types in a file filter.
+
+2009-02-25 Milan Crha <mcrha@redhat.com>
+
+ ** Fix for bug #572975
+
+ * gui/smime-ui.glade: Center dialogs.
+ * gui/certificate-manager.c: (import_your), (import_contact),
+ (import_ca): Destroy file chooser dialog early enough to not have
+ hidden any other windows below it.
+
2008-10-10 Sankar P <psankar@novell.com>
License Changes
diff --git a/smime/gui/certificate-manager.c b/smime/gui/certificate-manager.c
index 1f1bbb9f13..eb3a08bf84 100644
--- a/smime/gui/certificate-manager.c
+++ b/smime/gui/certificate-manager.c
@@ -131,7 +131,6 @@ static void
import_your (GtkWidget *widget, CertificateManagerData *cfm)
{
GtkWidget *filesel;
- const char *filename;
GtkFileFilter* filter;
@@ -145,6 +144,7 @@ import_your (GtkWidget *widget, CertificateManagerData *cfm)
filter = gtk_file_filter_new();
gtk_file_filter_set_name (filter, _("All PKCS12 files"));
+ gtk_file_filter_add_mime_type (filter, "application/x-x509-user-cert");
gtk_file_filter_add_mime_type (filter, "application/x-pkcs12");
gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (filesel), filter);
@@ -154,7 +154,10 @@ import_your (GtkWidget *widget, CertificateManagerData *cfm)
gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (filesel), filter);
if (GTK_RESPONSE_OK == gtk_dialog_run (GTK_DIALOG (filesel))) {
- filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (filesel));
+ char *filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (filesel));
+
+ /* destroy dialog to get rid of it in the GUI */
+ gtk_widget_destroy (filesel);
if (e_cert_db_import_pkcs12_file (e_cert_db_peek (),
filename, NULL /* XXX */)) {
@@ -164,9 +167,10 @@ import_your (GtkWidget *widget, CertificateManagerData *cfm)
load_certs (cfm, E_CERT_USER, add_user_cert);
gtk_tree_view_expand_all (GTK_TREE_VIEW (cfm->yourcerts_treeview));
}
- }
- gtk_widget_destroy (filesel);
+ g_free (filename);
+ } else
+ gtk_widget_destroy (filesel);
}
static void
@@ -374,7 +378,6 @@ static void
import_contact (GtkWidget *widget, CertificateManagerData *cfm)
{
GtkWidget *filesel;
- const char *filename;
GtkFileFilter *filter;
@@ -389,6 +392,7 @@ import_contact (GtkWidget *widget, CertificateManagerData *cfm)
filter = gtk_file_filter_new();
gtk_file_filter_set_name (filter, _("All email certificate files"));
gtk_file_filter_add_mime_type (filter, "application/x-x509-email-cert");
+ gtk_file_filter_add_mime_type (filter, "application/x-x509-ca-cert");
gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (filesel), filter);
filter = gtk_file_filter_new ();
@@ -397,7 +401,10 @@ import_contact (GtkWidget *widget, CertificateManagerData *cfm)
gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (filesel), filter);
if (GTK_RESPONSE_OK == gtk_dialog_run (GTK_DIALOG (filesel))) {
- filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (filesel));
+ char *filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (filesel));
+
+ /* destroy dialog to get rid of it in the GUI */
+ gtk_widget_destroy (filesel);
if (e_cert_db_import_certs_from_file (e_cert_db_peek (),
filename,
@@ -410,9 +417,10 @@ import_contact (GtkWidget *widget, CertificateManagerData *cfm)
load_certs (cfm, E_CERT_CONTACT, add_contact_cert);
gtk_tree_view_expand_all (GTK_TREE_VIEW (cfm->contactcerts_treeview));
}
- }
- gtk_widget_destroy (filesel);
+ g_free (filename);
+ } else
+ gtk_widget_destroy (filesel);
}
static void
@@ -598,7 +606,6 @@ static void
import_ca (GtkWidget *widget, CertificateManagerData *cfm)
{
GtkWidget *filesel;
- const char *filename;
GtkFileFilter *filter;
@@ -621,7 +628,10 @@ import_ca (GtkWidget *widget, CertificateManagerData *cfm)
gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (filesel), filter);
if (GTK_RESPONSE_OK == gtk_dialog_run (GTK_DIALOG (filesel))) {
- filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (filesel));
+ char *filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (filesel));
+
+ /* destroy dialog to get rid of it in the GUI */
+ gtk_widget_destroy (filesel);
if (e_cert_db_import_certs_from_file (e_cert_db_peek (),
filename,
@@ -633,9 +643,10 @@ import_ca (GtkWidget *widget, CertificateManagerData *cfm)
unload_certs (cfm, E_CERT_CA);
load_certs (cfm, E_CERT_CA, add_ca_cert);
}
- }
- gtk_widget_destroy (filesel);
+ g_free (filename);
+ } else
+ gtk_widget_destroy (filesel);
}
static void
@@ -953,7 +964,10 @@ load_certs (CertificateManagerData *cfm,
!CERT_LIST_END(node, certList);
node = CERT_LIST_NEXT(node)) {
ECert *cert = e_cert_new ((CERTCertificate*)node->cert);
- if (e_cert_get_cert_type(cert) == type) {
+ ECertType ct = e_cert_get_cert_type (cert);
+
+ /* show everything else in a contact tab */
+ if (ct == type || (type == E_CERT_CONTACT && ct != E_CERT_CA && ct != E_CERT_USER)) {
add_cert (cfm, cert);
}
}
diff --git a/smime/gui/e-cert-selector.c b/smime/gui/e-cert-selector.c
index dacf33198f..770f95c1cd 100644
--- a/smime/gui/e-cert-selector.c
+++ b/smime/gui/e-cert-selector.c
@@ -41,7 +41,7 @@
struct _ECertSelectorPrivate {
CERTCertList *certlist;
- GtkWidget *menu, *description;
+ GtkWidget *combobox, *description;
};
enum {
@@ -73,7 +73,7 @@ ecs_find_current(ECertSelector *ecs)
if (p->certlist == NULL || CERT_LIST_EMPTY(p->certlist))
return NULL;
- n = gtk_option_menu_get_history((GtkOptionMenu *)p->menu);
+ n = gtk_combo_box_get_active (GTK_COMBO_BOX (p->combobox));
node = CERT_LIST_HEAD(p->certlist);
while (n>0 && !CERT_LIST_END(node, p->certlist)) {
n--;
@@ -149,7 +149,7 @@ e_cert_selector_new(int type, const char *currentid)
CERTCertList *certlist;
CERTCertListNode *node;
GladeXML *gui;
- GtkWidget *w, *menu;
+ GtkWidget *w;
int n=0, active=0;
char *gladefile;
@@ -162,7 +162,7 @@ e_cert_selector_new(int type, const char *currentid)
gui = glade_xml_new(gladefile, "cert_selector_vbox", NULL);
g_free (gladefile);
- p->menu = glade_xml_get_widget(gui, "cert_menu");
+ p->combobox = glade_xml_get_widget(gui, "cert_combobox");
p->description = glade_xml_get_widget(gui, "cert_description");
w = glade_xml_get_widget(gui, "cert_selector_vbox");
@@ -179,7 +179,7 @@ e_cert_selector_new(int type, const char *currentid)
break;
}
- menu = gtk_menu_new();
+ gtk_list_store_clear (GTK_LIST_STORE (gtk_combo_box_get_model (GTK_COMBO_BOX (p->combobox))));
certlist = CERT_FindUserCertsByUsage(CERT_GetDefaultCertDB(), usage, FALSE, TRUE, NULL);
ecs->priv->certlist = certlist;
@@ -187,9 +187,7 @@ e_cert_selector_new(int type, const char *currentid)
node = CERT_LIST_HEAD(certlist);
while (!CERT_LIST_END(node, certlist)) {
if (node->cert->nickname || node->cert->emailAddr) {
- w = gtk_menu_item_new_with_label(node->cert->nickname?node->cert->nickname:node->cert->emailAddr);
- gtk_menu_shell_append((GtkMenuShell *)menu, w);
- gtk_widget_show(w);
+ gtk_combo_box_append_text (GTK_COMBO_BOX (p->combobox), node->cert->nickname?node->cert->nickname:node->cert->emailAddr);
if (currentid != NULL
&& ((node->cert->nickname != NULL && strcmp(node->cert->nickname, currentid) == 0)
@@ -203,14 +201,13 @@ e_cert_selector_new(int type, const char *currentid)
}
}
- gtk_option_menu_set_menu((GtkOptionMenu *)p->menu, menu);
- gtk_option_menu_set_history((GtkOptionMenu *)p->menu, active);
+ gtk_combo_box_set_active (GTK_COMBO_BOX (p->combobox), active);
- g_signal_connect(p->menu, "changed", G_CALLBACK(ecs_cert_changed), ecs);
+ g_signal_connect (p->combobox, "changed", G_CALLBACK(ecs_cert_changed), ecs);
g_object_unref(gui);
- ecs_cert_changed(p->menu, ecs);
+ ecs_cert_changed(p->combobox, ecs);
return GTK_WIDGET(ecs);
}
diff --git a/smime/gui/smime-ui.glade b/smime/gui/smime-ui.glade
index 2ea8fe3b8d..686cc38d02 100644
--- a/smime/gui/smime-ui.glade
+++ b/smime/gui/smime-ui.glade
@@ -4,9 +4,9 @@
<glade-interface>
<widget class="GtkDialog" id="certificate-viewer-dialog">
- <property name="title" translatable="no">dialog1</property>
+ <property name="title">dialog1</property>
<property name="type">GTK_WINDOW_TOPLEVEL</property>
- <property name="window_position">GTK_WIN_POS_NONE</property>
+ <property name="window_position">GTK_WIN_POS_CENTER</property>
<property name="modal">False</property>
<property name="resizable">True</property>
<property name="destroy_with_parent">False</property>
@@ -15,6 +15,8 @@
<property name="skip_pager_hint">False</property>
<property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
<property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
+ <property name="focus_on_map">True</property>
+ <property name="urgency_hint">False</property>
<property name="has_separator">False</property>
<child internal-child="vbox">
@@ -94,6 +96,10 @@
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="padding">0</property>
@@ -115,6 +121,10 @@
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="padding">0</property>
@@ -136,6 +146,10 @@
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="padding">0</property>
@@ -157,6 +171,10 @@
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="padding">0</property>
@@ -180,6 +198,10 @@
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="type">label_item</property>
@@ -227,6 +249,10 @@
<property name="yalign">1</property>
<property name="xpad">0</property>
<property name="ypad">3</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="left_attach">0</property>
@@ -251,6 +277,10 @@
<property name="yalign">0.5</property>
<property name="xpad">6</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="left_attach">0</property>
@@ -275,6 +305,10 @@
<property name="yalign">0.5</property>
<property name="xpad">6</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="left_attach">0</property>
@@ -299,6 +333,10 @@
<property name="yalign">0.5</property>
<property name="xpad">6</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="left_attach">0</property>
@@ -323,6 +361,10 @@
<property name="yalign">0.5</property>
<property name="xpad">6</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="left_attach">0</property>
@@ -347,6 +389,10 @@
<property name="yalign">0.5</property>
<property name="xpad">6</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="left_attach">0</property>
@@ -371,6 +417,10 @@
<property name="yalign">0.5</property>
<property name="xpad">6</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="left_attach">0</property>
@@ -395,6 +445,10 @@
<property name="yalign">0.5</property>
<property name="xpad">6</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="left_attach">0</property>
@@ -419,6 +473,10 @@
<property name="yalign">0.5</property>
<property name="xpad">6</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="left_attach">0</property>
@@ -443,6 +501,10 @@
<property name="yalign">0.5</property>
<property name="xpad">6</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="left_attach">0</property>
@@ -467,6 +529,10 @@
<property name="yalign">1</property>
<property name="xpad">0</property>
<property name="ypad">3</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="left_attach">0</property>
@@ -491,6 +557,10 @@
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">3</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="left_attach">0</property>
@@ -515,6 +585,10 @@
<property name="yalign">0.5</property>
<property name="xpad">6</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="left_attach">0</property>
@@ -539,6 +613,10 @@
<property name="yalign">0.5</property>
<property name="xpad">6</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="left_attach">0</property>
@@ -564,6 +642,10 @@
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="left_attach">1</property>
@@ -589,6 +671,10 @@
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="left_attach">1</property>
@@ -614,6 +700,10 @@
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="left_attach">1</property>
@@ -639,6 +729,10 @@
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="left_attach">1</property>
@@ -664,6 +758,10 @@
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="left_attach">1</property>
@@ -689,6 +787,10 @@
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="left_attach">1</property>
@@ -714,6 +816,10 @@
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="left_attach">1</property>
@@ -739,6 +845,10 @@
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="left_attach">1</property>
@@ -764,6 +874,10 @@
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="left_attach">1</property>
@@ -789,6 +903,10 @@
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="left_attach">1</property>
@@ -814,6 +932,10 @@
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="left_attach">1</property>
@@ -838,6 +960,10 @@
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">3</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="left_attach">0</property>
@@ -875,6 +1001,10 @@
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="type">tab</property>
@@ -913,6 +1043,9 @@
<property name="rules_hint">False</property>
<property name="reorderable">False</property>
<property name="enable_search">True</property>
+ <property name="fixed_height_mode">False</property>
+ <property name="hover_selection">False</property>
+ <property name="hover_expand">False</property>
</widget>
</child>
</widget>
@@ -931,6 +1064,10 @@
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="type">label_item</property>
@@ -969,6 +1106,9 @@
<property name="rules_hint">False</property>
<property name="reorderable">False</property>
<property name="enable_search">True</property>
+ <property name="fixed_height_mode">False</property>
+ <property name="hover_selection">False</property>
+ <property name="hover_expand">False</property>
</widget>
</child>
</widget>
@@ -987,6 +1127,10 @@
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="type">label_item</property>
@@ -1052,6 +1196,10 @@
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="type">label_item</property>
@@ -1084,6 +1232,10 @@
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="type">tab</property>
@@ -1101,7 +1253,7 @@
</widget>
<widget class="GtkWindow" id="cert-manager-config-control">
- <property name="title" translatable="no">window1</property>
+ <property name="title">window1</property>
<property name="type">GTK_WINDOW_TOPLEVEL</property>
<property name="window_position">GTK_WIN_POS_NONE</property>
<property name="modal">False</property>
@@ -1112,6 +1264,8 @@
<property name="skip_pager_hint">False</property>
<property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
<property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
+ <property name="focus_on_map">True</property>
+ <property name="urgency_hint">False</property>
<child>
<widget class="GtkNotebook" id="cert-manager-notebook">
@@ -1143,6 +1297,10 @@
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="padding">0</property>
@@ -1174,6 +1332,9 @@
<property name="rules_hint">False</property>
<property name="reorderable">False</property>
<property name="enable_search">True</property>
+ <property name="fixed_height_mode">False</property>
+ <property name="hover_selection">False</property>
+ <property name="hover_expand">False</property>
<accessibility>
<atkproperty name="AtkObject::accessible_name" translatable="yes">Certificates Table</atkproperty>
</accessibility>
@@ -1263,6 +1424,10 @@
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="padding">0</property>
@@ -1333,6 +1498,10 @@
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="padding">0</property>
@@ -1405,6 +1574,10 @@
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="type">tab</property>
@@ -1431,6 +1604,10 @@
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="padding">0</property>
@@ -1462,6 +1639,9 @@
<property name="rules_hint">False</property>
<property name="reorderable">False</property>
<property name="enable_search">True</property>
+ <property name="fixed_height_mode">False</property>
+ <property name="hover_selection">False</property>
+ <property name="hover_expand">False</property>
<accessibility>
<atkproperty name="AtkObject::accessible_name" translatable="yes">Certificates Table</atkproperty>
</accessibility>
@@ -1551,6 +1731,10 @@
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="padding">0</property>
@@ -1623,6 +1807,10 @@
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="type">tab</property>
@@ -1649,6 +1837,10 @@
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="padding">0</property>
@@ -1680,6 +1872,9 @@
<property name="rules_hint">False</property>
<property name="reorderable">False</property>
<property name="enable_search">True</property>
+ <property name="fixed_height_mode">False</property>
+ <property name="hover_selection">False</property>
+ <property name="hover_expand">False</property>
</widget>
</child>
</widget>
@@ -1766,6 +1961,10 @@
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="padding">0</property>
@@ -1838,6 +2037,10 @@
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="type">tab</property>
@@ -1850,7 +2053,7 @@
<widget class="GtkDialog" id="ca-trust-dialog">
<property name="title" translatable="yes">Certificate Authority Trust</property>
<property name="type">GTK_WINDOW_TOPLEVEL</property>
- <property name="window_position">GTK_WIN_POS_NONE</property>
+ <property name="window_position">GTK_WIN_POS_CENTER</property>
<property name="modal">False</property>
<property name="resizable">True</property>
<property name="destroy_with_parent">False</property>
@@ -1859,6 +2062,8 @@
<property name="skip_pager_hint">False</property>
<property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
<property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
+ <property name="focus_on_map">True</property>
+ <property name="urgency_hint">False</property>
<property name="has_separator">False</property>
<child internal-child="vbox">
@@ -1939,6 +2144,10 @@
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="padding">0</property>
@@ -2017,6 +2226,10 @@
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="padding">0</property>
@@ -2047,6 +2260,8 @@
<property name="skip_pager_hint">False</property>
<property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
<property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
+ <property name="focus_on_map">True</property>
+ <property name="urgency_hint">False</property>
<child>
<widget class="GtkVBox" id="cert_selector_vbox">
@@ -2074,6 +2289,10 @@
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="padding">0</property>
@@ -2083,10 +2302,12 @@
</child>
<child>
- <widget class="GtkOptionMenu" id="cert_menu">
+ <widget class="GtkComboBox" id="cert_combobox">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="history">-1</property>
+ <property name="items" translatable="yes">a
+b</property>
+ <property name="add_tearoffs">False</property>
+ <property name="focus_on_click">True</property>
</widget>
<packing>
<property name="padding">0</property>
@@ -2154,6 +2375,10 @@
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="type">label_item</property>
@@ -2173,7 +2398,7 @@
<widget class="GtkDialog" id="cert-trust-dialog">
<property name="title" translatable="yes">Email Certificate Trust Settings</property>
<property name="type">GTK_WINDOW_TOPLEVEL</property>
- <property name="window_position">GTK_WIN_POS_NONE</property>
+ <property name="window_position">GTK_WIN_POS_CENTER</property>
<property name="modal">False</property>
<property name="resizable">True</property>
<property name="destroy_with_parent">False</property>
@@ -2182,6 +2407,8 @@
<property name="skip_pager_hint">False</property>
<property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
<property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
+ <property name="focus_on_map">True</property>
+ <property name="urgency_hint">False</property>
<property name="has_separator">False</property>
<child internal-child="vbox">
@@ -2249,6 +2476,10 @@
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="padding">0</property>
diff --git a/smime/lib/Makefile.am b/smime/lib/Makefile.am
index 2b9e74d3bf..52ad228baa 100644
--- a/smime/lib/Makefile.am
+++ b/smime/lib/Makefile.am
@@ -32,5 +32,3 @@ libessmime_la_LIBADD = \
$(CERT_UI_LIBS)
libessmime_la_LDFLAGS = $(NO_UNDEFINED)
-
-CLEANFILES = $(BUILT_SOURCES)
diff --git a/smime/lib/e-cert-db.c b/smime/lib/e-cert-db.c
index b9703ebe29..73bfc72131 100644
--- a/smime/lib/e-cert-db.c
+++ b/smime/lib/e-cert-db.c
@@ -48,8 +48,6 @@
#include <glib/gi18n.h>
#include <glib/gstdio.h>
-/* XXX toshok why oh *why* god WHY did they do this? no fucking
- sense */
/* private NSS defines used by PSM */
/* (must be declated before cert.h) */
#define CERT_NewTempCertificate __CERT_NewTempCertificate
generated by cgit (git 2.34.1) at 2025-01-14 00:37:46 +0800