Merge branch 'gnome-3-4'

diff --combined libempathy-gtk/empathy-account-widget-irc.ui
index 48a3aa04fba89b330d9cc457838a2c0bd40441ba,8081e2284abed9429fc5eba4af0fd4747e446257..95f30a2f69fb4e3698d3938e15469f93c74858f5
--- 1/libempathy-gtk/empathy-account-widget-irc.ui
--- 2/libempathy-gtk/empathy-account-widget-irc.ui
+++ b/libempathy-gtk/empathy-account-widget-irc.ui
@@@ -393,6 -393,7 +393,6 @@@
                <object class="GtkEntry" id="entry_quit_message">
                  <property name="visible">True</property>
                  <property name="can_focus">True</property>
 -                <property name="invisible_char">•</property>
                </object>
                <packing>
                  <property name="left_attach">1</property>
@@@ -409,7 -410,7 +409,7 @@@
                  <property name="label" translatable="yes">Quit message:</property>
                </object>
                <packing>
-                 <property name="left_attach">3</property>
+                 <property name="left_attach">0</property>
                  <property name="top_attach">2</property>
                  <property name="width">1</property>
                  <property name="height">1</property>
@@@ -419,6 -420,8 +419,6 @@@
                <object class="GtkEntry" id="entry_fullname">
                  <property name="visible">True</property>
                  <property name="can_focus">True</property>
 -                <property name="invisible_char">●</property>
 -                <property name="invisible_char_set">True</property>
                </object>
                <packing>
                  <property name="left_attach">1</property>
@@@ -462,6 -465,8 +462,6 @@@
                <object class="GtkEntry" id="entry_username">
                  <property name="visible">True</property>
                  <property name="can_focus">True</property>
 -                <property name="invisible_char">●</property>
 -                <property name="invisible_char_set">True</property>
                </object>
                <packing>
                  <property name="left_attach">1</property>
@@@ -555,6 -560,7 +555,6 @@@
            <object class="GtkEntry" id="entry_nick_simple">
              <property name="visible">True</property>
              <property name="can_focus">True</property>
 -            <property name="invisible_char">•</property>
            </object>
          </child>
        </object>