empathy r950 - trunk/libempathy-gtk
- From: xclaesse svn gnome org
- To: svn-commits-list gnome org
- Subject: empathy r950 - trunk/libempathy-gtk
- Date: Wed, 16 Apr 2008 09:35:01 +0100 (BST)
Author: xclaesse
Date: Wed Apr 16 09:35:00 2008
New Revision: 950
URL: http://svn.gnome.org/viewvc/empathy?rev=950&view=rev
Log:
Remove most SIP settings since they are impossible to understand.
Modified:
trunk/libempathy-gtk/empathy-account-widget-sip.c
trunk/libempathy-gtk/empathy-account-widget-sip.glade
Modified: trunk/libempathy-gtk/empathy-account-widget-sip.c
==============================================================================
--- trunk/libempathy-gtk/empathy-account-widget-sip.c (original)
+++ trunk/libempathy-gtk/empathy-account-widget-sip.c Wed Apr 16 09:35:00 2008
@@ -106,19 +106,9 @@
empathy_account_widget_handle_params (account, glade,
"entry_userid", "account",
"entry_password", "password",
- "entry_proxy","proxy-host",
- "spinbutton_port", "port",
- "entry_transport", "transport",
- "checkbutton_discover-binding","discover-binding",
- "entry_keepalive-mechanism", "keepalive-mechanism",
- "entry_keepalive-interval", "keepalive-interval",
"checkbutton_discover-stun", "discover-stun",
"entry_stun-server", "stun-server",
"spinbutton_stun-port", "stun-port",
- "entry_local-ip", "local-ip-address",
- "spinbutton_local-port", "local-port",
- "entry_extra-auth-user", "extra-auth-user",
- "entry_extra-auth-password", "extra-auth-password",
NULL);
empathy_account_widget_add_forget_button (account, glade,
Modified: trunk/libempathy-gtk/empathy-account-widget-sip.glade
==============================================================================
--- trunk/libempathy-gtk/empathy-account-widget-sip.glade (original)
+++ trunk/libempathy-gtk/empathy-account-widget-sip.glade Wed Apr 16 09:35:00 2008
@@ -15,45 +15,6 @@
<property name="column_spacing">12</property>
<property name="row_spacing">6</property>
<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="GtkEntry" id="entry_userid">
- <property name="visible">True</property>
- <property name="can_focus">True</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_userid">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">_Username:</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">entry_password</property>
- </widget>
- <packing>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
<widget class="GtkHBox" id="hbox1">
<property name="visible">True</property>
<child>
@@ -90,6 +51,45 @@
<property name="y_options"></property>
</packing>
</child>
+ <child>
+ <widget class="GtkLabel" id="label_userid">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">_Username:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">entry_password</property>
+ </widget>
+ <packing>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkEntry" id="entry_userid">
+ <property name="visible">True</property>
+ <property name="can_focus">True</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_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>
</widget>
<packing>
<property name="expand">False</property>
@@ -108,76 +108,31 @@
<child>
<widget class="GtkTable" id="table_advanced_sip_settings">
<property name="visible">True</property>
- <property name="n_rows">13</property>
+ <property name="n_rows">3</property>
<property name="n_columns">2</property>
<property name="column_spacing">6</property>
<property name="row_spacing">6</property>
<child>
- <widget class="GtkSpinButton" id="spinbutton_port">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="adjustment">0 0 65536 1 10 10</property>
- <property name="climb_rate">1</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>
- </packing>
- </child>
- <child>
- <widget class="GtkEntry" id="entry_local-ip">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- </widget>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">9</property>
- <property name="bottom_attach">10</property>
- </packing>
- </child>
- <child>
- <widget class="GtkEntry" id="entry_stun-server">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- </widget>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">7</property>
- <property name="bottom_attach">8</property>
- </packing>
- </child>
- <child>
- <widget class="GtkEntry" id="entry_keepalive-interval">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- </widget>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">5</property>
- <property name="bottom_attach">6</property>
- </packing>
- </child>
- <child>
- <widget class="GtkEntry" id="entry_keepalive-mechanism">
+ <widget class="GtkCheckButton" id="checkbutton_discover-stun">
<property name="visible">True</property>
<property name="can_focus">True</property>
+ <property name="label" translatable="yes" comments="look up the DNS SRV record at the service's domain for the host name of a STUN server.">Discover STUN</property>
+ <property name="use_underline">True</property>
+ <property name="response_id">0</property>
+ <property name="draw_indicator">True</property>
</widget>
<packing>
- <property name="left_attach">1</property>
<property name="right_attach">2</property>
- <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_transport">
+ <widget class="GtkSpinButton" id="spinbutton_stun-port">
<property name="visible">True</property>
<property name="can_focus">True</property>
+ <property name="adjustment">0 0 65536 1 10 10</property>
+ <property name="climb_rate">1</property>
</widget>
<packing>
<property name="left_attach">1</property>
@@ -187,44 +142,6 @@
</packing>
</child>
<child>
- <widget class="GtkEntry" id="entry_proxy">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- </widget>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label_local-ip-address">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Local IP Address:</property>
- <property name="mnemonic_widget">entry_local-ip</property>
- </widget>
- <packing>
- <property name="top_attach">9</property>
- <property name="bottom_attach">10</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label_stun-port">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Stun port:</property>
- <property name="mnemonic_widget">spinbutton_stun-port</property>
- </widget>
- <packing>
- <property name="top_attach">8</property>
- <property name="bottom_attach">9</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
<widget class="GtkLabel" id="label_stun-server">
<property name="visible">True</property>
<property name="xalign">0</property>
@@ -232,62 +149,6 @@
<property name="mnemonic_widget">entry_stun-server</property>
</widget>
<packing>
- <property name="top_attach">7</property>
- <property name="bottom_attach">8</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label_keepalive-interval">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Keepalive Interval:</property>
- <property name="mnemonic_widget">entry_keepalive-interval</property>
- </widget>
- <packing>
- <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="GtkLabel" id="label_keepalive-mechanism">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Keepalive Mechanism:</property>
- <property name="mnemonic_widget">entry_keepalive-mechanism</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="GtkLabel" id="label_transport">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Transport:</property>
- <property name="mnemonic_widget">entry_transport</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_port">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Port:</property>
- <property name="mnemonic_widget">spinbutton_stun-port</property>
- </widget>
- <packing>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
<property name="x_options">GTK_FILL</property>
@@ -295,143 +156,29 @@
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label_proxy">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Proxy Server:</property>
- <property name="mnemonic_widget">entry_proxy</property>
- </widget>
- <packing>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <widget class="GtkSpinButton" id="spinbutton_stun-port">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="adjustment">0 0 65536 1 10 10</property>
- <property name="climb_rate">1</property>
- </widget>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">8</property>
- <property name="bottom_attach">9</property>
- </packing>
- </child>
- <child>
- <widget class="GtkCheckButton" id="checkbutton_discover-binding">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="label" translatable="yes" comments="update our user agent's IP address, as in the Contact header URI, based on information reflected by the proxy as per RFC 3581.">Discover Binding</property>
- <property name="use_underline">True</property>
- <property name="response_id">0</property>
- <property name="draw_indicator">True</property>
- </widget>
- <packing>
- <property name="right_attach">2</property>
- <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="GtkCheckButton" id="checkbutton_discover-stun">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="label" translatable="yes" comments="look up the DNS SRV record at the service's domain for the host name of a STUN server.">Discover STUN</property>
- <property name="use_underline">True</property>
- <property name="response_id">0</property>
- <property name="draw_indicator">True</property>
- </widget>
- <packing>
- <property name="right_attach">2</property>
- <property name="top_attach">6</property>
- <property name="bottom_attach">7</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label_local-port">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Local Port:</property>
- <property name="mnemonic_widget">spinbutton_local-port</property>
- </widget>
- <packing>
- <property name="top_attach">10</property>
- <property name="bottom_attach">11</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label_extra-auth-user">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Extra Auth User:</property>
- <property name="mnemonic_widget">entry_extra-auth-user</property>
- </widget>
- <packing>
- <property name="top_attach">11</property>
- <property name="bottom_attach">12</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label_extra-auth-password">
+ <widget class="GtkLabel" id="label_stun-port">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Extra Auth Password:</property>
- <property name="mnemonic_widget">entry_extra-auth-password</property>
+ <property name="label" translatable="yes">Stun port:</property>
+ <property name="mnemonic_widget">spinbutton_stun-port</property>
</widget>
<packing>
- <property name="top_attach">12</property>
- <property name="bottom_attach">13</property>
+ <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="GtkSpinButton" id="spinbutton_local-port">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="adjustment">0 0 65536 1 10 10</property>
- <property name="climb_rate">1</property>
- </widget>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">10</property>
- <property name="bottom_attach">11</property>
- </packing>
- </child>
- <child>
- <widget class="GtkEntry" id="entry_extra-auth-password">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- </widget>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">12</property>
- <property name="bottom_attach">13</property>
- </packing>
- </child>
<child>
- <widget class="GtkEntry" id="entry_extra-auth-user">
+ <widget class="GtkEntry" id="entry_stun-server">
<property name="visible">True</property>
<property name="can_focus">True</property>
</widget>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
- <property name="top_attach">11</property>
- <property name="bottom_attach">12</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
</packing>
</child>
</widget>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
