[Libreoffice-commits] core.git: desktop/source desktop/uiconfig

[Stephan Bergmann]

 desktop/source/deployment/gui/dp_gui_updatedialog.cxx |    4 ++--
 desktop/uiconfig/ui/updatedialog.ui                   |    8 ++++----
 desktop/uiconfig/ui/updateinstalldialog.ui            |    4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

New commits:
commit f6a7527990027a86ffcdd3ff55ae550b1bd7dfae
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Wed Feb 28 17:36:26 2018 +0100

    ...and some more asserts during CppunitTest_desktop_dialogs_test
    
    Change-Id: I0a585ff4a0538c606153cb9d527838f5b50623a8
    Reviewed-on: https://gerrit.libreoffice.org/50521
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/desktop/source/deployment/gui/dp_gui_updatedialog.cxx b/desktop/source/deployment/gui/dp_gui_updatedialog.cxx
index ce1fd074f69f..0760bf339efc 100644
--- a/desktop/source/deployment/gui/dp_gui_updatedialog.cxx
+++ b/desktop/source/deployment/gui/dp_gui_updatedialog.cxx
@@ -512,8 +512,8 @@ UpdateDialog::UpdateDialog(
     m_pDescriptions->set_width_request(aSize.Width());
     m_pDescriptions->set_height_request(aSize.Height());
     get(m_pOk, "INSTALL");
-    get(m_pClose, "gtk-close");
-    get(m_pHelp, "gtk-help");
+    get(m_pClose, "close");
+    get(m_pHelp, "help");
     OSL_ASSERT(updateData != nullptr);
 
     m_xExtensionManager = deployment::ExtensionManager::get( context );
diff --git a/desktop/uiconfig/ui/updatedialog.ui b/desktop/uiconfig/ui/updatedialog.ui
index ee9a1b16fa57..54f7cbd2e527 100644
--- a/desktop/uiconfig/ui/updatedialog.ui
+++ b/desktop/uiconfig/ui/updatedialog.ui
@@ -19,7 +19,7 @@
             <property name="can_focus">False</property>
             <property name="layout_style">end</property>
             <child>
-              <object class="GtkButton" id="gtk-help">
+              <object class="GtkButton" id="help">
                 <property name="label">gtk-help</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
@@ -51,7 +51,7 @@
               </packing>
             </child>
             <child>
-              <object class="GtkButton" id="gtk-close">
+              <object class="GtkButton" id="close">
                 <property name="label">gtk-close</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
@@ -303,9 +303,9 @@
       </object>
     </child>
     <action-widgets>
-      <action-widget response="0">gtk-help</action-widget>
+      <action-widget response="-11">help</action-widget>
       <action-widget response="0">INSTALL</action-widget>
-      <action-widget response="0">gtk-close</action-widget>
+      <action-widget response="-7">close</action-widget>
     </action-widgets>
   </object>
 </interface>
diff --git a/desktop/uiconfig/ui/updateinstalldialog.ui b/desktop/uiconfig/ui/updateinstalldialog.ui
index cd6e482a032b..9bb4959448fb 100644
--- a/desktop/uiconfig/ui/updateinstalldialog.ui
+++ b/desktop/uiconfig/ui/updateinstalldialog.ui
@@ -33,7 +33,7 @@
               </packing>
             </child>
             <child>
-              <object class="GtkButton" id="OK">
+              <object class="GtkButton" id="ok">
                 <property name="label">gtk-ok</property>
                 <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
@@ -49,7 +49,7 @@
               </packing>
             </child>
             <child>
-              <object class="GtkButton" id="CANCEL">
+              <object class="GtkButton" id="cancel">
                 <property name="label">gtk-cancel</property>
                 <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>