From a5f50372c8840772545343ebc5539e6ccc486747 Mon Sep 17 00:00:00 2001
From: Yann Leboulanger <asterix@lagaule.org>
Date: Fri, 2 Jan 2015 21:53:59 +0100
Subject: [PATCH] fix using change status dialog

---
 data/gui/change_status_message_dialog.ui | 12 ++++++------
 src/common/resolver.py                   |  3 +--
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/data/gui/change_status_message_dialog.ui b/data/gui/change_status_message_dialog.ui
index e4aa96970..b90e208f9 100644
--- a/data/gui/change_status_message_dialog.ui
+++ b/data/gui/change_status_message_dialog.ui
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.18.3 -->
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
+  <requires lib="gtk+" version="3.10"/>
   <object class="GtkDialog" id="change_status_message_dialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
@@ -27,7 +28,6 @@
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
                 <property name="receives_default">False</property>
-                <property name="use_action_appearance">False</property>
                 <property name="use_stock">True</property>
               </object>
               <packing>
@@ -45,7 +45,6 @@
                 <property name="can_default">True</property>
                 <property name="has_default">True</property>
                 <property name="receives_default">False</property>
-                <property name="use_action_appearance">False</property>
                 <property name="use_stock">True</property>
               </object>
               <packing>
@@ -112,7 +111,6 @@
                             <property name="can_focus">True</property>
                             <property name="can_default">True</property>
                             <property name="receives_default">False</property>
-                            <property name="use_action_appearance">False</property>
                             <signal name="clicked" handler="on_save_as_preset_button_clicked" swapped="no"/>
                             <child>
                               <object class="GtkAlignment" id="alignment106">
@@ -182,7 +180,6 @@
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
-                            <property name="use_action_appearance">False</property>
                             <signal name="clicked" handler="on_mood_button_clicked" swapped="no"/>
                             <child>
                               <object class="GtkHBox" id="hbox2">
@@ -231,7 +228,6 @@
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
-                            <property name="use_action_appearance">False</property>
                             <signal name="clicked" handler="on_activity_button_clicked" swapped="no"/>
                             <child>
                               <object class="GtkHBox" id="hbox1">
@@ -354,5 +350,9 @@
         </child>
       </object>
     </child>
+    <action-widgets>
+      <action-widget response="-6">cancel_button</action-widget>
+      <action-widget response="-5">ok_button</action-widget>
+    </action-widgets>
   </object>
 </interface>
diff --git a/src/common/resolver.py b/src/common/resolver.py
index 14e4b104a..b2d157cb6 100644
--- a/src/common/resolver.py
+++ b/src/common/resolver.py
@@ -326,8 +326,7 @@ class HostResolver(CommonResolver):
             domain = None
             if line.startswith(fqdn):
                 domain = fqdn # For nslookup 9.5
-            elif helpers.decode_string(line).startswith(ufqdn):
-                line = helpers.decode_string(line)
+            elif line.startswith(ufqdn):
                 domain = ufqdn # For nslookup 9.6
             if domain:
                 # add 4 for ' has' after domain name