[darcs-to-svn @ Adding jabber specific settings widget]
authorXavier Claessens <xclaesse@src.gnome.org>
Sun, 29 Apr 2007 21:30:25 +0000 (21:30 +0000)
committerXavier Claessens <xclaesse@src.gnome.org>
Sun, 29 Apr 2007 21:30:25 +0000 (21:30 +0000)
svn path=/trunk/; revision=10

libempathy-gtk/Makefile.am
libempathy-gtk/empathy-accounts.glade [deleted file]
libempathy-gtk/empathy-chat.glade [deleted file]
libempathy-gtk/gossip-account-widget-jabber.c [new file with mode: 0644]
libempathy-gtk/gossip-account-widget-jabber.glade [new file with mode: 0644]
libempathy-gtk/gossip-account-widget-jabber.h [new file with mode: 0644]
libempathy-gtk/gossip-accounts-dialog.c
libempathy-gtk/gossip-private-chat.c

index dc30455..ea1bbe2 100644 (file)
@@ -11,6 +11,7 @@ noinst_LTLIBRARIES = libempathy-gtk.la
 libempathy_gtk_la_SOURCES =                                                    \
        gossip-accounts-dialog.c                gossip-accounts-dialog.h        \
        gossip-account-widget-generic.c         gossip-account-widget-generic.h \
+       gossip-account-widget-jabber.c          gossip-account-widget-jabber.h  \
        gossip-profile-chooser.c                gossip-profile-chooser.h        \
        gossip-cell-renderer-expander.c         gossip-cell-renderer-expander.h \
        gossip-cell-renderer-text.c             gossip-cell-renderer-text.h     \
@@ -36,9 +37,10 @@ libempathy_gtk_la_LIBADD =                                                   \
 libempathy_gtk_includedir = $(includedir)/empathy/
 
 gladedir = $(datadir)/empathy
-glade_DATA =                           \
-       empathy-accounts.glade          \
-       empathy-chat.glade
+glade_DATA =                                   \
+       gossip-accounts-dialog.glade            \
+       gossip-account-widget-jabber.glade      \
+       gossip-chat.glade
 
 dtddir = $(datadir)/empathy
 dtd_DATA =                                                                     \
diff --git a/libempathy-gtk/empathy-accounts.glade b/libempathy-gtk/empathy-accounts.glade
deleted file mode 100644 (file)
index a7bb391..0000000
+++ /dev/null
@@ -1,843 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd">
-<!--*- mode: xml -*-->
-<glade-interface>
-  <widget class="GtkDialog" id="accounts_dialog">
-    <property name="border_width">5</property>
-    <property name="title" translatable="yes">Accounts</property>
-    <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
-    <property name="has_separator">False</property>
-    <child internal-child="vbox">
-      <widget class="GtkVBox" id="dialog-vbox3">
-        <property name="visible">True</property>
-        <property name="spacing">2</property>
-        <child>
-          <widget class="GtkHBox" id="hbox146">
-            <property name="visible">True</property>
-            <property name="border_width">6</property>
-            <property name="spacing">18</property>
-            <child>
-              <widget class="GtkVBox" id="vbox195">
-                <property name="visible">True</property>
-                <property name="spacing">6</property>
-                <child>
-                  <widget class="GtkScrolledWindow" id="scrolledwindow17">
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-                    <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-                    <property name="shadow_type">GTK_SHADOW_IN</property>
-                    <child>
-                      <widget class="GtkTreeView" id="treeview">
-                        <property name="height_request">200</property>
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="enable_search">False</property>
-                      </widget>
-                    </child>
-                  </widget>
-                </child>
-                <child>
-                  <widget class="GtkVBox" id="vbox196">
-                    <property name="visible">True</property>
-                    <property name="spacing">6</property>
-                    <child>
-                      <widget class="GtkButton" id="button_connect">
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="label">gtk-connect</property>
-                        <property name="use_stock">True</property>
-                      </widget>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">False</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <widget class="GtkHBox" id="hbox148">
-                        <property name="visible">True</property>
-                        <property name="spacing">6</property>
-                        <property name="homogeneous">True</property>
-                        <child>
-                          <widget class="GtkButton" id="button_add">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="label">gtk-add</property>
-                            <property name="use_stock">True</property>
-                          </widget>
-                        </child>
-                        <child>
-                          <widget class="GtkButton" id="button_remove">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="label">gtk-remove</property>
-                            <property name="use_stock">True</property>
-                          </widget>
-                          <packing>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                      </widget>
-                      <packing>
-                        <property name="position">1</property>
-                      </packing>
-                    </child>
-                  </widget>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">False</property>
-                    <property name="position">1</property>
-                  </packing>
-                </child>
-              </widget>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-              </packing>
-            </child>
-            <child>
-              <widget class="GtkVBox" id="vbox214">
-                <property name="width_request">415</property>
-                <property name="visible">True</property>
-                <property name="spacing">18</property>
-                <child>
-                  <widget class="GtkVBox" id="vbox_details">
-                    <property name="visible">True</property>
-                    <property name="spacing">18</property>
-                    <child>
-                      <widget class="GtkFrame" id="frame1">
-                        <property name="visible">True</property>
-                        <property name="label_xalign">0</property>
-                        <property name="shadow_type">GTK_SHADOW_NONE</property>
-                        <child>
-                          <widget class="GtkAlignment" id="alignment7">
-                            <property name="visible">True</property>
-                            <property name="top_padding">6</property>
-                            <property name="left_padding">20</property>
-                            <child>
-                              <widget class="GtkVBox" id="vbox213">
-                                <property name="visible">True</property>
-                                <property name="spacing">6</property>
-                                <child>
-                                  <widget class="GtkTable" id="table14">
-                                    <property name="visible">True</property>
-                                    <property name="n_rows">2</property>
-                                    <property name="n_columns">2</property>
-                                    <property name="column_spacing">6</property>
-                                    <property name="row_spacing">6</property>
-                                    <child>
-                                      <widget class="GtkLabel" id="label_type">
-                                        <property name="visible">True</property>
-                                        <property name="xalign">0</property>
-                                        <property name="label" translatable="yes">Jabber</property>
-                                      </widget>
-                                      <packing>
-                                        <property name="y_options"></property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <widget class="GtkLabel" id="label_name">
-                                        <property name="visible">True</property>
-                                        <property name="xalign">0</property>
-                                        <property name="label" translatable="yes">Imendio </property>
-                                        <property name="width_chars">0</property>
-                                      </widget>
-                                      <packing>
-                                        <property name="top_attach">1</property>
-                                        <property name="bottom_attach">2</property>
-                                        <property name="y_options"></property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <widget class="GtkImage" id="image_type">
-                                        <property name="visible">True</property>
-                                        <property name="yalign">0</property>
-                                        <property name="stock">gtk-cut</property>
-                                        <property name="icon_size">6</property>
-                                      </widget>
-                                      <packing>
-                                        <property name="left_attach">1</property>
-                                        <property name="right_attach">2</property>
-                                        <property name="bottom_attach">2</property>
-                                        <property name="x_options">GTK_FILL</property>
-                                        <property name="y_options">GTK_FILL</property>
-                                      </packing>
-                                    </child>
-                                  </widget>
-                                </child>
-                              </widget>
-                            </child>
-                          </widget>
-                        </child>
-                        <child>
-                          <widget class="GtkLabel" id="label598">
-                            <property name="visible">True</property>
-                            <property name="label" translatable="yes">&lt;b&gt;Account&lt;/b&gt;</property>
-                            <property name="use_markup">True</property>
-                          </widget>
-                          <packing>
-                            <property name="type">label_item</property>
-                          </packing>
-                        </child>
-                      </widget>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">False</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <widget class="GtkFrame" id="frame2">
-                        <property name="visible">True</property>
-                        <property name="label_xalign">0</property>
-                        <property name="shadow_type">GTK_SHADOW_NONE</property>
-                        <child>
-                          <widget class="GtkAlignment" id="alignment_settings">
-                            <property name="visible">True</property>
-                            <property name="top_padding">6</property>
-                            <property name="left_padding">20</property>
-                            <child>
-                              <placeholder/>
-                            </child>
-                          </widget>
-                        </child>
-                        <child>
-                          <widget class="GtkLabel" id="label599">
-                            <property name="visible">True</property>
-                            <property name="label" translatable="yes">&lt;b&gt;Settings&lt;/b&gt;</property>
-                            <property name="use_markup">True</property>
-                          </widget>
-                          <packing>
-                            <property name="type">label_item</property>
-                          </packing>
-                        </child>
-                      </widget>
-                      <packing>
-                        <property name="position">1</property>
-                      </packing>
-                    </child>
-                  </widget>
-                </child>
-                <child>
-                  <widget class="GtkFrame" id="frame_new_account">
-                    <property name="label_xalign">0</property>
-                    <property name="shadow_type">GTK_SHADOW_NONE</property>
-                    <child>
-                      <widget class="GtkAlignment" id="alignment29">
-                        <property name="visible">True</property>
-                        <property name="top_padding">6</property>
-                        <property name="left_padding">20</property>
-                        <child>
-                          <widget class="GtkVBox" id="vbox216">
-                            <property name="visible">True</property>
-                            <property name="spacing">12</property>
-                            <child>
-                              <widget class="GtkTable" id="table_new_account">
-                                <property name="visible">True</property>
-                                <property name="n_rows">2</property>
-                                <property name="n_columns">2</property>
-                                <property name="column_spacing">6</property>
-                                <property name="row_spacing">6</property>
-                                <child>
-                                  <placeholder/>
-                                </child>
-                                <child>
-                                  <widget class="GtkLabel" id="label638">
-                                    <property name="visible">True</property>
-                                    <property name="xalign">0</property>
-                                    <property name="label" translatable="yes">_Name:</property>
-                                    <property name="use_underline">True</property>
-                                    <property name="mnemonic_widget">entry_name</property>
-                                  </widget>
-                                  <packing>
-                                    <property name="top_attach">1</property>
-                                    <property name="bottom_attach">2</property>
-                                    <property name="x_options">GTK_FILL</property>
-                                    <property name="y_options"></property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <widget class="GtkLabel" id="label640">
-                                    <property name="visible">True</property>
-                                    <property name="xalign">0</property>
-                                    <property name="label" translatable="yes">_Type:</property>
-                                    <property name="use_underline">True</property>
-                                  </widget>
-                                  <packing>
-                                    <property name="x_options">GTK_FILL</property>
-                                    <property name="y_options"></property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <widget class="GtkHBox" id="hbox180">
-                                    <property name="visible">True</property>
-                                    <property name="spacing">6</property>
-                                    <child>
-                                      <widget class="GtkEntry" id="entry_name">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">True</property>
-                                        <property name="tooltip" translatable="yes">A unique name for this account to identify it personally to you.</property>
-                                        <property name="invisible_char">*</property>
-                                      </widget>
-                                    </child>
-                                  </widget>
-                                  <packing>
-                                    <property name="left_attach">1</property>
-                                    <property name="right_attach">2</property>
-                                    <property name="top_attach">1</property>
-                                    <property name="bottom_attach">2</property>
-                                    <property name="x_options">GTK_FILL</property>
-                                    <property name="y_options">GTK_FILL</property>
-                                  </packing>
-                                </child>
-                              </widget>
-                              <packing>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <widget class="GtkHBox" id="hbox181">
-                                <property name="visible">True</property>
-                                <property name="spacing">6</property>
-                                <child>
-                                  <widget class="GtkButton" id="button_cancel">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="label">gtk-cancel</property>
-                                    <property name="use_stock">True</property>
-                                  </widget>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">False</property>
-                                    <property name="pack_type">GTK_PACK_END</property>
-                                    <property name="position">1</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <widget class="GtkButton" id="button_create">
-                                    <property name="visible">True</property>
-                                    <property name="sensitive">False</property>
-                                    <property name="can_focus">True</property>
-                                    <child>
-                                      <widget class="GtkAlignment" id="alignment30">
-                                        <property name="visible">True</property>
-                                        <property name="xscale">0</property>
-                                        <property name="yscale">0</property>
-                                        <child>
-                                          <widget class="GtkHBox" id="hbox181">
-                                            <property name="visible">True</property>
-                                            <property name="spacing">2</property>
-                                            <child>
-                                              <widget class="GtkImage" id="image838">
-                                                <property name="visible">True</property>
-                                                <property name="stock">gtk-new</property>
-                                              </widget>
-                                              <packing>
-                                                <property name="expand">False</property>
-                                                <property name="fill">False</property>
-                                              </packing>
-                                            </child>
-                                            <child>
-                                              <widget class="GtkLabel" id="label642">
-                                                <property name="visible">True</property>
-                                                <property name="label" translatable="yes">Cr_eate!</property>
-                                                <property name="use_underline">True</property>
-                                              </widget>
-                                              <packing>
-                                                <property name="expand">False</property>
-                                                <property name="fill">False</property>
-                                                <property name="position">1</property>
-                                              </packing>
-                                            </child>
-                                          </widget>
-                                        </child>
-                                      </widget>
-                                    </child>
-                                  </widget>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">False</property>
-                                    <property name="pack_type">GTK_PACK_END</property>
-                                  </packing>
-                                </child>
-                              </widget>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">False</property>
-                                <property name="pack_type">GTK_PACK_END</property>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
-                          </widget>
-                        </child>
-                      </widget>
-                    </child>
-                    <child>
-                      <widget class="GtkLabel" id="label643">
-                        <property name="visible">True</property>
-                        <property name="label" translatable="yes">&lt;b&gt;New Account&lt;/b&gt;</property>
-                        <property name="use_markup">True</property>
-                      </widget>
-                      <packing>
-                        <property name="type">label_item</property>
-                      </packing>
-                    </child>
-                  </widget>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="position">1</property>
-                  </packing>
-                </child>
-                <child>
-                  <widget class="GtkFrame" id="frame_no_account">
-                    <property name="label_xalign">0</property>
-                    <property name="shadow_type">GTK_SHADOW_NONE</property>
-                    <child>
-                      <widget class="GtkAlignment" id="alignment21">
-                        <property name="visible">True</property>
-                        <property name="top_padding">6</property>
-                        <property name="left_padding">12</property>
-                        <child>
-                          <widget class="GtkLabel" id="label_no_account_blurb">
-                            <property name="visible">True</property>
-                            <property name="label" translatable="yes">To add a new account, you can click on the 'Add' button and a new entry will be created for you to started configuring.
-
-If you do not want to add an account, simply click on the account you want to configure in the list on the left.</property>
-                            <property name="use_markup">True</property>
-                            <property name="wrap">True</property>
-                          </widget>
-                        </child>
-                      </widget>
-                    </child>
-                    <child>
-                      <widget class="GtkLabel" id="label_no_account">
-                        <property name="visible">True</property>
-                        <property name="label" translatable="yes">&lt;b&gt;No Account Selected&lt;/b&gt;</property>
-                        <property name="use_markup">True</property>
-                      </widget>
-                      <packing>
-                        <property name="type">label_item</property>
-                      </packing>
-                    </child>
-                  </widget>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">False</property>
-                    <property name="position">2</property>
-                  </packing>
-                </child>
-              </widget>
-              <packing>
-                <property name="position">1</property>
-              </packing>
-            </child>
-          </widget>
-          <packing>
-            <property name="position">1</property>
-          </packing>
-        </child>
-        <child internal-child="action_area">
-          <widget class="GtkHButtonBox" id="dialog-action_area">
-            <property name="visible">True</property>
-            <property name="layout_style">GTK_BUTTONBOX_END</property>
-            <child>
-              <widget class="GtkButton" id="button_close">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="can_default">True</property>
-                <property name="label">gtk-close</property>
-                <property name="use_stock">True</property>
-                <property name="response_id">-6</property>
-              </widget>
-            </child>
-          </widget>
-          <packing>
-            <property name="expand">False</property>
-            <property name="pack_type">GTK_PACK_END</property>
-          </packing>
-        </child>
-      </widget>
-    </child>
-  </widget>
-  <widget class="GtkWindow" id="account_jabber_settings">
-    <property name="visible">True</property>
-    <property name="title" translatable="yes">jabber account settings</property>
-    <property name="resizable">False</property>
-    <child>
-      <widget class="GtkTable" id="vbox_jabber_settings">
-        <property name="visible">True</property>
-        <property name="n_rows">6</property>
-        <property name="n_columns">3</property>
-        <property name="column_spacing">12</property>
-        <property name="row_spacing">6</property>
-        <child>
-          <widget class="GtkLabel" id="label_id">
-            <property name="visible">True</property>
-            <property name="xalign">0</property>
-            <property name="label" translatable="yes">Login I_D:</property>
-            <property name="use_underline">True</property>
-            <property name="mnemonic_widget">entry_id</property>
-          </widget>
-          <packing>
-            <property name="x_options">GTK_FILL</property>
-            <property name="y_options"></property>
-          </packing>
-        </child>
-        <child>
-          <widget class="GtkLabel" id="label_password">
-            <property name="visible">True</property>
-            <property name="xalign">0</property>
-            <property name="label" translatable="yes">Pass_word:</property>
-            <property name="use_underline">True</property>
-            <property name="mnemonic_widget">entry_password</property>
-          </widget>
-          <packing>
-            <property name="top_attach">1</property>
-            <property name="bottom_attach">2</property>
-            <property name="x_options">GTK_FILL</property>
-            <property name="y_options"></property>
-          </packing>
-        </child>
-        <child>
-          <widget class="GtkLabel" id="label_resource">
-            <property name="visible">True</property>
-            <property name="xalign">0</property>
-            <property name="label" translatable="yes">Reso_urce:</property>
-            <property name="use_underline">True</property>
-            <property name="mnemonic_widget">entry_resource</property>
-          </widget>
-          <packing>
-            <property name="top_attach">2</property>
-            <property name="bottom_attach">3</property>
-            <property name="x_options">GTK_FILL</property>
-            <property name="y_options"></property>
-          </packing>
-        </child>
-        <child>
-          <widget class="GtkLabel" id="label_server">
-            <property name="visible">True</property>
-            <property name="xalign">0</property>
-            <property name="label" translatable="yes">_Server:</property>
-            <property name="use_underline">True</property>
-            <property name="mnemonic_widget">entry_server</property>
-          </widget>
-          <packing>
-            <property name="top_attach">3</property>
-            <property name="bottom_attach">4</property>
-            <property name="x_options">GTK_FILL</property>
-            <property name="y_options"></property>
-          </packing>
-        </child>
-        <child>
-          <widget class="GtkLabel" id="label_port">
-            <property name="visible">True</property>
-            <property name="xalign">0</property>
-            <property name="label" translatable="yes">_Port:</property>
-            <property name="use_underline">True</property>
-            <property name="mnemonic_widget">entry_port</property>
-          </widget>
-          <packing>
-            <property name="top_attach">4</property>
-            <property name="bottom_attach">5</property>
-            <property name="x_options">GTK_FILL</property>
-            <property name="y_options"></property>
-          </packing>
-        </child>
-        <child>
-          <widget class="GtkEntry" id="entry_resource">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="invisible_char">*</property>
-          </widget>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="right_attach">3</property>
-            <property name="top_attach">2</property>
-            <property name="bottom_attach">3</property>
-            <property name="y_options"></property>
-          </packing>
-        </child>
-        <child>
-          <widget class="GtkEntry" id="entry_server">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="invisible_char">*</property>
-          </widget>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="right_attach">3</property>
-            <property name="top_attach">3</property>
-            <property name="bottom_attach">4</property>
-            <property name="y_options"></property>
-          </packing>
-        </child>
-        <child>
-          <widget class="GtkEntry" id="entry_port">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="invisible_char">*</property>
-          </widget>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="right_attach">3</property>
-            <property name="top_attach">4</property>
-            <property name="bottom_attach">5</property>
-            <property name="y_options"></property>
-          </packing>
-        </child>
-        <child>
-          <widget class="GtkCheckButton" id="checkbutton_ssl">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="label" translatable="yes">Use encryption (SS_L)</property>
-            <property name="use_underline">True</property>
-            <property name="draw_indicator">True</property>
-          </widget>
-          <packing>
-            <property name="right_attach">3</property>
-            <property name="top_attach">5</property>
-            <property name="bottom_attach">6</property>
-            <property name="x_options">GTK_FILL</property>
-            <property name="y_options"></property>
-          </packing>
-        </child>
-        <child>
-          <widget class="GtkHBox" id="hbox174">
-            <property name="visible">True</property>
-            <property name="spacing">2</property>
-            <child>
-              <widget class="GtkEntry" id="entry_password">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="visibility">False</property>
-                <property name="invisible_char">*</property>
-              </widget>
-            </child>
-            <child>
-              <widget class="GtkButton" id="button_forget">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="tooltip" translatable="yes">Forget password and clear the entry.</property>
-                <child>
-                  <widget class="GtkImage" id="image834">
-                    <property name="visible">True</property>
-                    <property name="stock">gtk-clear</property>
-                    <property name="icon_size">1</property>
-                  </widget>
-                </child>
-              </widget>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">1</property>
-              </packing>
-            </child>
-          </widget>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="right_attach">2</property>
-            <property name="top_attach">1</property>
-            <property name="bottom_attach">2</property>
-            <property name="x_options">GTK_FILL</property>
-            <property name="y_options">GTK_FILL</property>
-          </packing>
-        </child>
-        <child>
-          <widget class="GtkButton" id="button_change_password">
-            <property name="visible">True</property>
-            <property name="sensitive">False</property>
-            <property name="can_focus">True</property>
-            <property name="label" translatable="yes">C_hange</property>
-            <property name="use_underline">True</property>
-          </widget>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="right_attach">3</property>
-            <property name="top_attach">1</property>
-            <property name="bottom_attach">2</property>
-            <property name="x_options">GTK_FILL</property>
-            <property name="y_options"></property>
-          </packing>
-        </child>
-        <child>
-          <widget class="GtkEntry" id="entry_id">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="invisible_char">*</property>
-          </widget>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="right_attach">2</property>
-            <property name="y_options"></property>
-          </packing>
-        </child>
-        <child>
-          <widget class="GtkButton" id="button_register">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="label" translatable="yes">R_egister</property>
-            <property name="use_underline">True</property>
-          </widget>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="right_attach">3</property>
-            <property name="x_options">GTK_FILL</property>
-            <property name="y_options"></property>
-          </packing>
-        </child>
-      </widget>
-    </child>
-  </widget>
-  <widget class="GtkWindow" id="account_msn_settings">
-    <property name="visible">True</property>
-    <property name="title" translatable="yes">msn account settings</property>
-    <property name="resizable">False</property>
-    <child>
-      <widget class="GtkTable" id="vbox_msn_settings">
-        <property name="visible">True</property>
-        <property name="n_rows">4</property>
-        <property name="n_columns">2</property>
-        <property name="column_spacing">12</property>
-        <property name="row_spacing">6</property>
-        <child>
-          <widget class="GtkLabel" id="label_id">
-            <property name="visible">True</property>
-            <property name="xalign">0</property>
-            <property name="label" translatable="yes">Login I_D:</property>
-            <property name="use_underline">True</property>
-            <property name="mnemonic_widget">entry_id</property>
-          </widget>
-          <packing>
-            <property name="x_options">GTK_FILL</property>
-            <property name="y_options"></property>
-          </packing>
-        </child>
-        <child>
-          <widget class="GtkLabel" id="label_password">
-            <property name="visible">True</property>
-            <property name="xalign">0</property>
-            <property name="label" translatable="yes">Pass_word:</property>
-            <property name="use_underline">True</property>
-            <property name="mnemonic_widget">entry_password</property>
-          </widget>
-          <packing>
-            <property name="top_attach">1</property>
-            <property name="bottom_attach">2</property>
-            <property name="x_options">GTK_FILL</property>
-            <property name="y_options"></property>
-          </packing>
-        </child>
-        <child>
-          <widget class="GtkHBox" id="hbox182">
-            <property name="visible">True</property>
-            <property name="spacing">2</property>
-            <child>
-              <widget class="GtkEntry" id="entry_password">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="visibility">False</property>
-                <property name="invisible_char">*</property>
-              </widget>
-            </child>
-            <child>
-              <widget class="GtkButton" id="button_forget">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="tooltip" translatable="yes">Forget password and clear the entry.</property>
-                <child>
-                  <widget class="GtkImage" id="image839">
-                    <property name="visible">True</property>
-                    <property name="stock">gtk-clear</property>
-                    <property name="icon_size">1</property>
-                  </widget>
-                </child>
-              </widget>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">1</property>
-              </packing>
-            </child>
-          </widget>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="right_attach">2</property>
-            <property name="top_attach">1</property>
-            <property name="bottom_attach">2</property>
-            <property name="x_options">GTK_FILL</property>
-            <property name="y_options">GTK_FILL</property>
-          </packing>
-        </child>
-        <child>
-          <widget class="GtkEntry" id="entry_id">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="invisible_char">*</property>
-          </widget>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="right_attach">2</property>
-            <property name="y_options"></property>
-          </packing>
-        </child>
-        <child>
-          <widget class="GtkLabel" id="label_server">
-            <property name="visible">True</property>
-            <property name="xalign">0</property>
-            <property name="label" translatable="yes">_Server:</property>
-            <property name="use_underline">True</property>
-            <property name="mnemonic_widget">entry_server</property>
-          </widget>
-          <packing>
-            <property name="top_attach">2</property>
-            <property name="bottom_attach">3</property>
-            <property name="x_options">GTK_FILL</property>
-            <property name="y_options"></property>
-          </packing>
-        </child>
-        <child>
-          <widget class="GtkEntry" id="entry_server">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="invisible_char">*</property>
-          </widget>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="right_attach">2</property>
-            <property name="top_attach">2</property>
-            <property name="bottom_attach">3</property>
-            <property name="y_options"></property>
-          </packing>
-        </child>
-        <child>
-          <widget class="GtkLabel" id="label_port">
-            <property name="visible">True</property>
-            <property name="xalign">0</property>
-            <property name="label" translatable="yes">_Port:</property>
-            <property name="use_underline">True</property>
-            <property name="mnemonic_widget">entry_port</property>
-          </widget>
-          <packing>
-            <property name="top_attach">3</property>
-            <property name="bottom_attach">4</property>
-            <property name="x_options">GTK_FILL</property>
-            <property name="y_options"></property>
-          </packing>
-        </child>
-        <child>
-          <widget class="GtkEntry" id="entry_port">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="invisible_char">*</property>
-          </widget>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="right_attach">2</property>
-            <property name="top_attach">3</property>
-            <property name="bottom_attach">4</property>
-            <property name="y_options"></property>
-          </packing>
-        </child>
-      </widget>
-    </child>
-  </widget>
-</glade-interface>
diff --git a/libempathy-gtk/empathy-chat.glade b/libempathy-gtk/empathy-chat.glade
deleted file mode 100644 (file)
index e8bd47c..0000000
+++ /dev/null
@@ -1,700 +0,0 @@
-<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
-<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
-
-<glade-interface>
-<requires lib="gnome"/>
-
-<widget class="GtkWindow" id="chat_page_window">
-  <property name="title" translatable="yes">Chat</property>
-  <property name="type">GTK_WINDOW_TOPLEVEL</property>
-  <property name="window_position">GTK_WIN_POS_NONE</property>
-  <property name="modal">False</property>
-  <property name="default_width">350</property>
-  <property name="default_height">250</property>
-  <property name="resizable">True</property>
-  <property name="destroy_with_parent">False</property>
-  <property name="decorated">True</property>
-  <property name="skip_taskbar_hint">False</property>
-  <property name="skip_pager_hint">False</property>
-  <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
-  <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
-  <property name="focus_on_map">True</property>
-  <property name="urgency_hint">False</property>
-
-  <child>
-    <widget class="GtkVBox" id="chat_widget">
-      <property name="border_width">4</property>
-      <property name="visible">True</property>
-      <property name="homogeneous">False</property>
-      <property name="spacing">3</property>
-
-      <child>
-       <widget class="GtkScrolledWindow" id="chat_view_sw">
-         <property name="visible">True</property>
-         <property name="can_focus">True</property>
-         <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-         <property name="vscrollbar_policy">GTK_POLICY_ALWAYS</property>
-         <property name="shadow_type">GTK_SHADOW_IN</property>
-         <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
-
-         <child>
-           <placeholder/>
-         </child>
-       </widget>
-       <packing>
-         <property name="padding">0</property>
-         <property name="expand">True</property>
-         <property name="fill">True</property>
-       </packing>
-      </child>
-
-      <child>
-       <widget class="GtkScrolledWindow" id="input_text_view_sw">
-         <property name="visible">True</property>
-         <property name="can_focus">True</property>
-         <property name="hscrollbar_policy">GTK_POLICY_NEVER</property>
-         <property name="vscrollbar_policy">GTK_POLICY_NEVER</property>
-         <property name="shadow_type">GTK_SHADOW_IN</property>
-         <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
-
-         <child>
-           <placeholder/>
-         </child>
-       </widget>
-       <packing>
-         <property name="padding">0</property>
-         <property name="expand">False</property>
-         <property name="fill">False</property>
-       </packing>
-      </child>
-    </widget>
-  </child>
-</widget>
-
-<widget class="GtkWindow" id="chat_window">
-  <property name="title" translatable="yes">Chat</property>
-  <property name="type">GTK_WINDOW_TOPLEVEL</property>
-  <property name="window_position">GTK_WIN_POS_NONE</property>
-  <property name="modal">False</property>
-  <property name="default_width">350</property>
-  <property name="default_height">250</property>
-  <property name="resizable">True</property>
-  <property name="destroy_with_parent">False</property>
-  <property name="decorated">True</property>
-  <property name="skip_taskbar_hint">False</property>
-  <property name="skip_pager_hint">False</property>
-  <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
-  <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
-  <property name="focus_on_map">True</property>
-  <property name="urgency_hint">False</property>
-
-  <child>
-    <widget class="GtkVBox" id="chat_vbox">
-      <property name="visible">True</property>
-      <property name="homogeneous">False</property>
-      <property name="spacing">0</property>
-
-      <child>
-       <widget class="GtkMenuBar" id="chats_menubar">
-         <property name="visible">True</property>
-         <property name="pack_direction">GTK_PACK_DIRECTION_LTR</property>
-         <property name="child_pack_direction">GTK_PACK_DIRECTION_LTR</property>
-
-         <child>
-           <widget class="GtkMenuItem" id="menu_conv">
-             <property name="visible">True</property>
-             <property name="label" translatable="yes">_Conversation</property>
-             <property name="use_underline">True</property>
-
-             <child>
-               <widget class="GtkMenu" id="menu_conv_menu">
-
-                 <child>
-                   <widget class="GtkImageMenuItem" id="menu_conv_clear">
-                     <property name="visible">True</property>
-                     <property name="label" translatable="yes">C_lear</property>
-                     <property name="use_underline">True</property>
-
-                     <child internal-child="image">
-                       <widget class="GtkImage" id="image235">
-                         <property name="visible">True</property>
-                         <property name="stock">gtk-clear</property>
-                         <property name="icon_size">1</property>
-                         <property name="xalign">0.5</property>
-                         <property name="yalign">0.5</property>
-                         <property name="xpad">0</property>
-                         <property name="ypad">0</property>
-                       </widget>
-                     </child>
-                   </widget>
-                 </child>
-
-                 <child>
-                   <widget class="GtkMenuItem" id="menu_conv_insert_smiley">
-                     <property name="visible">True</property>
-                     <property name="label" translatable="yes">Insert _Smiley</property>
-                     <property name="use_underline">True</property>
-                   </widget>
-                 </child>
-
-                 <child>
-                   <widget class="GtkSeparatorMenuItem" id="separator11">
-                     <property name="visible">True</property>
-                   </widget>
-                 </child>
-
-                 <child>
-                   <widget class="GtkImageMenuItem" id="menu_conv_log">
-                     <property name="visible">True</property>
-                     <property name="label" translatable="yes">_View Previous Conversations</property>
-                     <property name="use_underline">True</property>
-                     <accelerator key="F3" modifiers="0" signal="activate"/>
-
-                     <child internal-child="image">
-                       <widget class="GtkImage" id="image236">
-                         <property name="visible">True</property>
-                         <property name="stock">gtk-justify-left</property>
-                         <property name="icon_size">1</property>
-                         <property name="xalign">0.5</property>
-                         <property name="yalign">0.5</property>
-                         <property name="xpad">0</property>
-                         <property name="ypad">0</property>
-                       </widget>
-                     </child>
-                   </widget>
-                 </child>
-
-                 <child>
-                   <widget class="GtkSeparatorMenuItem" id="menu_conv_separator">
-                     <property name="visible">True</property>
-                   </widget>
-                 </child>
-
-                 <child>
-                   <widget class="GtkImageMenuItem" id="menu_conv_add_contact">
-                     <property name="label" translatable="yes">_Add Contact...</property>
-                     <property name="use_underline">True</property>
-
-                     <child internal-child="image">
-                       <widget class="GtkImage" id="image237">
-                         <property name="visible">True</property>
-                         <property name="stock">gtk-add</property>
-                         <property name="icon_size">1</property>
-                         <property name="xalign">0.5</property>
-                         <property name="yalign">0.5</property>
-                         <property name="xpad">0</property>
-                         <property name="ypad">0</property>
-                       </widget>
-                     </child>
-                   </widget>
-                 </child>
-
-                 <child>
-                   <widget class="GtkImageMenuItem" id="menu_conv_info">
-                     <property name="visible">True</property>
-                     <property name="label" translatable="yes">Contact Infor_mation</property>
-                     <property name="use_underline">True</property>
-
-                     <child internal-child="image">
-                       <widget class="GtkImage" id="image238">
-                         <property name="visible">True</property>
-                         <property name="stock">gtk-info</property>
-                         <property name="icon_size">1</property>
-                         <property name="xalign">0.5</property>
-                         <property name="yalign">0.5</property>
-                         <property name="xpad">0</property>
-                         <property name="ypad">0</property>
-                       </widget>
-                     </child>
-                   </widget>
-                 </child>
-
-                 <child>
-                   <widget class="GtkSeparatorMenuItem" id="separator7">
-                     <property name="visible">True</property>
-                   </widget>
-                 </child>
-
-                 <child>
-                   <widget class="GtkImageMenuItem" id="menu_conv_close">
-                     <property name="visible">True</property>
-                     <property name="label" translatable="yes">_Close</property>
-                     <property name="use_underline">True</property>
-                     <accelerator key="W" modifiers="GDK_CONTROL_MASK" signal="activate"/>
-
-                     <child internal-child="image">
-                       <widget class="GtkImage" id="image239">
-                         <property name="visible">True</property>
-                         <property name="stock">gtk-close</property>
-                         <property name="icon_size">1</property>
-                         <property name="xalign">0.5</property>
-                         <property name="yalign">0.5</property>
-                         <property name="xpad">0</property>
-                         <property name="ypad">0</property>
-                       </widget>
-                     </child>
-                   </widget>
-                 </child>
-               </widget>
-             </child>
-           </widget>
-         </child>
-
-         <child>
-           <widget class="GtkMenuItem" id="menu_room">
-             <property name="label" translatable="yes">_Room</property>
-             <property name="use_underline">True</property>
-
-             <child>
-               <widget class="GtkMenu" id="menu_room_menu">
-
-                 <child>
-                   <widget class="GtkMenuItem" id="menu_room_set_topic">
-                     <property name="visible">True</property>
-                     <property name="label" translatable="yes">Change _Topic...</property>
-                     <property name="use_underline">True</property>
-                   </widget>
-                 </child>
-
-                 <child>
-                   <widget class="GtkSeparatorMenuItem" id="separator12">
-                     <property name="visible">True</property>
-                   </widget>
-                 </child>
-
-                 <child>
-                   <widget class="GtkImageMenuItem" id="menu_room_join_new">
-                     <property name="visible">True</property>
-                     <property name="label" translatable="yes">Join _New...</property>
-                     <property name="use_underline">True</property>
-
-                     <child internal-child="image">
-                       <widget class="GtkImage" id="image240">
-                         <property name="visible">True</property>
-                         <property name="stock">gtk-new</property>
-                         <property name="icon_size">1</property>
-                         <property name="xalign">0.5</property>
-                         <property name="yalign">0.5</property>
-                         <property name="xpad">0</property>
-                         <property name="ypad">0</property>
-                       </widget>
-                     </child>
-                   </widget>
-                 </child>
-
-                 <child>
-                   <widget class="GtkMenuItem" id="menu_room_invite">
-                     <property name="visible">True</property>
-                     <property name="label" translatable="yes">In_vite...</property>
-                     <property name="use_underline">True</property>
-                   </widget>
-                 </child>
-
-                 <child>
-                   <widget class="GtkSeparatorMenuItem" id="separator7">
-                     <property name="visible">True</property>
-                   </widget>
-                 </child>
-
-                 <child>
-                   <widget class="GtkImageMenuItem" id="menu_room_add">
-                     <property name="visible">True</property>
-                     <property name="label" translatable="yes">_Add To Favorites</property>
-                     <property name="use_underline">True</property>
-
-                     <child internal-child="image">
-                       <widget class="GtkImage" id="image241">
-                         <property name="visible">True</property>
-                         <property name="stock">gtk-add</property>
-                         <property name="icon_size">1</property>
-                         <property name="xalign">0.5</property>
-                         <property name="yalign">0.5</property>
-                         <property name="xpad">0</property>
-                         <property name="ypad">0</property>
-                       </widget>
-                     </child>
-                   </widget>
-                 </child>
-
-                 <child>
-                   <widget class="GtkSeparatorMenuItem" id="separator10">
-                     <property name="visible">True</property>
-                   </widget>
-                 </child>
-
-                 <child>
-                   <widget class="GtkCheckMenuItem" id="menu_room_show_contacts">
-                     <property name="visible">True</property>
-                     <property name="label" translatable="yes">_Show Contacts</property>
-                     <property name="use_underline">True</property>
-                     <property name="active">True</property>
-                     <accelerator key="F11" modifiers="0" signal="activate"/>
-                   </widget>
-                 </child>
-               </widget>
-             </child>
-           </widget>
-         </child>
-
-         <child>
-           <widget class="GtkMenuItem" id="menu_edit">
-             <property name="visible">True</property>
-             <property name="label" translatable="yes">_Edit</property>
-             <property name="use_underline">True</property>
-
-             <child>
-               <widget class="GtkMenu" id="menu_edit_menu">
-
-                 <child>
-                   <widget class="GtkImageMenuItem" id="menu_edit_cut">
-                     <property name="visible">True</property>
-                     <property name="label" translatable="yes">Cu_t</property>
-                     <property name="use_underline">True</property>
-                     <accelerator key="X" modifiers="GDK_CONTROL_MASK" signal="activate"/>
-
-                     <child internal-child="image">
-                       <widget class="GtkImage" id="image242">
-                         <property name="visible">True</property>
-                         <property name="stock">gtk-cut</property>
-                         <property name="icon_size">1</property>
-                         <property name="xalign">0.5</property>
-                         <property name="yalign">0.5</property>
-                         <property name="xpad">0</property>
-                         <property name="ypad">0</property>
-                       </widget>
-                     </child>
-                   </widget>
-                 </child>
-
-                 <child>
-                   <widget class="GtkImageMenuItem" id="menu_edit_copy">
-                     <property name="visible">True</property>
-                     <property name="label" translatable="yes">_Copy</property>
-                     <property name="use_underline">True</property>
-                     <accelerator key="C" modifiers="GDK_CONTROL_MASK" signal="activate"/>
-
-                     <child internal-child="image">
-                       <widget class="GtkImage" id="image243">
-                         <property name="visible">True</property>
-                         <property name="stock">gtk-copy</property>
-                         <property name="icon_size">1</property>
-                         <property name="xalign">0.5</property>
-                         <property name="yalign">0.5</property>
-                         <property name="xpad">0</property>
-                         <property name="ypad">0</property>
-                       </widget>
-                     </child>
-                   </widget>
-                 </child>
-
-                 <child>
-                   <widget class="GtkImageMenuItem" id="menu_edit_paste">
-                     <property name="visible">True</property>
-                     <property name="label" translatable="yes">_Paste</property>
-                     <property name="use_underline">True</property>
-                     <accelerator key="V" modifiers="GDK_CONTROL_MASK" signal="activate"/>
-
-                     <child internal-child="image">
-                       <widget class="GtkImage" id="image244">
-                         <property name="visible">True</property>
-                         <property name="stock">gtk-paste</property>
-                         <property name="icon_size">1</property>
-                         <property name="xalign">0.5</property>
-                         <property name="yalign">0.5</property>
-                         <property name="xpad">0</property>
-                         <property name="ypad">0</property>
-                       </widget>
-                     </child>
-                   </widget>
-                 </child>
-               </widget>
-             </child>
-           </widget>
-         </child>
-
-         <child>
-           <widget class="GtkMenuItem" id="menu_tabs">
-             <property name="visible">True</property>
-             <property name="label" translatable="yes">_Tabs</property>
-             <property name="use_underline">True</property>
-
-             <child>
-               <widget class="GtkMenu" id="menu_tabs_menu">
-
-                 <child>
-                   <widget class="GtkMenuItem" id="menu_tabs_prev">
-                     <property name="visible">True</property>
-                     <property name="label" translatable="yes">_Previous Tab</property>
-                     <property name="use_underline">True</property>
-                     <accelerator key="Page_Up" modifiers="GDK_CONTROL_MASK" signal="activate"/>
-                   </widget>
-                 </child>
-
-                 <child>
-                   <widget class="GtkMenuItem" id="menu_tabs_next">
-                     <property name="visible">True</property>
-                     <property name="label" translatable="yes">_Next Tab</property>
-                     <property name="use_underline">True</property>
-                     <accelerator key="Page_Down" modifiers="GDK_CONTROL_MASK" signal="activate"/>
-                   </widget>
-                 </child>
-
-                 <child>
-                   <widget class="GtkSeparatorMenuItem" id="separator4">
-                     <property name="visible">True</property>
-                   </widget>
-                 </child>
-
-                 <child>
-                   <widget class="GtkMenuItem" id="menu_tabs_left">
-                     <property name="visible">True</property>
-                     <property name="label" translatable="yes">Move Tab _Left</property>
-                     <property name="use_underline">True</property>
-                   </widget>
-                 </child>
-
-                 <child>
-                   <widget class="GtkMenuItem" id="menu_tabs_right">
-                     <property name="visible">True</property>
-                     <property name="label" translatable="yes">Move Tab _Right</property>
-                     <property name="use_underline">True</property>
-                   </widget>
-                 </child>
-
-                 <child>
-                   <widget class="GtkMenuItem" id="menu_tabs_detach">
-                     <property name="visible">True</property>
-                     <property name="label" translatable="yes">_Detach Tab</property>
-                     <property name="use_underline">True</property>
-                   </widget>
-                 </child>
-               </widget>
-             </child>
-           </widget>
-         </child>
-       </widget>
-       <packing>
-         <property name="padding">0</property>
-         <property name="expand">False</property>
-         <property name="fill">False</property>
-       </packing>
-      </child>
-
-      <child>
-       <placeholder/>
-      </child>
-    </widget>
-  </child>
-</widget>
-
-<widget class="GtkDialog" id="chat_invite_dialog">
-  <property name="border_width">5</property>
-  <property name="title" translatable="yes">Invite</property>
-  <property name="type">GTK_WINDOW_TOPLEVEL</property>
-  <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
-  <property name="modal">True</property>
-  <property name="default_width">275</property>
-  <property name="default_height">225</property>
-  <property name="resizable">True</property>
-  <property name="destroy_with_parent">False</property>
-  <property name="decorated">True</property>
-  <property name="skip_taskbar_hint">False</property>
-  <property name="skip_pager_hint">False</property>
-  <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
-  <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
-  <property name="focus_on_map">True</property>
-  <property name="urgency_hint">False</property>
-  <property name="has_separator">False</property>
-
-  <child internal-child="vbox">
-    <widget class="GtkVBox" id="vbox6">
-      <property name="visible">True</property>
-      <property name="homogeneous">False</property>
-      <property name="spacing">0</property>
-
-      <child internal-child="action_area">
-       <widget class="GtkHButtonBox" id="hbuttonbox1">
-         <property name="visible">True</property>
-         <property name="layout_style">GTK_BUTTONBOX_END</property>
-
-         <child>
-           <widget class="GtkButton" id="button_cancel">
-             <property name="visible">True</property>
-             <property name="can_default">True</property>
-             <property name="can_focus">True</property>
-             <property name="label">gtk-cancel</property>
-             <property name="use_stock">True</property>
-             <property name="relief">GTK_RELIEF_NORMAL</property>
-             <property name="focus_on_click">True</property>
-             <property name="response_id">-6</property>
-           </widget>
-         </child>
-
-         <child>
-           <widget class="GtkButton" id="button_invite">
-             <property name="visible">True</property>
-             <property name="sensitive">False</property>
-             <property name="can_default">True</property>
-             <property name="has_default">True</property>
-             <property name="can_focus">True</property>
-             <property name="label">In_vite</property>
-             <property name="use_underline">True</property>
-             <property name="relief">GTK_RELIEF_NORMAL</property>
-             <property name="focus_on_click">True</property>
-             <property name="response_id">-5</property>
-           </widget>
-         </child>
-       </widget>
-       <packing>
-         <property name="padding">0</property>
-         <property name="expand">False</property>
-         <property name="fill">True</property>
-         <property name="pack_type">GTK_PACK_END</property>
-       </packing>
-      </child>
-
-      <child>
-       <widget class="GtkVBox" id="vbox7">
-         <property name="border_width">5</property>
-         <property name="visible">True</property>
-         <property name="homogeneous">False</property>
-         <property name="spacing">18</property>
-
-         <child>
-           <widget class="GtkVBox" id="vbox7">
-             <property name="visible">True</property>
-             <property name="homogeneous">False</property>
-             <property name="spacing">6</property>
-
-             <child>
-               <widget class="GtkLabel" id="label">
-                 <property name="visible">True</property>
-                 <property name="label" translatable="yes">Select who would you like to invite:</property>
-                 <property name="use_underline">False</property>
-                 <property name="use_markup">True</property>
-                 <property name="justify">GTK_JUSTIFY_LEFT</property>
-                 <property name="wrap">True</property>
-                 <property name="selectable">False</property>
-                 <property name="xalign">0</property>
-                 <property name="yalign">0.5</property>
-                 <property name="xpad">0</property>
-                 <property name="ypad">0</property>
-                 <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                 <property name="width_chars">-1</property>
-                 <property name="single_line_mode">False</property>
-                 <property name="angle">0</property>
-               </widget>
-               <packing>
-                 <property name="padding">0</property>
-                 <property name="expand">False</property>
-                 <property name="fill">False</property>
-               </packing>
-             </child>
-
-             <child>
-               <widget class="GtkScrolledWindow" id="scrolledwindow1">
-                 <property name="visible">True</property>
-                 <property name="can_focus">True</property>
-                 <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-                 <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-                 <property name="shadow_type">GTK_SHADOW_IN</property>
-                 <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
-
-                 <child>
-                   <widget class="GtkTreeView" id="treeview">
-                     <property name="visible">True</property>
-                     <property name="can_focus">True</property>
-                     <property name="headers_visible">False</property>
-                     <property name="rules_hint">False</property>
-                     <property name="reorderable">False</property>
-                     <property name="enable_search">True</property>
-                     <property name="fixed_height_mode">False</property>
-                     <property name="hover_selection">False</property>
-                     <property name="hover_expand">False</property>
-                   </widget>
-                 </child>
-               </widget>
-               <packing>
-                 <property name="padding">0</property>
-                 <property name="expand">True</property>
-                 <property name="fill">True</property>
-               </packing>
-             </child>
-           </widget>
-           <packing>
-             <property name="padding">0</property>
-             <property name="expand">True</property>
-             <property name="fill">True</property>
-           </packing>
-         </child>
-
-         <child>
-           <widget class="GtkVBox" id="vbox8">
-             <property name="visible">True</property>
-             <property name="homogeneous">False</property>
-             <property name="spacing">6</property>
-
-             <child>
-               <widget class="GtkLabel" id="label4">
-                 <property name="visible">True</property>
-                 <property name="label" translatable="yes">Invitation _message:</property>
-                 <property name="use_underline">True</property>
-                 <property name="use_markup">True</property>
-                 <property name="justify">GTK_JUSTIFY_LEFT</property>
-                 <property name="wrap">True</property>
-                 <property name="selectable">False</property>
-                 <property name="xalign">0</property>
-                 <property name="yalign">0.5</property>
-                 <property name="xpad">0</property>
-                 <property name="ypad">0</property>
-                 <property name="mnemonic_widget">entry</property>
-                 <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                 <property name="width_chars">-1</property>
-                 <property name="single_line_mode">False</property>
-                 <property name="angle">0</property>
-               </widget>
-               <packing>
-                 <property name="padding">0</property>
-                 <property name="expand">False</property>
-                 <property name="fill">False</property>
-               </packing>
-             </child>
-
-             <child>
-               <widget class="GtkEntry" id="entry">
-                 <property name="visible">True</property>
-                 <property name="can_focus">True</property>
-                 <property name="editable">True</property>
-                 <property name="visibility">True</property>
-                 <property name="max_length">0</property>
-                 <property name="text" translatable="yes">You have been invited to join a chat conference.</property>
-                 <property name="has_frame">True</property>
-                 <property name="invisible_char">*</property>
-                 <property name="activates_default">True</property>
-                 <property name="width_chars">40</property>
-               </widget>
-               <packing>
-                 <property name="padding">0</property>
-                 <property name="expand">False</property>
-                 <property name="fill">False</property>
-               </packing>
-             </child>
-           </widget>
-           <packing>
-             <property name="padding">0</property>
-             <property name="expand">False</property>
-             <property name="fill">False</property>
-           </packing>
-         </child>
-       </widget>
-       <packing>
-         <property name="padding">0</property>
-         <property name="expand">True</property>
-         <property name="fill">True</property>
-       </packing>
-      </child>
-    </widget>
-  </child>
-</widget>
-
-</glade-interface>
diff --git a/libempathy-gtk/gossip-account-widget-jabber.c b/libempathy-gtk/gossip-account-widget-jabber.c
new file mode 100644 (file)
index 0000000..589bfcc
--- /dev/null
@@ -0,0 +1,265 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
+/*
+ * Copyright (C) 2005-2007 Imendio AB
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with this program; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ * 
+ * Authors: Martyn Russell <martyn@imendio.com>
+ */
+
+#include "config.h"
+
+#include <ctype.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include <glib/gi18n.h>
+#include <gtk/gtk.h>
+#include <glade/glade.h>
+
+#include <libempathy/gossip-utils.h>
+
+#include "gossip-account-widget-jabber.h"
+#include "gossip-ui-utils.h"
+
+#define PORT_WITHOUT_SSL 5222
+#define PORT_WITH_SSL 5223
+
+typedef struct {
+       McAccount *account;
+
+       GtkWidget *vbox_settings;
+       GtkWidget *button_forget;
+       GtkWidget *entry_id;
+       GtkWidget *entry_password;
+       GtkWidget *entry_resource;
+       GtkWidget *entry_server;
+       GtkWidget *spinbutton_port;
+       GtkWidget *checkbutton_ssl;
+} GossipAccountWidgetJabber;
+
+static gboolean account_widget_jabber_entry_focus_cb           (GtkWidget                 *widget,
+                                                               GdkEventFocus             *event,
+                                                               GossipAccountWidgetJabber *settings);
+static void     account_widget_jabber_entry_changed_cb         (GtkWidget                 *widget,
+                                                               GossipAccountWidgetJabber *settings);
+static void     account_widget_jabber_checkbutton_toggled_cb   (GtkWidget                 *widget,
+                                                               GossipAccountWidgetJabber *settings);
+static void     account_widget_jabber_value_changed_cb         (GtkWidget                 *spinbutton,
+                                                               GossipAccountWidgetJabber *settings);
+static void     account_widget_jabber_button_forget_clicked_cb (GtkWidget                 *button,
+                                                               GossipAccountWidgetJabber *settings);
+static void     account_widget_jabber_destroy_cb               (GtkWidget                 *widget,
+                                                               GossipAccountWidgetJabber *settings);
+static void     account_widget_jabber_setup                    (GossipAccountWidgetJabber *settings);
+
+static gboolean
+account_widget_jabber_entry_focus_cb (GtkWidget                 *widget,
+                                     GdkEventFocus             *event,
+                                     GossipAccountWidgetJabber *settings)
+{
+       const gchar *param;
+       const gchar *str;
+
+       if (widget == settings->entry_password) {
+               param = "password";
+       }
+       else if (widget == settings->entry_resource) {
+               param = "resource";
+       }
+       else if (widget == settings->entry_server) {
+               param = "server";
+       }
+       else if (widget == settings->entry_id) {
+               param = "account";
+       } else {
+               return FALSE;
+       }
+
+       str = gtk_entry_get_text (GTK_ENTRY (widget));
+       if (G_STR_EMPTY (str)) {
+               gchar *value;
+
+               mc_account_get_param_string (settings->account, param, &value);
+               gtk_entry_set_text (GTK_ENTRY (widget), value ? value : "");
+               g_free (value);
+       } else {
+               mc_account_set_param_string (settings->account, param, str);
+       }
+
+       return FALSE;
+}
+
+static void
+account_widget_jabber_entry_changed_cb (GtkWidget                 *widget,
+                                       GossipAccountWidgetJabber *settings)
+{
+       if (widget == settings->entry_password) {
+               const gchar *str;
+
+               str = gtk_entry_get_text (GTK_ENTRY (widget));
+               gtk_widget_set_sensitive (settings->button_forget, !G_STR_EMPTY (str));
+       }
+}
+
+static void  
+account_widget_jabber_checkbutton_toggled_cb (GtkWidget                 *widget,
+                                             GossipAccountWidgetJabber *settings)
+{
+       if (widget == settings->checkbutton_ssl) {
+               gint     port;
+               gboolean old_ssl;
+
+               mc_account_get_param_int (settings->account, "port", &port);
+               old_ssl = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget));
+
+               if (old_ssl) {
+                       if (port == PORT_WITHOUT_SSL) {
+                               port = PORT_WITH_SSL;
+                       }
+               } else {
+                       if (port == PORT_WITH_SSL) {
+                               port = PORT_WITHOUT_SSL;
+                       }
+               }
+               
+               mc_account_set_param_int (settings->account, "port", port);
+               mc_account_set_param_boolean (settings->account, "old-ssl", old_ssl);
+               gtk_spin_button_set_value (GTK_SPIN_BUTTON (settings->spinbutton_port), port);
+       }
+}
+
+static void
+account_widget_jabber_value_changed_cb (GtkWidget                 *spinbutton,
+                                       GossipAccountWidgetJabber *settings)
+{
+       if (spinbutton == settings->spinbutton_port) {
+               gdouble value;
+
+               value = gtk_spin_button_get_value (GTK_SPIN_BUTTON (spinbutton));
+               mc_account_set_param_int (settings->account, "port", (gint) value);
+       }
+}
+
+static void
+account_widget_jabber_button_forget_clicked_cb (GtkWidget                 *button,
+                                               GossipAccountWidgetJabber *settings)
+{
+       mc_account_set_param_string (settings->account, "password", "");
+       gtk_entry_set_text (GTK_ENTRY (settings->entry_password), "");
+}
+
+static void
+account_widget_jabber_destroy_cb (GtkWidget                 *widget,
+                                 GossipAccountWidgetJabber *settings)
+{
+       g_object_unref (settings->account);
+       g_free (settings);
+}
+
+static void
+account_widget_jabber_setup (GossipAccountWidgetJabber *settings)
+{
+       gint      port;
+       gchar    *id;
+       gchar    *resource;
+       gchar    *server;
+       gchar    *password;
+       gboolean  old_ssl;
+
+       mc_account_get_param_int (settings->account, "port", &port);
+       mc_account_get_param_string (settings->account, "account", &id);
+       mc_account_get_param_string (settings->account, "resource", &resource);
+       mc_account_get_param_string (settings->account, "server", &server);
+       mc_account_get_param_string (settings->account, "password", &password);
+       mc_account_get_param_boolean (settings->account, "old-ssl", &old_ssl);
+
+       gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (settings->checkbutton_ssl), old_ssl);
+       gtk_entry_set_text (GTK_ENTRY (settings->entry_id), id ? id : "");
+       gtk_entry_set_text (GTK_ENTRY (settings->entry_password), password ? password : "");
+       gtk_entry_set_text (GTK_ENTRY (settings->entry_resource), resource ? resource : "");
+       gtk_entry_set_text (GTK_ENTRY (settings->entry_server), server ? server : "");
+       gtk_spin_button_set_value (GTK_SPIN_BUTTON (settings->spinbutton_port), port);
+
+       gtk_widget_set_sensitive (settings->button_forget, !G_STR_EMPTY (password));
+
+       g_free (id);
+       g_free (resource);
+       g_free (server);
+       g_free (password);
+}
+
+GtkWidget *
+gossip_account_widget_jabber_new (McAccount *account)
+{
+       GossipAccountWidgetJabber *settings;
+       GladeXML                  *glade;
+       GtkSizeGroup              *size_group;
+       GtkWidget                 *label_id, *label_password;
+       GtkWidget                 *label_server, *label_resource, *label_port; 
+
+       settings = g_new0 (GossipAccountWidgetJabber, 1);
+       settings->account = g_object_ref (account);
+
+       glade = gossip_glade_get_file ("gossip-account-widget-jabber.glade",
+                                      "vbox_jabber_settings",
+                                      NULL,
+                                      "vbox_jabber_settings", &settings->vbox_settings,
+                                      "button_forget", &settings->button_forget,
+                                      "label_id", &label_id,
+                                      "label_password", &label_password,
+                                      "label_resource", &label_resource,
+                                      "label_server", &label_server,
+                                      "label_port", &label_port,
+                                      "entry_id", &settings->entry_id,
+                                      "entry_password", &settings->entry_password,
+                                      "entry_resource", &settings->entry_resource,
+                                      "entry_server", &settings->entry_server,
+                                      "spinbutton_port", &settings->spinbutton_port,
+                                      "checkbutton_ssl", &settings->checkbutton_ssl,
+                                      NULL);
+
+       account_widget_jabber_setup (settings);
+
+       gossip_glade_connect (glade, 
+                             settings,
+                             "vbox_jabber_settings", "destroy", account_widget_jabber_destroy_cb,
+                             "button_forget", "clicked", account_widget_jabber_button_forget_clicked_cb,
+                             "entry_password", "changed", account_widget_jabber_entry_changed_cb,
+                             "spinbutton_port", "value-changed", account_widget_jabber_value_changed_cb,
+                             "entry_id", "focus-out-event", account_widget_jabber_entry_focus_cb,
+                             "entry_password", "focus-out-event", account_widget_jabber_entry_focus_cb,
+                             "entry_resource", "focus-out-event", account_widget_jabber_entry_focus_cb,
+                             "entry_server", "focus-out-event", account_widget_jabber_entry_focus_cb,
+                             "checkbutton_ssl", "toggled", account_widget_jabber_checkbutton_toggled_cb,
+                             NULL);
+
+       g_object_unref (glade);
+
+       /* Set up remaining widgets */
+       size_group = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
+
+       gtk_size_group_add_widget (size_group, label_id);
+       gtk_size_group_add_widget (size_group, label_password);
+       gtk_size_group_add_widget (size_group, label_resource);
+       gtk_size_group_add_widget (size_group, label_server);
+       gtk_size_group_add_widget (size_group, label_port);
+
+       g_object_unref (size_group);
+
+       return settings->vbox_settings;
+}
+
diff --git a/libempathy-gtk/gossip-account-widget-jabber.glade b/libempathy-gtk/gossip-account-widget-jabber.glade
new file mode 100644 (file)
index 0000000..24f3b71
--- /dev/null
@@ -0,0 +1,337 @@
+<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
+<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
+
+<glade-interface>
+<requires lib="gnome"/>
+
+<widget class="GtkWindow" id="account_jabber_settings">
+  <property name="visible">True</property>
+  <property name="title" translatable="yes">jabber account settings</property>
+  <property name="type">GTK_WINDOW_TOPLEVEL</property>
+  <property name="window_position">GTK_WIN_POS_NONE</property>
+  <property name="modal">False</property>
+  <property name="resizable">False</property>
+  <property name="destroy_with_parent">False</property>
+  <property name="decorated">True</property>
+  <property name="skip_taskbar_hint">False</property>
+  <property name="skip_pager_hint">False</property>
+  <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
+  <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
+  <property name="focus_on_map">True</property>
+  <property name="urgency_hint">False</property>
+
+  <child>
+    <widget class="GtkTable" id="vbox_jabber_settings">
+      <property name="visible">True</property>
+      <property name="n_rows">6</property>
+      <property name="n_columns">3</property>
+      <property name="homogeneous">False</property>
+      <property name="row_spacing">6</property>
+      <property name="column_spacing">12</property>
+
+      <child>
+       <widget class="GtkLabel" id="label_id">
+         <property name="visible">True</property>
+         <property name="label" translatable="yes">Login I_D:</property>
+         <property name="use_underline">True</property>
+         <property name="use_markup">False</property>
+         <property name="justify">GTK_JUSTIFY_LEFT</property>
+         <property name="wrap">False</property>
+         <property name="selectable">False</property>
+         <property name="xalign">0</property>
+         <property name="yalign">0.5</property>
+         <property name="xpad">0</property>
+         <property name="ypad">0</property>
+         <property name="mnemonic_widget">entry_id</property>
+         <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+         <property name="width_chars">-1</property>
+         <property name="single_line_mode">False</property>
+         <property name="angle">0</property>
+       </widget>
+       <packing>
+         <property name="left_attach">0</property>
+         <property name="right_attach">1</property>
+         <property name="top_attach">0</property>
+         <property name="bottom_attach">1</property>
+         <property name="x_options">fill</property>
+         <property name="y_options"></property>
+       </packing>
+      </child>
+
+      <child>
+       <widget class="GtkLabel" id="label_password">
+         <property name="visible">True</property>
+         <property name="label" translatable="yes">Pass_word:</property>
+         <property name="use_underline">True</property>
+         <property name="use_markup">False</property>
+         <property name="justify">GTK_JUSTIFY_LEFT</property>
+         <property name="wrap">False</property>
+         <property name="selectable">False</property>
+         <property name="xalign">0</property>
+         <property name="yalign">0.5</property>
+         <property name="xpad">0</property>
+         <property name="ypad">0</property>
+         <property name="mnemonic_widget">entry_password</property>
+         <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+         <property name="width_chars">-1</property>
+         <property name="single_line_mode">False</property>
+         <property name="angle">0</property>
+       </widget>
+       <packing>
+         <property name="left_attach">0</property>
+         <property name="right_attach">1</property>
+         <property name="top_attach">1</property>
+         <property name="bottom_attach">2</property>
+         <property name="x_options">fill</property>
+         <property name="y_options"></property>
+       </packing>
+      </child>
+
+      <child>
+       <widget class="GtkLabel" id="label_resource">
+         <property name="visible">True</property>
+         <property name="label" translatable="yes">Reso_urce:</property>
+         <property name="use_underline">True</property>
+         <property name="use_markup">False</property>
+         <property name="justify">GTK_JUSTIFY_LEFT</property>
+         <property name="wrap">False</property>
+         <property name="selectable">False</property>
+         <property name="xalign">0</property>
+         <property name="yalign">0.5</property>
+         <property name="xpad">0</property>
+         <property name="ypad">0</property>
+         <property name="mnemonic_widget">entry_resource</property>
+         <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+         <property name="width_chars">-1</property>
+         <property name="single_line_mode">False</property>
+         <property name="angle">0</property>
+       </widget>
+       <packing>
+         <property name="left_attach">0</property>
+         <property name="right_attach">1</property>
+         <property name="top_attach">2</property>
+         <property name="bottom_attach">3</property>
+         <property name="x_options">fill</property>
+         <property name="y_options"></property>
+       </packing>
+      </child>
+
+      <child>
+       <widget class="GtkLabel" id="label_server">
+         <property name="visible">True</property>
+         <property name="label" translatable="yes">_Server:</property>
+         <property name="use_underline">True</property>
+         <property name="use_markup">False</property>
+         <property name="justify">GTK_JUSTIFY_LEFT</property>
+         <property name="wrap">False</property>
+         <property name="selectable">False</property>
+         <property name="xalign">0</property>
+         <property name="yalign">0.5</property>
+         <property name="xpad">0</property>
+         <property name="ypad">0</property>
+         <property name="mnemonic_widget">entry_server</property>
+         <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+         <property name="width_chars">-1</property>
+         <property name="single_line_mode">False</property>
+         <property name="angle">0</property>
+       </widget>
+       <packing>
+         <property name="left_attach">0</property>
+         <property name="right_attach">1</property>
+         <property name="top_attach">3</property>
+         <property name="bottom_attach">4</property>
+         <property name="x_options">fill</property>
+         <property name="y_options"></property>
+       </packing>
+      </child>
+
+      <child>
+       <widget class="GtkLabel" id="label_port">
+         <property name="visible">True</property>
+         <property name="label" translatable="yes">_Port:</property>
+         <property name="use_underline">True</property>
+         <property name="use_markup">False</property>
+         <property name="justify">GTK_JUSTIFY_LEFT</property>
+         <property name="wrap">False</property>
+         <property name="selectable">False</property>
+         <property name="xalign">0</property>
+         <property name="yalign">0.5</property>
+         <property name="xpad">0</property>
+         <property name="ypad">0</property>
+         <property name="mnemonic_widget">spinbutton_port</property>
+         <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+         <property name="width_chars">-1</property>
+         <property name="single_line_mode">False</property>
+         <property name="angle">0</property>
+       </widget>
+       <packing>
+         <property name="left_attach">0</property>
+         <property name="right_attach">1</property>
+         <property name="top_attach">4</property>
+         <property name="bottom_attach">5</property>
+         <property name="x_options">fill</property>
+         <property name="y_options"></property>
+       </packing>
+      </child>
+
+      <child>
+       <widget class="GtkEntry" id="entry_resource">
+         <property name="visible">True</property>
+         <property name="can_focus">True</property>
+         <property name="editable">True</property>
+         <property name="visibility">True</property>
+         <property name="max_length">0</property>
+         <property name="text" translatable="yes"></property>
+         <property name="has_frame">True</property>
+         <property name="invisible_char">*</property>
+         <property name="activates_default">False</property>
+       </widget>
+       <packing>
+         <property name="left_attach">1</property>
+         <property name="right_attach">3</property>
+         <property name="top_attach">2</property>
+         <property name="bottom_attach">3</property>
+         <property name="y_options"></property>
+       </packing>
+      </child>
+
+      <child>
+       <widget class="GtkEntry" id="entry_server">
+         <property name="visible">True</property>
+         <property name="can_focus">True</property>
+         <property name="editable">True</property>
+         <property name="visibility">True</property>
+         <property name="max_length">0</property>
+         <property name="text" translatable="yes"></property>
+         <property name="has_frame">True</property>
+         <property name="invisible_char">*</property>
+         <property name="activates_default">False</property>
+       </widget>
+       <packing>
+         <property name="left_attach">1</property>
+         <property name="right_attach">3</property>
+         <property name="top_attach">3</property>
+         <property name="bottom_attach">4</property>
+         <property name="y_options"></property>
+       </packing>
+      </child>
+
+      <child>
+       <widget class="GtkCheckButton" id="checkbutton_ssl">
+         <property name="visible">True</property>
+         <property name="can_focus">True</property>
+         <property name="label" translatable="yes">Use encryption (SS_L)</property>
+         <property name="use_underline">True</property>
+         <property name="relief">GTK_RELIEF_NORMAL</property>
+         <property name="focus_on_click">True</property>
+         <property name="active">False</property>
+         <property name="inconsistent">False</property>
+         <property name="draw_indicator">True</property>
+       </widget>
+       <packing>
+         <property name="left_attach">0</property>
+         <property name="right_attach">3</property>
+         <property name="top_attach">5</property>
+         <property name="bottom_attach">6</property>
+         <property name="x_options">fill</property>
+         <property name="y_options"></property>
+       </packing>
+      </child>
+
+      <child>
+       <widget class="GtkSpinButton" id="spinbutton_port">
+         <property name="visible">True</property>
+         <property name="can_focus">True</property>
+         <property name="climb_rate">1</property>
+         <property name="digits">0</property>
+         <property name="numeric">True</property>
+         <property name="update_policy">GTK_UPDATE_ALWAYS</property>
+         <property name="snap_to_ticks">False</property>
+         <property name="wrap">False</property>
+         <property name="adjustment">5222 0 65556 1 10 10</property>
+       </widget>
+       <packing>
+         <property name="left_attach">1</property>
+         <property name="right_attach">3</property>
+         <property name="top_attach">4</property>
+         <property name="bottom_attach">5</property>
+         <property name="y_options"></property>
+       </packing>
+      </child>
+
+      <child>
+       <widget class="GtkButton" id="button_forget">
+         <property name="visible">True</property>
+         <property name="tooltip" translatable="yes">Forget password and clear the entry.</property>
+         <property name="can_focus">True</property>
+         <property name="relief">GTK_RELIEF_NORMAL</property>
+         <property name="focus_on_click">True</property>
+
+         <child>
+           <widget class="GtkImage" id="image834">
+             <property name="visible">True</property>
+             <property name="stock">gtk-clear</property>
+             <property name="icon_size">1</property>
+             <property name="xalign">0.5</property>
+             <property name="yalign">0.5</property>
+             <property name="xpad">0</property>
+             <property name="ypad">0</property>
+           </widget>
+         </child>
+       </widget>
+       <packing>
+         <property name="left_attach">2</property>
+         <property name="right_attach">3</property>
+         <property name="top_attach">1</property>
+         <property name="bottom_attach">2</property>
+         <property name="x_options">fill</property>
+         <property name="y_options"></property>
+       </packing>
+      </child>
+
+      <child>
+       <widget class="GtkEntry" id="entry_password">
+         <property name="visible">True</property>
+         <property name="can_focus">True</property>
+         <property name="editable">True</property>
+         <property name="visibility">False</property>
+         <property name="max_length">0</property>
+         <property name="text" translatable="yes"></property>
+         <property name="has_frame">True</property>
+         <property name="invisible_char">*</property>
+         <property name="activates_default">False</property>
+       </widget>
+       <packing>
+         <property name="left_attach">1</property>
+         <property name="right_attach">2</property>
+         <property name="top_attach">1</property>
+         <property name="bottom_attach">2</property>
+         <property name="y_options"></property>
+       </packing>
+      </child>
+
+      <child>
+       <widget class="GtkEntry" id="entry_id">
+         <property name="visible">True</property>
+         <property name="can_focus">True</property>
+         <property name="editable">True</property>
+         <property name="visibility">True</property>
+         <property name="max_length">0</property>
+         <property name="text" translatable="yes"></property>
+         <property name="has_frame">True</property>
+         <property name="invisible_char">*</property>
+         <property name="activates_default">False</property>
+       </widget>
+       <packing>
+         <property name="left_attach">1</property>
+         <property name="right_attach">3</property>
+         <property name="top_attach">0</property>
+         <property name="bottom_attach">1</property>
+         <property name="y_options"></property>
+       </packing>
+      </child>
+    </widget>
+  </child>
+</widget>
+
+</glade-interface>
diff --git a/libempathy-gtk/gossip-account-widget-jabber.h b/libempathy-gtk/gossip-account-widget-jabber.h
new file mode 100644 (file)
index 0000000..b491e48
--- /dev/null
@@ -0,0 +1,34 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
+/*
+ * Copyright (C) 2005-2007 Imendio AB
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with this program; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ * 
+ * Authors: Martyn Russell <martyn@imendio.com>
+ */
+
+#ifndef __GOSSIP_ACCOUNT_WIDGET_JABBER_H__
+#define __GOSSIP_ACCOUNT_WIDGET_JABBER_H__
+
+#include <libmissioncontrol/mc-account.h>
+
+G_BEGIN_DECLS
+
+GtkWidget *gossip_account_widget_jabber_new (McAccount *account);
+
+G_END_DECLS
+
+#endif /* __GOSSIP_ACCOUNT_WIDGET_JABBER_H__ */
index 848abb5..6f61dfb 100644 (file)
@@ -47,6 +47,7 @@
 #include "gossip-accounts-dialog.h"
 #include "gossip-profile-chooser.h"
 #include "gossip-account-widget-generic.h"
+#include "gossip-account-widget-jabber.h"
 
 #define DEBUG_DOMAIN "AccountDialog"
 
@@ -284,7 +285,9 @@ accounts_dialog_update_account (GossipAccountsDialog *dialog,
                profile = mc_account_get_profile (account);
                config_ui = mc_profile_get_configuration_ui (profile);
 
-               if (strcmp (config_ui, "blah") == 0) {
+               if (strcmp (config_ui, "jabber") == 0) {
+                       dialog->settings_widget = 
+                               gossip_account_widget_jabber_new (account);
                } else {
                        dialog->settings_widget = 
                                gossip_account_widget_generic_new (account,
@@ -957,7 +960,7 @@ gossip_accounts_dialog_show (void)
 
        dialog = g_new0 (GossipAccountsDialog, 1);
 
-       glade = gossip_glade_get_file ("empathy-accounts.glade",
+       glade = gossip_glade_get_file ("gossip-accounts-dialog.glade",
                                       "accounts_dialog",
                                       NULL,
                                       "accounts_dialog", &dialog->window,
index 1ceb6d4..c9a44bf 100644 (file)
@@ -159,7 +159,7 @@ private_chat_create_ui (GossipPrivateChat *chat)
 
        priv = GET_PRIV (chat);
 
-       glade = gossip_glade_get_file ("empathy-chat.glade",
+       glade = gossip_glade_get_file ("gossip-chat.glade",
                                       "chat_widget",
                                       NULL,
                                      "chat_widget", &priv->widget,