From 36cc8b039338442512f0e86d9487d951b5f2c6e3 Mon Sep 17 00:00:00 2001
From: Samuel Hand <samuel.hand@openmailbox.org>
Date: Fri, 10 Aug 2018 00:45:22 +0100
Subject: Code cleanup - move long database queries to their own functions and
 improve variable names

---
 plugins/omemo/data/contact_details_dialog.ui | 16 ++++++++--------
 plugins/omemo/data/manage_key_dialog.ui      | 16 ++++++++--------
 2 files changed, 16 insertions(+), 16 deletions(-)

(limited to 'plugins/omemo/data')

diff --git a/plugins/omemo/data/contact_details_dialog.ui b/plugins/omemo/data/contact_details_dialog.ui
index a5e8511b..eef82f7f 100644
--- a/plugins/omemo/data/contact_details_dialog.ui
+++ b/plugins/omemo/data/contact_details_dialog.ui
@@ -63,7 +63,7 @@
                                                     </object>
                                                 </child>
                                                 <child>
-                                                    <object class="GtkSwitch" id="auto_accept">
+                                                    <object class="GtkSwitch" id="auto_accept_switch">
                                                         <property name="visible">True</property>
                                                         <property name="halign">end</property>
                                                         <property name="valign">center</property>
@@ -115,7 +115,7 @@
                                                         <property name="orientation">horizontal</property>
                                                         <property name="hexpand">True</property>
                                                         <child>
-                                                            <object class="GtkLabel" id="own_fingerprint">
+                                                            <object class="GtkLabel" id="own_fingerprint_label">
                                                                 <property name="visible">True</property>
                                                                 <property name="halign">start</property>
                                                                 <property name="justify">right</property>
@@ -129,7 +129,7 @@
                                                                 <property name="hexpand">True</property>
                                                                 <property name="spacing">5</property>
                                                                 <child>
-                                                                    <object class="GtkButton" id="show_qrcode">
+                                                                    <object class="GtkButton" id="show_qrcode_button">
                                                                         <property name="visible">True</property>
                                                                         <property name="halign">start</property>
                                                                         <property name="hexpand">True</property>
@@ -144,7 +144,7 @@
                                                                     </object>
                                                                 </child>
                                                                 <child>
-                                                                    <object class="GtkButton" id="copy">
+                                                                    <object class="GtkButton" id="copy_button">
                                                                         <property name="visible">True</property>
                                                                         <property name="halign">end</property>
                                                                         <property name="hexpand">True</property>
@@ -188,7 +188,7 @@
                             <object class="GtkFrame">
                                 <property name="visible">True</property>
                                 <child>
-                                    <object class="GtkListBox" id="new_keys">
+                                    <object class="GtkListBox" id="new_keys_listbox">
                                         <property name="visible">True</property>
                                         <property name="selection-mode">none</property>
                                     </object>
@@ -216,7 +216,7 @@
                             <object class="GtkFrame">
                                 <property name="visible">True</property>
                                 <child>
-                                    <object class="GtkListBox" id="keys">
+                                    <object class="GtkListBox" id="keys_listbox">
                                         <property name="visible">True</property>
                                         <property name="selection-mode">none</property>
                                     </object>
@@ -230,7 +230,7 @@
     </template>
     <object class="GtkPopover" id="qrcode_popover">
         <property name="visible">False</property>
-        <property name="relative-to">show_qrcode</property>
+        <property name="relative-to">show_qrcode_button</property>
         <property name="position">left</property>
         <property name="modal">True</property>
         <child>
@@ -238,7 +238,7 @@
                 <property name="visible">True</property>
                 <property name="margin">10</property>
                 <child>
-                    <object class="GtkImage" id="qrcode">
+                    <object class="GtkImage" id="qrcode_image">
                         <property name="visible">True</property>
                     </object>
                 </child>
diff --git a/plugins/omemo/data/manage_key_dialog.ui b/plugins/omemo/data/manage_key_dialog.ui
index 1c07d971..df0b81b5 100644
--- a/plugins/omemo/data/manage_key_dialog.ui
+++ b/plugins/omemo/data/manage_key_dialog.ui
@@ -50,7 +50,7 @@
                                 <property name="orientation">vertical</property>
                                 <property name="valign">center</property>
                                 <child>
-                                    <object class="GtkLabel" id="main_desc">
+                                    <object class="GtkLabel" id="main_desc_label">
                                         <property name="visible">True</property>
                                         <property name="wrap">True</property>
                                         <property name="xalign">0</property>
@@ -83,7 +83,7 @@
                                 <child>
                                     <object class="GtkLabel">
                                         <property name="visible">True</property>
-                                        <property name="label">Compare the fingerprint, character by character, with the one shown on your contacts device.</property>
+                                        <property name="label" translatable="yes">Compare the fingerprint, character by character, with the one shown on your contacts device.</property>
                                         <property name="wrap">True</property>
                                         <property name="xalign">0</property>
                                         <property name="max-width-chars">45</property>
@@ -107,17 +107,17 @@
                                             </object>
                                         </child>
                                         <child>
-                                            <object class="GtkButton" id="verify_no">
+                                            <object class="GtkButton" id="verify_no_button">
                                                 <property name="visible">True</property>
                                                 <property name="hexpand">True</property>
-                                                <property name="label">Not Matching</property>
+                                                <property name="label" translatable="yes">Not Matching</property>
                                             </object>
                                         </child>
                                         <child>
-                                            <object class="GtkButton" id="verify_yes">
+                                            <object class="GtkButton" id="verify_yes_button">
                                                 <property name="visible">True</property>
                                                 <property name="hexpand">True</property>
-                                                <property name="label">Matching</property>
+                                                <property name="label" translatable="yes">Matching</property>
                                             </object>
                                         </child>
                                     </object>
@@ -140,7 +140,7 @@
                                     </object>
                                 </child>
                                 <child>
-                                    <object class="GtkLabel" id="confirm_title">
+                                    <object class="GtkLabel" id="confirm_title_label">
                                         <property name="visible">True</property>
                                         <attributes>
                                             <attribute name="scale" value="1.1"/>
@@ -148,7 +148,7 @@
                                     </object>
                                 </child>
                                 <child>
-                                    <object class="GtkLabel" id="confirm_desc">
+                                    <object class="GtkLabel" id="confirm_desc_label">
                                         <property name="visible">True</property>
                                         <property name="justify">center</property>
                                         <property name="wrap">True</property>
-- 
cgit v1.2.3-54-g00ecf