rpm/seahorse
SHA256
1
0
Fork 0
forked from pool/seahorse
Code Pull Requests Activity

Accepting request 155879 from home:Golbats_Everywhere:branches:GNOME:Factory

Browse Source 
Remove a couple "help buttons to nowhere"

A couple of patches for this are competing for upstream approval at bgo#659834 - this one (a minimal, downstream solution) is very similar to one I submitted there.

OBS-URL: https://build.opensuse.org/request/show/155879
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/seahorse?expand=0&rev=140
This commit is contained in:
Dominique Leuenberger 2013-02-20 08:32:50 +00:00 committed by Git OBS Bridge
parent 0aaad934ce
commit 39a6a53ab2
3 changed files with 95 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

87
seahorse-remove-bad-help-buttons.patch Normal file
View File

@ -0,0 +1,87 @@
From 97dab1647bdc2f50d642eb0278bc3399b4beb7ac Mon Sep 17 00:00:00 2001
From: Michael Catanzaro <mike.catanzaro@gmail.com>
Date: Tue, 19 Feb 2013 22:27:28 -0600
Subject: [PATCH] Remove gkr-keyring, gkr-item-properties help
There is no article associated with these buttons, and there's not
really any need for Help on these pages anyway. (bnc#804181)
Various other patches including a varient of this one have been proposed
upstream at bgo#659834; none have been accepted as of yet
---
gkr/seahorse-gkr-item-properties.xml | 17 -----------------
gkr/seahorse-gkr-keyring.xml | 17 -----------------
2 files changed, 34 deletions(-)
diff --git a/gkr/seahorse-gkr-item-properties.xml b/gkr/seahorse-gkr-item-properties.xml
index 7e38ecb..7a66e23 100644
--- a/gkr/seahorse-gkr-item-properties.xml
+++ b/gkr/seahorse-gkr-item-properties.xml
@@ -360,22 +360,6 @@
<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>
@@ -401,7 +385,6 @@
</object>
</child>
<action-widgets>
- <action-widget response="-11">helpbutton1</action-widget>
<action-widget response="-7">closebutton1</action-widget>
</action-widgets>
</object>
diff --git a/gkr/seahorse-gkr-keyring.xml b/gkr/seahorse-gkr-keyring.xml
index e9a6c03..3474e53 100644
--- a/gkr/seahorse-gkr-keyring.xml
+++ b/gkr/seahorse-gkr-keyring.xml
@@ -145,22 +145,6 @@
<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>
@@ -186,7 +170,6 @@
</object>
</child>
<action-widgets>
- <action-widget response="-11">helpbutton1</action-widget>
<action-widget response="-7">closebutton1</action-widget>
</action-widgets>
</object>
--
1.8.1.1

5
seahorse.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Wed Feb 20 04:34:14 UTC 2013 - mike.catanzaro@gmail.com
- Add seahorse-remove-bad-help-buttons.patch (bnc#804181)
-------------------------------------------------------------------
Tue Nov 13 10:30:36 UTC 2012 - dimstar@opensuse.org

3
seahorse.spec
View File

@ -24,6 +24,8 @@ License: GPL-2.0+
Group: Productivity/Security
Url: http://projects.gnome.org/seahorse/
Source: http://download.gnome.org/sources/seahorse/3.6/%{name}-%{version}.tar.xz
# PATCH-FIX-OPENSUSE bnc#804181 bgo#659834 mike.catanzaro@gmail.com -- Remove help buttons that point to nowhere, submitted but not yet reviewed upstream
Patch0: seahorse-remove-bad-help-buttons.patch
BuildRequires: fdupes
BuildRequires: gpg2
BuildRequires: gpgme-devel
@ -55,6 +57,7 @@ Seahorse is a GNOME interface for gnupg. It uses gpgme as the backend.
%prep
%setup -q
translation-update-upstream
%patch0 -p1
%build
%configure \