rpms/seahorse/devel seahorse-button-images.patch, NONE, 1.1 seahorse.spec, 1.78, 1.79

Matthias Clasen mclasen at fedoraproject.org
Thu Aug 27 01:57:08 UTC 2009


Author: mclasen

Update of /cvs/pkgs/rpms/seahorse/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17257

Modified Files:
	seahorse.spec 
Added Files:
	seahorse-button-images.patch 
Log Message:
Respect button-images setting


seahorse-button-images.patch:
 pgp/seahorse-pgp-generate.xml       |   44 +----------
 src/seahorse-generate-select.xml    |   67 +-----------------
 src/seahorse-keyserver-search.xml   |   44 +----------
 src/seahorse-keyserver-sync.xml     |  134 +++---------------------------------
 ssh/seahorse-ssh-generate.xml       |   69 ++----------------
 ssh/seahorse-ssh-key-properties.xml |   88 +++--------------------
 ssh/seahorse-ssh-upload.xml         |   67 +-----------------
 7 files changed, 64 insertions(+), 449 deletions(-)

--- NEW FILE seahorse-button-images.patch ---
diff -up seahorse-2.27.90/pgp/seahorse-pgp-generate.xml.button-images seahorse-2.27.90/pgp/seahorse-pgp-generate.xml
--- seahorse-2.27.90/pgp/seahorse-pgp-generate.xml.button-images	2009-08-26 21:39:37.422275977 -0400
+++ seahorse-2.27.90/pgp/seahorse-pgp-generate.xml	2009-08-26 21:40:45.744025040 -0400
@@ -2,6 +2,10 @@
 <interface>
   <requires lib="gtk+" version="2.16"/>
   <!-- interface-naming-policy toplevel-contextual -->
+  <object class="GtkImage" id="create-image">
+    <property name="stock">gtk-ok</property>
+    <property name="icon-size">4</property>
+  </object>
   <object class="GtkAdjustment" id="adjustment1">
     <property name="value">2048</property>
     <property name="lower">512</property>
@@ -390,43 +394,9 @@
                 <property name="has_default">True</property>
                 <property name="receives_default">False</property>
                 <property name="tooltip_text" translatable="yes">Generate a new key</property>
-                <child>
-                  <object class="GtkAlignment" id="alignment1">
-                    <property name="visible">True</property>
-                    <property name="xscale">0</property>
-                    <property name="yscale">0</property>
-                    <child>
-                      <object class="GtkHBox" id="hbox1">
-                        <property name="visible">True</property>
-                        <property name="spacing">2</property>
-                        <child>
-                          <object class="GtkImage" id="image1">
-                            <property name="visible">True</property>
-                            <property name="stock">gtk-ok</property>
-                            <property name="icon-size">4</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">False</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkLabel" id="label44">
-                            <property name="visible">True</property>
-                            <property name="label" translatable="yes">C_reate</property>
-                            <property name="use_underline">True</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">False</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                      </object>
-                    </child>
-                  </object>
-                </child>
+                <property name="image">create-image</property>
+                <property name="label" translatable="yes">C_reate</property>
+                <property name="use_underline">True</property>
               </object>
               <packing>
                 <property name="expand">False</property>
diff -up seahorse-2.27.90/src/seahorse-generate-select.xml.button-images seahorse-2.27.90/src/seahorse-generate-select.xml
--- seahorse-2.27.90/src/seahorse-generate-select.xml.button-images	2009-08-26 21:36:47.399038000 -0400
+++ seahorse-2.27.90/src/seahorse-generate-select.xml	2009-08-26 21:38:14.801034610 -0400
@@ -1,6 +1,10 @@
 <?xml version="1.0"?>
 <!--*- mode: xml -*-->
 <interface>
+  <object class="GtkImage" id="continue-image">
+    <property name="stock">gtk-go-forward</property>
+    <property name="icon_size">4</property>
+  </object>
   <object class="GtkDialog" id="generate-select">
     <property name="border_width">6</property>
     <property name="visible">True</property>
@@ -47,66 +51,9 @@
                 <property name="can_focus">True</property>
                 <property name="relief">GTK_RELIEF_NORMAL</property>
                 <property name="focus_on_click">True</property>
-                <child>
-                  <object class="GtkAlignment" id="alignment2">
-                    <property name="visible">True</property>
-                    <property name="xalign">0.5</property>
-                    <property name="yalign">0.5</property>
-                    <property name="xscale">0</property>
-                    <property name="yscale">0</property>
-                    <property name="top_padding">0</property>
-                    <property name="bottom_padding">0</property>
-                    <property name="left_padding">0</property>
-                    <property name="right_padding">0</property>
-                    <child>
-                      <object class="GtkHBox" id="hbox2">
-                        <property name="visible">True</property>
-                        <property name="homogeneous">False</property>
-                        <property name="spacing">2</property>
-                        <child>
-                          <object class="GtkImage" id="image2">
-                            <property name="visible">True</property>
-                            <property name="stock">gtk-go-forward</property>
-                            <property name="icon_size">4</property>
-                            <property name="xalign">0.5</property>
-                            <property name="yalign">0.5</property>
-                            <property name="xpad">0</property>
-                            <property name="ypad">0</property>
-                          </object>
-                          <packing>
-                            <property name="padding">0</property>
-                            <property name="expand">False</property>
-                            <property name="fill">False</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkLabel" id="label3">
-                            <property name="visible">True</property>
-                            <property name="label" translatable="yes">C_ontinue</property>
-                            <property name="use_underline">True</property>
-                            <property name="use_markup">False</property>
-                            <property name="justify">GTK_JUSTIFY_LEFT</property>
-                            <property name="wrap">False</property>
-                            <property name="selectable">False</property>
-                            <property name="xalign">0.5</property>
-                            <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>
-                          </object>
-                          <packing>
-                            <property name="padding">0</property>
-                            <property name="expand">False</property>
-                            <property name="fill">False</property>
-                          </packing>
-                        </child>
-                      </object>
-                    </child>
-                  </object>
-                </child>
+                <property name="image">continue-image</property>
+                <property name="label" translatable="yes">C_ontinue</property>
+                <property name="use_underline">True</property>
               </object>
             </child>
           </object>
diff -up seahorse-2.27.90/src/seahorse-keyserver-search.xml.button-images seahorse-2.27.90/src/seahorse-keyserver-search.xml
--- seahorse-2.27.90/src/seahorse-keyserver-search.xml.button-images	2009-08-26 21:25:59.739022563 -0400
+++ seahorse-2.27.90/src/seahorse-keyserver-search.xml	2009-08-26 21:27:26.426024597 -0400
@@ -2,6 +2,10 @@
 <interface>
   <requires lib="gtk+" version="2.16"/>
   <!-- interface-naming-policy toplevel-contextual -->
+  <object class="GtkImage" id="search-image">
+    <property name="stock">gtk-find</property>
+    <property name="icon-size">4</property>
+  </object>
   <object class="GtkDialog" id="keyserver-search">
     <property name="visible">True</property>
     <property name="border_width">5</property>
@@ -211,44 +215,10 @@
                 <property name="can_default">True</property>
                 <property name="has_default">True</property>
                 <property name="receives_default">False</property>
+                <property name="image">search-image</property>
+                <property name="label" translatable="yes">_Search</property>
+                <property name="use_underline">True</property>
                 <signal name="clicked" handler="on_keyserver_search_ok_clicked"/>
-                <child>
-                  <object class="GtkAlignment" id="alignment4">
-                    <property name="visible">True</property>
-                    <property name="xscale">0</property>
-                    <property name="yscale">0</property>
-                    <child>
-                      <object class="GtkHBox" id="hbox7">
-                        <property name="visible">True</property>
-                        <property name="spacing">2</property>
-                        <child>
-                          <object class="GtkImage" id="image5">
-                            <property name="visible">True</property>
-                            <property name="stock">gtk-find</property>
-                            <property name="icon-size">4</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">False</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkLabel" id="label14">
-                            <property name="visible">True</property>
-                            <property name="label" translatable="yes">_Search</property>
-                            <property name="use_underline">True</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">False</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                      </object>
-                    </child>
-                  </object>
-                </child>
               </object>
               <packing>
                 <property name="expand">False</property>
diff -up seahorse-2.27.90/src/seahorse-keyserver-sync.xml.button-images seahorse-2.27.90/src/seahorse-keyserver-sync.xml
--- seahorse-2.27.90/src/seahorse-keyserver-sync.xml.button-images	2009-08-26 21:28:57.566027136 -0400
+++ seahorse-2.27.90/src/seahorse-keyserver-sync.xml	2009-08-26 21:31:55.773285847 -0400
@@ -1,6 +1,14 @@
 <?xml version="1.0"?>
 <!--*- mode: xml -*-->
 <interface>
+  <object class="GtkImage" id="configure-image">
+    <property name="stock">gtk-properties</property>
+    <property name="icon_size">4</property>
+  </object>
+  <object class="GtkImage" id="sync-image">
+    <property name="stock">gtk-refresh</property>
+    <property name="icon_size">4</property>
+  </object>
   <object class="GtkDialog" id="keyserver-sync">
     <property name="border_width">5</property>
     <property name="visible">True</property>
@@ -34,67 +42,10 @@
                 <property name="can_focus">True</property>
                 <property name="relief">GTK_RELIEF_NORMAL</property>
                 <property name="focus_on_click">True</property>
+                <property name="image">configure-image</property>
+                <property name="label" translatable="yes">_Key Servers</property>
+                <property name="use_underline">True</property>
                 <signal handler="on_sync_configure_clicked" last_modification_time="Sun, 03 Apr 2005 22:45:26 GMT" name="clicked"/>
-                <child>
-                  <object class="GtkAlignment" id="alignment3">
-                    <property name="visible">True</property>
-                    <property name="xalign">0.5</property>
-                    <property name="yalign">0.5</property>
-                    <property name="xscale">0</property>
-                    <property name="yscale">0</property>
-                    <property name="top_padding">0</property>
-                    <property name="bottom_padding">0</property>
-                    <property name="left_padding">0</property>
-                    <property name="right_padding">0</property>
-                    <child>
-                      <object class="GtkHBox" id="hbox5">
-                        <property name="visible">True</property>
-                        <property name="homogeneous">False</property>
-                        <property name="spacing">2</property>
-                        <child>
-                          <object class="GtkImage" id="image4">
-                            <property name="visible">True</property>
-                            <property name="stock">gtk-properties</property>
-                            <property name="icon_size">4</property>
-                            <property name="xalign">0.5</property>
-                            <property name="yalign">0.5</property>
-                            <property name="xpad">0</property>
-                            <property name="ypad">0</property>
-                          </object>
-                          <packing>
-                            <property name="padding">0</property>
-                            <property name="expand">False</property>
-                            <property name="fill">False</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkLabel" id="label12">
-                            <property name="visible">True</property>
-                            <property name="label" translatable="yes">_Key Servers</property>
-                            <property name="use_underline">True</property>
-                            <property name="use_markup">False</property>
-                            <property name="justify">GTK_JUSTIFY_LEFT</property>
-                            <property name="wrap">False</property>
-                            <property name="selectable">False</property>
-                            <property name="xalign">0.5</property>
-                            <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>
-                          </object>
-                          <packing>
-                            <property name="padding">0</property>
-                            <property name="expand">False</property>
-                            <property name="fill">False</property>
-                          </packing>
-                        </child>
-                      </object>
-                    </child>
-                  </object>
-                </child>
               </object>
             </child>
             <child>
@@ -118,67 +69,10 @@
                 <property name="has_focus">True</property>
                 <property name="relief">GTK_RELIEF_NORMAL</property>
                 <property name="focus_on_click">True</property>
+                <property name="image">sync-image</property>
+                <property name="label" translatable="yes">_Sync</property>
+                <property name="use_underline">True</property>
                 <signal handler="on_sync_ok_clicked" last_modification_time="Wed, 31 Dec 2003 00:41:45 GMT" name="clicked"/>
-                <child>
-                  <object class="GtkAlignment" id="alignment4">
-                    <property name="visible">True</property>
-                    <property name="xalign">0.5</property>
-                    <property name="yalign">0.5</property>
-                    <property name="xscale">0</property>
-                    <property name="yscale">0</property>
-                    <property name="top_padding">0</property>
-                    <property name="bottom_padding">0</property>
-                    <property name="left_padding">0</property>
-                    <property name="right_padding">0</property>
-                    <child>
-                      <object class="GtkHBox" id="hbox6">
-                        <property name="visible">True</property>
-                        <property name="homogeneous">False</property>
-                        <property name="spacing">2</property>
-                        <child>
-                          <object class="GtkImage" id="image5">
-                            <property name="visible">True</property>
-                            <property name="stock">gtk-refresh</property>
-                            <property name="icon_size">4</property>
-                            <property name="xalign">0.5</property>
-                            <property name="yalign">0.5</property>
-                            <property name="xpad">0</property>
-                            <property name="ypad">0</property>
-                          </object>
-                          <packing>
-                            <property name="padding">0</property>
-                            <property name="expand">False</property>
-                            <property name="fill">False</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkLabel" id="label13">
-                            <property name="visible">True</property>
-                            <property name="label" translatable="yes">_Sync</property>
-                            <property name="use_underline">True</property>
-                            <property name="use_markup">False</property>
-                            <property name="justify">GTK_JUSTIFY_LEFT</property>
-                            <property name="wrap">False</property>
-                            <property name="selectable">False</property>
-                            <property name="xalign">0.5</property>
-                            <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>
-                          </object>
-                          <packing>
-                            <property name="padding">0</property>
-                            <property name="expand">False</property>
-                            <property name="fill">False</property>
-                          </packing>
-                        </child>
-                      </object>
-                    </child>
-                  </object>
-                </child>
               </object>
             </child>
           </object>
diff -up seahorse-2.27.90/ssh/seahorse-ssh-generate.xml.button-images seahorse-2.27.90/ssh/seahorse-ssh-generate.xml
--- seahorse-2.27.90/ssh/seahorse-ssh-generate.xml.button-images	2009-08-26 21:42:10.095030435 -0400
+++ seahorse-2.27.90/ssh/seahorse-ssh-generate.xml	2009-08-26 21:47:24.770274900 -0400
@@ -1,6 +1,10 @@
 <?xml version="1.0"?>
 <!--*- mode: xml -*-->
 <interface>
+  <object class="GtkImage" id="create-image">
+    <property name="stock">gtk-ok</property>
+    <property name="icon_size">4</property>
+  </object>
   <object class="GtkAdjustment" id="adjustment1">
     <property name="upper">8192</property>
     <property name="lower">512</property>
@@ -80,66 +84,9 @@
                 <property name="can_focus">True</property>
                 <property name="relief">GTK_RELIEF_NORMAL</property>
                 <property name="focus_on_click">True</property>
-                <child>
-                  <object class="GtkAlignment" id="alignment6">
-                    <property name="visible">True</property>
-                    <property name="xalign">0.5</property>
-                    <property name="yalign">0.5</property>
-                    <property name="xscale">0</property>
-                    <property name="yscale">0</property>
-                    <property name="top_padding">0</property>
-                    <property name="bottom_padding">0</property>
-                    <property name="left_padding">0</property>
-                    <property name="right_padding">0</property>
-                    <child>
-                      <object class="GtkHBox" id="hbox3">
-                        <property name="visible">True</property>
-                        <property name="homogeneous">False</property>
-                        <property name="spacing">2</property>
-                        <child>
-                          <object class="GtkImage" id="image2">
-                            <property name="visible">True</property>
-                            <property name="stock">gtk-ok</property>
-                            <property name="icon_size">4</property>
-                            <property name="xalign">0.5</property>
-                            <property name="yalign">0.5</property>
-                            <property name="xpad">0</property>
-                            <property name="ypad">0</property>
-                          </object>
-                          <packing>
-                            <property name="padding">0</property>
-                            <property name="expand">False</property>
-                            <property name="fill">False</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkLabel" id="label55">
-                            <property name="visible">True</property>
-                            <property name="label" translatable="yes">_Create and Set Up</property>
-                            <property name="use_underline">True</property>
-                            <property name="use_markup">False</property>
-                            <property name="justify">GTK_JUSTIFY_LEFT</property>
-                            <property name="wrap">False</property>
-                            <property name="selectable">False</property>
-                            <property name="xalign">0.5</property>
-                            <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>
-                          </object>
-                          <packing>
-                            <property name="padding">0</property>
-                            <property name="expand">False</property>
-                            <property name="fill">False</property>
-                          </packing>
-                        </child>
-                      </object>
-                    </child>
-                  </object>
-                </child>
+                <property name="image">create-image</property>
+                <property name="label" translatable="yes">_Create and Set Up</property>
+                <property name="use_underline">True</property>
               </object>
             </child>
           </object>
@@ -195,7 +142,7 @@
                     <property name="homogeneous">False</property>
                     <property name="spacing">12</property>
                     <child>
-                      <object class="GtkHBox" id="hbox4">
+                      <object class="GtkHBox" id="hbox41">
                         <property name="visible">True</property>
                         <property name="homogeneous">False</property>
                         <property name="spacing">12</property>
diff -up seahorse-2.27.90/ssh/seahorse-ssh-key-properties.xml.button-images seahorse-2.27.90/ssh/seahorse-ssh-key-properties.xml
--- seahorse-2.27.90/ssh/seahorse-ssh-key-properties.xml.button-images	2009-08-26 21:18:32.452275545 -0400
+++ seahorse-2.27.90/ssh/seahorse-ssh-key-properties.xml	2009-08-26 21:23:55.993025066 -0400
@@ -2,6 +2,14 @@
 <interface>
   <requires lib="gtk+" version="2.16"/>
   <!-- interface-naming-policy toplevel-contextual -->
+  <object class="GtkImage" id="passphrase-image">
+    <property name="stock">gtk-edit</property>
+    <property name="icon-size">4</property>
+  </object>
+  <object class="GtkImage" id="export-image">
+    <property name="stock">gtk-save-as</property>
+    <property name="icon-size">4</property>
+  </object>
   <object class="GtkDialog" id="ssh-key-properties">
     <property name="visible">True</property>
     <property name="border_width">5</property>
@@ -190,44 +198,10 @@
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
+                        <property name="image">passphrase-image</property>
+                        <property name="label" translatable="yes">Change _Passphrase</property>
+                        <property name="use_underline">True</property>
                         <signal name="clicked" handler="on_ssh_passphrase_button_clicked"/>
-                        <child>
-                          <object class="GtkAlignment" id="alignment43">
-                            <property name="visible">True</property>
-                            <property name="xscale">0</property>
-                            <property name="yscale">0</property>
-                            <child>
-                              <object class="GtkHBox" id="hbox58">
-                                <property name="visible">True</property>
-                                <property name="spacing">2</property>
-                                <child>
-                                  <object class="GtkImage" id="image38">
-                                    <property name="visible">True</property>
-                                    <property name="stock">gtk-edit</property>
-                                    <property name="icon-size">4</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">False</property>
-                                    <property name="position">0</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkLabel" id="label22224">
-                                    <property name="visible">True</property>
-                                    <property name="label" translatable="yes">Change _Passphrase</property>
-                                    <property name="use_underline">True</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">False</property>
-                                    <property name="position">1</property>
-                                  </packing>
-                                </child>
-                              </object>
-                            </child>
-                          </object>
-                        </child>
                       </object>
                     </child>
                   </object>
@@ -494,44 +468,10 @@
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
+                        <property name="image">export-image</property>
+                        <property name="label" translatable="yes">E_xport Complete Key</property>
+                        <property name="use_underline">True</property>
                         <signal name="clicked" handler="on_ssh_export_button_clicked"/>
-                        <child>
-                          <object class="GtkAlignment" id="alignment45">
-                            <property name="visible">True</property>
-                            <property name="xscale">0</property>
-                            <property name="yscale">0</property>
-                            <child>
-                              <object class="GtkHBox" id="hbox59">
-                                <property name="visible">True</property>
-                                <property name="spacing">2</property>
-                                <child>
-                                  <object class="GtkImage" id="image39">
-                                    <property name="visible">True</property>
-                                    <property name="stock">gtk-save-as</property>
-                                    <property name="icon-size">4</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">False</property>
-                                    <property name="position">0</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkLabel" id="label22225">
-                                    <property name="visible">True</property>
-                                    <property name="label" translatable="yes">E_xport Complete Key</property>
-                                    <property name="use_underline">True</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">False</property>
-                                    <property name="position">1</property>
-                                  </packing>
-                                </child>
-                              </object>
-                            </child>
-                          </object>
-                        </child>
                       </object>
                     </child>
                   </object>
diff -up seahorse-2.27.90/ssh/seahorse-ssh-upload.xml.button-images seahorse-2.27.90/ssh/seahorse-ssh-upload.xml
--- seahorse-2.27.90/ssh/seahorse-ssh-upload.xml.button-images	2009-08-26 21:35:42.777271303 -0400
+++ seahorse-2.27.90/ssh/seahorse-ssh-upload.xml	2009-08-26 21:35:22.230287488 -0400
@@ -1,6 +1,10 @@
 <?xml version="1.0"?>
 <!--*- mode: xml -*-->
 <interface>
+  <object class="GtkImage" id="setup-image">
+    <property name="stock">gtk-go-up</property>
+    <property name="icon_size">4</property>
+  </object>
   <object class="GtkDialog" id="ssh-upload">
     <property name="border_width">5</property>
     <property name="title" translatable="yes">Set Up Computer for SSH Connection</property>
@@ -48,66 +52,9 @@
                 <property name="has_focus">True</property>
                 <property name="relief">GTK_RELIEF_NORMAL</property>
                 <property name="focus_on_click">True</property>
-                <child>
-                  <object class="GtkAlignment" id="alignment1">
-                    <property name="visible">True</property>
-                    <property name="xalign">0.5</property>
-                    <property name="yalign">0.5</property>
-                    <property name="xscale">0</property>
-                    <property name="yscale">0</property>
-                    <property name="top_padding">0</property>
-                    <property name="bottom_padding">0</property>
-                    <property name="left_padding">0</property>
-                    <property name="right_padding">0</property>
-                    <child>
-                      <object class="GtkHBox" id="hbox4">
-                        <property name="visible">True</property>
-                        <property name="homogeneous">False</property>
-                        <property name="spacing">2</property>
-                        <child>
-                          <object class="GtkImage" id="image2">
-                            <property name="visible">True</property>
-                            <property name="stock">gtk-go-up</property>
-                            <property name="icon_size">4</property>
-                            <property name="xalign">0.5</property>
-                            <property name="yalign">0.5</property>
-                            <property name="xpad">0</property>
-                            <property name="ypad">0</property>
-                          </object>
-                          <packing>
-                            <property name="padding">0</property>
-                            <property name="expand">False</property>
-                            <property name="fill">False</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkLabel" id="label6">
-                            <property name="visible">True</property>
-                            <property name="label" translatable="yes">_Set Up</property>
-                            <property name="use_underline">True</property>
-                            <property name="use_markup">False</property>
-                            <property name="justify">GTK_JUSTIFY_LEFT</property>
-                            <property name="wrap">False</property>
-                            <property name="selectable">False</property>
-                            <property name="xalign">0.5</property>
-                            <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>
-                          </object>
-                          <packing>
-                            <property name="padding">0</property>
-                            <property name="expand">False</property>
-                            <property name="fill">False</property>
-                          </packing>
-                        </child>
-                      </object>
-                    </child>
-                  </object>
-                </child>
+                <property name="image">setup-image</property>
+                <property name="label" translatable="yes">_Set Up</property>
+                <property name="use_underline">True</property>
               </object>
             </child>
           </object>


Index: seahorse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/seahorse/devel/seahorse.spec,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -p -r1.78 -r1.79
--- seahorse.spec	11 Aug 2009 04:12:54 -0000	1.78
+++ seahorse.spec	27 Aug 2009 01:57:08 -0000	1.79
@@ -1,6 +1,6 @@
 Name: 		seahorse
 Version: 	2.27.90
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:	A GNOME application for managing encryption keys
 Group: 		User Interface/Desktops
 # seahorse is GPLv2+
@@ -10,6 +10,9 @@ URL:            http://projects.gnome.or
 Source:         http://download.gnome.org/sources/seahorse/2.27/%{name}-%{version}.tar.bz2
 BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+# http://bugzilla.gnome.org/show_bug.cgi?id=593247
+Patch0:		seahorse-button-images.patch
+
 BuildRequires:  desktop-file-utils
 BuildRequires:  gettext
 BuildRequires:  gpgme-devel >= 1.0
@@ -59,6 +62,7 @@ library that belongs to seahorse.
 
 %prep
 %setup -q
+%patch0 -p1 -b .button-images
 
 %build
 GNUPG=/usr/bin/gpg2 ; export GNUPG ; %configure --disable-scrollkeeper
@@ -163,6 +167,9 @@ fi
 %{_datadir}/gtk-doc/html/libcryptui
 
 %changelog
+* Wed Aug 26 2009 Matthias Clasen <mclasen at redhat.com> - 2.27.90-2
+- Make seahorse respect the button-images setting
+
 * Tue Aug 11 2009 Matthias Clasen <mclasen at redhat.com> - 2.27.90-1
 - Update to 2.27.90
 




More information about the scm-commits mailing list