Merge branch 'master' of git://git.fedorahosted.org/git/abrt

6 files changed, 36 insertions, 30 deletions

diff --git a/lib/Plugins/Bugzilla.GTKBuilder b/lib/Plugins/Bugzilla.GTKBuilder
index 27af868..8c662c3 100644
--- a/lib/Plugins/Bugzilla.GTKBuilder
+++ b/lib/Plugins/Bugzilla.GTKBuilder
@@ -7,6 +7,7 @@
     <property name="resizable">False</property>
     <property name="modal">True</property>
     <property name="window_position">center-on-parent</property>
+    <property name="icon_name">/usr/share/pixmaps/abrt.png</property>
     <property name="type_hint">normal</property>
     <property name="has_separator">False</property>
     <child internal-child="vbox">
@@ -199,8 +200,8 @@
             <property name="visible">True</property>
             <property name="layout_style">end</property>
             <child>
-              <object class="GtkButton" id="bApply">
-                <property name="label">gtk-apply</property>
+              <object class="GtkButton" id="button2">
+                <property name="label">gtk-cancel</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
@@ -213,8 +214,8 @@
               </packing>
             </child>
             <child>
-              <object class="GtkButton" id="button2">
-                <property name="label">gtk-cancel</property>
+              <object class="GtkButton" id="bApply">
+                <property name="label">gtk-apply</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
@@ -236,8 +237,8 @@
       </object>
     </child>
     <action-widgets>
-      <action-widget response="-10">bApply</action-widget>
       <action-widget response="-6">button2</action-widget>
+      <action-widget response="-10">bApply</action-widget>
     </action-widgets>
   </object>
   <object class="GtkAction" id="action1"/>
diff --git a/lib/Plugins/Catcut.GTKBuilder b/lib/Plugins/Catcut.GTKBuilder
index 9f314f0..1207478 100644
--- a/lib/Plugins/Catcut.GTKBuilder
+++ b/lib/Plugins/Catcut.GTKBuilder
@@ -7,6 +7,7 @@
     <property name="resizable">False</property>
     <property name="modal">True</property>
     <property name="window_position">center-on-parent</property>
+    <property name="icon">/usr/share/pixmaps/abrt.png</property>
     <property name="type_hint">normal</property>
     <property name="has_separator">False</property>
     <child internal-child="vbox">
@@ -165,8 +166,8 @@
             <property name="visible">True</property>
             <property name="layout_style">end</property>
             <child>
-              <object class="GtkButton" id="bApply">
-                <property name="label">gtk-apply</property>
+              <object class="GtkButton" id="button2">
+                <property name="label">gtk-cancel</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
@@ -179,8 +180,8 @@
               </packing>
             </child>
             <child>
-              <object class="GtkButton" id="button2">
-                <property name="label">gtk-cancel</property>
+              <object class="GtkButton" id="bApply">
+                <property name="label">gtk-apply</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
@@ -202,8 +203,8 @@
       </object>
     </child>
     <action-widgets>
-      <action-widget response="-10">bApply</action-widget>
       <action-widget response="-6">button2</action-widget>
+      <action-widget response="-10">bApply</action-widget>
     </action-widgets>
   </object>
 </interface>
diff --git a/lib/Plugins/KerneloopsReporter.GTKBuilder b/lib/Plugins/KerneloopsReporter.GTKBuilder
index 65f993f..dbe6c96 100644
--- a/lib/Plugins/KerneloopsReporter.GTKBuilder
+++ b/lib/Plugins/KerneloopsReporter.GTKBuilder
@@ -6,6 +6,7 @@
     <property name="border_width">12</property>
     <property name="resizable">False</property>
     <property name="modal">True</property>
+    <property name="icon">/usr/share/pixmaps/abrt.png</property>
     <property name="type_hint">normal</property>
     <property name="has_separator">False</property>
     <child internal-child="vbox">
@@ -73,8 +74,8 @@
             <property name="visible">True</property>
             <property name="layout_style">end</property>
             <child>
-              <object class="GtkButton" id="button1">
-                <property name="label" translatable="yes">gtk-apply</property>
+              <object class="GtkButton" id="button2">
+                <property name="label">gtk-cancel</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
@@ -87,8 +88,8 @@
               </packing>
             </child>
             <child>
-              <object class="GtkButton" id="button2">
-                <property name="label" translatable="yes">gtk-cancel</property>
+              <object class="GtkButton" id="button1">
+                <property name="label">gtk-apply</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
@@ -110,8 +111,8 @@
       </object>
     </child>
     <action-widgets>
-      <action-widget response="-10">button1</action-widget>
       <action-widget response="-6">button2</action-widget>
+      <action-widget response="-10">button1</action-widget>
     </action-widgets>
   </object>
 </interface>
diff --git a/lib/Plugins/Logger.GTKBuilder b/lib/Plugins/Logger.GTKBuilder
index 26ac10f..8863360 100644
--- a/lib/Plugins/Logger.GTKBuilder
+++ b/lib/Plugins/Logger.GTKBuilder
@@ -7,6 +7,7 @@
     <property name="resizable">False</property>
     <property name="modal">True</property>
     <property name="window_position">center-on-parent</property>
+    <property name="icon">/usr/share/pixmaps/abrt.png</property>
     <property name="type_hint">normal</property>
     <property name="has_separator">False</property>
     <child internal-child="vbox">
@@ -90,8 +91,8 @@
             <property name="visible">True</property>
             <property name="layout_style">end</property>
             <child>
-              <object class="GtkButton" id="button1">
-                <property name="label" translatable="yes">gtk-apply</property>
+              <object class="GtkButton" id="button2">
+                <property name="label">gtk-cancel</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
@@ -104,8 +105,8 @@
               </packing>
             </child>
             <child>
-              <object class="GtkButton" id="button2">
-                <property name="label" translatable="yes">gtk-cancel</property>
+              <object class="GtkButton" id="button1">
+                <property name="label">gtk-apply</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
@@ -127,8 +128,8 @@
       </object>
     </child>
     <action-widgets>
-      <action-widget response="-10">button1</action-widget>
       <action-widget response="-6">button2</action-widget>
+      <action-widget response="-10">button1</action-widget>
     </action-widgets>
   </object>
 </interface>
diff --git a/lib/Plugins/Mailx.GTKBuilder b/lib/Plugins/Mailx.GTKBuilder
index 55647e1..079e27c 100644
--- a/lib/Plugins/Mailx.GTKBuilder
+++ b/lib/Plugins/Mailx.GTKBuilder
@@ -7,6 +7,7 @@
     <property name="resizable">False</property>
     <property name="modal">True</property>
     <property name="window_position">center-on-parent</property>
+    <property name="icon">/usr/share/pixmaps/abrt.png</property>
     <property name="type_hint">normal</property>
     <property name="has_separator">False</property>
     <child internal-child="vbox">
@@ -139,8 +140,8 @@
             <property name="visible">True</property>
             <property name="layout_style">end</property>
             <child>
-              <object class="GtkButton" id="button1">
-                <property name="label">gtk-apply</property>
+              <object class="GtkButton" id="button2">
+                <property name="label">gtk-cancel</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
@@ -153,8 +154,8 @@
               </packing>
             </child>
             <child>
-              <object class="GtkButton" id="button2">
-                <property name="label">gtk-cancel</property>
+              <object class="GtkButton" id="button1">
+                <property name="label">gtk-apply</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
@@ -176,8 +177,8 @@
       </object>
     </child>
     <action-widgets>
-      <action-widget response="-10">button1</action-widget>
       <action-widget response="-6">button2</action-widget>
+      <action-widget response="-10">button1</action-widget>
     </action-widgets>
   </object>
 </interface>
diff --git a/lib/Plugins/TicketUploader.GTKBuilder b/lib/Plugins/TicketUploader.GTKBuilder
index 4695a31..36b1dd9 100644
--- a/lib/Plugins/TicketUploader.GTKBuilder
+++ b/lib/Plugins/TicketUploader.GTKBuilder
@@ -7,6 +7,7 @@
     <property name="resizable">False</property>
     <property name="modal">True</property>
     <property name="window_position">center-on-parent</property>
+    <property name="icon">/usr/share/pixmaps/abrt.png</property>
     <property name="type_hint">normal</property>
     <property name="has_separator">False</property>
     <child internal-child="vbox">
@@ -203,8 +204,8 @@
             <property name="visible">True</property>
             <property name="layout_style">end</property>
             <child>
-              <object class="GtkButton" id="bApply">
-                <property name="label" translatable="yes">gtk-apply</property>
+              <object class="GtkButton" id="button2">
+                <property name="label">gtk-cancel</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
@@ -217,8 +218,8 @@
               </packing>
             </child>
             <child>
-              <object class="GtkButton" id="button2">
-                <property name="label" translatable="yes">gtk-cancel</property>
+              <object class="GtkButton" id="bApply">
+                <property name="label">gtk-apply</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
@@ -240,8 +241,8 @@
       </object>
     </child>
     <action-widgets>
-      <action-widget response="-10">bApply</action-widget>
       <action-widget response="-6">button2</action-widget>
+      <action-widget response="-10">bApply</action-widget>
     </action-widgets>
   </object>
   <object class="GtkAction" id="action1"/>