Attachment 19910 Details for Bug 18271 – patch for empathy

[patch] patch for empathy

ssl-error.patch (text/plain), 10.45 KB, created by Hubert Figuiere on 2008-10-28 09:16:23 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Hubert Figuiere

Created: 2008-10-28 09:16:23 UTC

Size: 10.45 KB

patch

obsolete

>Index: libempathy-gtk/empathy-account-widget-groupwise.glade
>===================================================================
>--- libempathy-gtk/empathy-account-widget-groupwise.glade	(revision 1662)
>+++ libempathy-gtk/empathy-account-widget-groupwise.glade	(working copy)
>@@ -18,6 +18,44 @@
>             <property name="column_spacing">6</property>
>             <property name="row_spacing">6</property>
>             <child>
>+              <widget class="GtkEntry" id="entry_id">
>+                <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_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>
>+              </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="hbox1">
>                 <property name="visible">True</property>
>                 <property name="spacing">2</property>
>@@ -57,44 +95,6 @@
>                 <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>
>-              </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_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="GtkEntry" id="entry_id">
>-                <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>
>           </widget>
>           <packing>
>             <property name="expand">False</property>
>@@ -107,35 +107,37 @@
>             <child>
>               <widget class="GtkTable" id="table_advanced_groupwise_settings">
>                 <property name="visible">True</property>
>-                <property name="n_rows">2</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="GtkLabel" id="label_port">
>+                  <widget class="GtkCheckButton" id="checkbutton_ignore_ssl_errors">
>                     <property name="visible">True</property>
>-                    <property name="xalign">0</property>
>-                    <property name="label" translatable="yes">_Port:</property>
>+                    <property name="can_focus">True</property>
>+                    <property name="label" translatable="yes">_Ignore SSL certificate errors</property>
>                     <property name="use_underline">True</property>
>-                    <property name="mnemonic_widget">spinbutton_port</property>
>+                    <property name="response_id">0</property>
>+                    <property name="draw_indicator">True</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>
>+                    <property name="right_attach">2</property>
>                   </packing>
>                 </child>
>                 <child>
>-                  <widget class="GtkLabel" id="label_server">
>+                  <widget class="GtkSpinButton" id="spinbutton_port">
>                     <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>
>+                    <property name="can_focus">True</property>
>+                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
>+                    <property name="adjustment">0 0 65535 1 10 0</property>
>+                    <property name="climb_rate">1</property>
>+                    <property name="numeric">True</property>
>                   </widget>
>                   <packing>
>-                    <property name="x_options">GTK_FILL</property>
>+                    <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>
>@@ -147,26 +149,41 @@
>                   <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="GtkSpinButton" id="spinbutton_port">
>+                  <widget class="GtkLabel" id="label_server">
>                     <property name="visible">True</property>
>-                    <property name="can_focus">True</property>
>-                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
>-                    <property name="adjustment">0 0 65535 1 10 0</property>
>-                    <property name="climb_rate">1</property>
>-                    <property name="numeric">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="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"></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">spinbutton_port</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>
>               </widget>
>             </child>
>             <child>
>Index: libempathy-gtk/empathy-account-widget.c
>===================================================================
>--- libempathy-gtk/empathy-account-widget.c	(revision 1662)
>+++ libempathy-gtk/empathy-account-widget.c	(working copy)
>@@ -732,6 +732,7 @@
> 			"entry_password", "password",
> 			"entry_server", "server",
> 			"spinbutton_port", "port",
>+			"checkbutton_ignore_ssl_errors", "ignore-ssl-errors",
> 			NULL);
> 
> 	empathy_account_widget_add_forget_button (account, glade,

Actions: View | Splinter Review

Attachments on bug 18271: 19910

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.