[seahorse] pgp: remove non-working Help button.
- From: Niels De Graef <nielsdg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [seahorse] pgp: remove non-working Help button.
- Date: Sun, 5 Aug 2018 14:24:15 +0000 (UTC)
commit 5f51372b64a1dfc324f6a3870056d9b116414296
Author: Niels De Graef <nielsdegraef gmail com>
Date: Sun Aug 5 16:20:07 2018 +0200
pgp: remove non-working Help button.
Remove the redundant Close button as well, since we already have one.
First part of a fix for #164
pgp/seahorse-pgp-key-properties.c | 25 ++-------------
pgp/seahorse-pgp-private-key-properties.ui | 50 ++----------------------------
pgp/seahorse-pgp-public-key-properties.ui | 48 ----------------------------
3 files changed, 4 insertions(+), 119 deletions(-)
---
diff --git a/pgp/seahorse-pgp-key-properties.c b/pgp/seahorse-pgp-key-properties.c
index 7817624e..c5cd66d1 100644
--- a/pgp/seahorse-pgp-key-properties.c
+++ b/pgp/seahorse-pgp-key-properties.c
@@ -51,10 +51,6 @@
#define NOTEBOOK "notebook"
/* Forward declarations */
-static void properties_response (GtkDialog *dialog,
- int response,
- SeahorseWidget *swidget);
-
void on_pgp_trust_sign (GtkWidget *widget,
gpointer user_data);
@@ -1884,22 +1880,10 @@ key_notify (SeahorseObject *object, SeahorseWidget *swidget)
do_details (swidget);
}
-static void
-properties_response (GtkDialog *dialog, int response, SeahorseWidget *swidget)
-{
- if (response == GTK_RESPONSE_HELP) {
- seahorse_widget_show_help(swidget);
- return;
- }
-
- seahorse_widget_destroy (swidget);
-}
-
static SeahorseWidget*
setup_public_properties (SeahorsePgpKey *pkey, GtkWindow *parent)
{
SeahorseWidget *swidget;
- GtkWidget *widget;
swidget = seahorse_object_widget_new ("pgp-public-key-properties", parent, G_OBJECT (pkey));
@@ -1921,10 +1905,8 @@ setup_public_properties (SeahorsePgpKey *pkey, GtkWindow *parent)
do_details_signals (swidget);
do_trust (swidget);
- do_trust_signals (swidget);
+ do_trust_signals (swidget);
- widget = seahorse_widget_get_toplevel(swidget);
- g_signal_connect (widget, "response", G_CALLBACK (properties_response), swidget);
seahorse_bind_objects (NULL, pkey, (SeahorseTransfer)key_notify, swidget);
return swidget;
@@ -1934,7 +1916,6 @@ static SeahorseWidget*
setup_private_properties (SeahorsePgpKey *pkey, GtkWindow *parent)
{
SeahorseWidget *swidget;
- GtkWidget *widget;
swidget = seahorse_object_widget_new ("pgp-private-key-properties", parent, G_OBJECT (pkey));
@@ -1958,10 +1939,8 @@ setup_private_properties (SeahorsePgpKey *pkey, GtkWindow *parent)
do_details (swidget);
do_details_signals (swidget);
- widget = GTK_WIDGET (seahorse_widget_get_widget (swidget, swidget->name));
- g_signal_connect (widget, "response", G_CALLBACK (properties_response), swidget);
seahorse_bind_objects (NULL, pkey, (SeahorseTransfer)key_notify, swidget);
-
+
return swidget;
}
diff --git a/pgp/seahorse-pgp-private-key-properties.ui b/pgp/seahorse-pgp-private-key-properties.ui
index 18eaf517..884da768 100644
--- a/pgp/seahorse-pgp-private-key-properties.ui
+++ b/pgp/seahorse-pgp-private-key-properties.ui
@@ -39,7 +39,6 @@
<object class="GtkNotebook" id="notebook">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="border_width">5</property>
<child>
<object class="GtkVBox" id="vbox7">
<property name="visible">True</property>
@@ -1728,57 +1727,12 @@
</child>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
- <child internal-child="action_area">
- <object class="GtkHButtonBox" id="dialog-action_area1">
- <property name="visible">True</property>
- <property name="layout_style">end</property>
- <child>
- <object class="GtkButton" id="helpbutton1">
- <property name="label">gtk-help</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="can_default">True</property>
- <property name="receives_default">False</property>
- <property name="use_stock">True</property>
- <signal name="clicked" handler="on_widget_help"/>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkButton" id="closebutton1">
- <property name="label">gtk-close</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="can_default">True</property>
- <property name="receives_default">False</property>
- <property name="use_stock">True</property>
- <signal name="clicked" handler="on_widget_closed"/>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="pack_type">end</property>
- <property name="position">0</property>
- </packing>
- </child>
</object>
</child>
- <action-widgets>
- <action-widget response="-11">helpbutton1</action-widget>
- <action-widget response="-7">closebutton1</action-widget>
- </action-widgets>
</object>
</interface>
diff --git a/pgp/seahorse-pgp-public-key-properties.ui b/pgp/seahorse-pgp-public-key-properties.ui
index a990df88..8e8121f6 100644
--- a/pgp/seahorse-pgp-public-key-properties.ui
+++ b/pgp/seahorse-pgp-public-key-properties.ui
@@ -36,54 +36,10 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="spacing">2</property>
- <child internal-child="action_area">
- <object class="GtkButtonBox" id="dialog-action_area1">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="layout_style">end</property>
- <child>
- <object class="GtkButton" id="helpbutton1">
- <property name="label">gtk-help</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="can_default">True</property>
- <property name="receives_default">False</property>
- <property name="use_stock">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkButton" id="closebutton1">
- <property name="label">gtk-close</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="can_default">True</property>
- <property name="receives_default">False</property>
- <property name="use_stock">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="pack_type">end</property>
- <property name="position">0</property>
- </packing>
- </child>
<child>
<object class="GtkNotebook" id="notebook">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="border_width">5</property>
<child>
<object class="GtkVBox" id="vbox7">
<property name="visible">True</property>
@@ -1624,9 +1580,5 @@ B4C3 4349 0932 7854 3452</property>
</child>
</object>
</child>
- <action-widgets>
- <action-widget response="-11">helpbutton1</action-widget>
- <action-widget response="-7">closebutton1</action-widget>
- </action-widgets>
</object>
</interface>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]