Commit e31065dc authored by Stefan Walter's avatar Stefan Walter

Fix regression with expire date dialog. Patch from Jim Pharis. Bug #325239

    * src/seahorse-key-properties.c:
    * src/seahorse-pgp-private-key-properties.c: Fix regression with
    expire date dialog. Patch from Jim Pharis. Bug #325239
parent f352f6d7
2006-04-06 Adam Schreiber <sadam@clemson.edu>
2006-04-06 Nate Nielsen <nielsen@memberwebs.com>
* src/seahorse-key-properties.c:
* src/seahorse-pgp-private-key-properties.c: Fix regression with
expire date dialog. Patch from Jim Pharis. Bug #325239
2006-04-06 Nate Nielsen <nielsen@memberwebs.com>
* src/seahorse.desktop.in: Move launcher to Accessories
......
......@@ -779,16 +779,6 @@ details_revoke_subkey_button_clicked (GtkButton *button, SeahorseWidget *swidget
seahorse_revoke_new (SEAHORSE_PGP_KEY (skey), get_selected_subkey (swidget));
}
static void
details_date_subkey_button_clicked (GtkWidget *widget, SeahorseWidget *swidget)
{
SeahorseKey *skey;
skey = SEAHORSE_KEY_WIDGET (swidget)->skey;
if (seahorse_key_get_etype (skey) == SKEY_PRIVATE)
seahorse_expires_new (SEAHORSE_PGP_KEY (skey), get_selected_subkey (swidget));
}
static void
trust_changed (GtkComboBox *selection, SeahorseWidget *swidget)
{
......@@ -838,6 +828,11 @@ details_export_button_clicked (GtkWidget *widget, SeahorseWidget *swidget)
g_list_free (keys);
}
/*
* This function is called by 2 different buttons. There may not
* be a selected subkey which will cause an index of -1
*/
static void
details_calendar_button_clicked (GtkWidget *widget, SeahorseWidget *swidget)
{
......@@ -880,14 +875,14 @@ do_details_signals (SeahorseWidget *swidget)
glade_xml_signal_connect_data (swidget->xml, "on_details_add_button_clicked",
G_CALLBACK (details_add_subkey_button_clicked), swidget);
glade_xml_signal_connect_data (swidget->xml, "on_details_date_button_clicked",
G_CALLBACK (details_date_subkey_button_clicked), swidget);
glade_xml_signal_connect_data (swidget->xml, "on_details_calendar1_button_clicked",
G_CALLBACK (details_calendar_button_clicked), swidget);
glade_xml_signal_connect_data (swidget->xml, "on_details_calendar2_button_clicked",
G_CALLBACK (details_calendar_button_clicked), swidget);
glade_xml_signal_connect_data (swidget->xml, "on_details_revoke_button_clicked",
G_CALLBACK (details_revoke_subkey_button_clicked), swidget);
glade_xml_signal_connect_data (swidget->xml, "on_details_delete_button_clicked",
G_CALLBACK (details_del_subkey_button_clicked), swidget);
glade_xml_signal_connect_data (swidget->xml, "on_details_calendar_button_clicked",
G_CALLBACK (details_calendar_button_clicked), swidget);
glade_xml_signal_connect_data (swidget->xml, "on_details_export_button_clicked",
G_CALLBACK (details_export_button_clicked), swidget);
}
......
......@@ -2027,11 +2027,12 @@
</child>
<child>
<widget class="GtkButton" id="button11">
<widget class="GtkButton" id="details_expires_button">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
<signal name="clicked" handler="on_details_calendar1_button_clicked" last_modification_time="Wed, 05 Apr 2006 18:26:36 GMT"/>
<child>
<widget class="GtkImage" id="image49">
......@@ -2484,7 +2485,7 @@ Ultimate</property>
<property name="can_focus">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
<signal name="clicked" handler="on_details_date_button_clicked" last_modification_time="Mon, 19 Sep 2005 17:52:34 GMT"/>
<signal name="clicked" handler="on_details_calendar2_button_clicked" last_modification_time="Wed, 05 Apr 2006 18:26:57 GMT"/>
<child>
<widget class="GtkAlignment" id="alignment18">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment