copyleftie
/
gajim-plural
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix using change status dialog

This commit is contained in:
Yann Leboulanger 2015-01-02 21:53:59 +01:00
parent 2361212676
commit a5f50372c8
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
data/gui/change_status_message_dialog.ui
View File

@ -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>

3
src/common/resolver.py
View File

@ -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