rpms/xchat-gnome/devel xchat-gnome-certificates.patch, NONE, 1.1 xchat-gnome.spec, 1.10, 1.11

[Brian Pepple (bpepple)]

Author: bpepple

Update of /cvs/extras/rpms/xchat-gnome/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31925

Modified Files:
	xchat-gnome.spec 
Added Files:
	xchat-gnome-certificates.patch 
Log Message:
* Fri Dec 30 2005 Brian Pepple <bdpepple at ameritech.net> - 0.8-2
- add patch for self-signed certificate acceptance. (#174591)


xchat-gnome-certificates.patch:

--- NEW FILE xchat-gnome-certificates.patch ---
Index: src/fe-gnome/irc-network.c
===================================================================
--- src/fe-gnome/irc-network.c	(révision 9974)
+++ src/fe-gnome/irc-network.c	(copie de travail)
@@ -126,6 +126,7 @@
 	n->name        = g_strdup (net->name);
 	n->autoconnect = net->flags & FLAG_AUTO_CONNECT;
 	n->use_ssl     = net->flags & FLAG_USE_SSL;
+	n->allow_invalid = net->flags & FLAG_ALLOW_INVALID;
 	n->cycle       = net->flags & FLAG_CYCLE;
 
 	for (s1 = net->servlist; s1; s1 = g_slist_next (s1)) {
@@ -185,6 +186,7 @@
 
 	if (network->autoconnect) flags |= FLAG_AUTO_CONNECT;
 	if (network->use_ssl)     flags |= FLAG_USE_SSL;
+	if (network->allow_invalid) flags |= FLAG_ALLOW_INVALID;
 	if (network->cycle)       flags |= FLAG_CYCLE;
 	if (network->use_global)  flags |= FLAG_USE_GLOBAL;
 	net->flags = flags;
Index: src/fe-gnome/irc-network.h
===================================================================
--- src/fe-gnome/irc-network.h	(révision 9974)
+++ src/fe-gnome/irc-network.h	(copie de travail)
@@ -44,6 +44,7 @@
 	gchar *name;
 	gboolean autoconnect;
 	gboolean use_ssl;
+	gboolean allow_invalid;
 	gboolean cycle;
 	gboolean reconnect;
 	gboolean nogiveup_reconnect;
Index: src/fe-gnome/irc-network-editor.c
===================================================================
--- src/fe-gnome/irc-network-editor.c	(révision 9974)
+++ src/fe-gnome/irc-network-editor.c	(copie de travail)
@@ -233,6 +233,7 @@
 
 	GW(autoconnect);
 	GW(use_ssl);
+	GW(allow_invalid);
 	GW(cycle);
 
 	GW(nickserv_password);
@@ -399,6 +400,7 @@
 
 	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (e->autoconnect),      e->network->autoconnect);
 	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (e->use_ssl),          e->network->use_ssl);
+	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (e->allow_invalid),    e->network->allow_invalid);
 	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (e->cycle),            e->network->cycle);
 
 	if (e->network->use_global) {
@@ -468,6 +470,7 @@
 
 	net->autoconnect        = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (e->autoconnect));
 	net->use_ssl            = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (e->use_ssl));
+	net->allow_invalid      = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (e->allow_invalid));
 	net->cycle              = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (e->cycle));
 	net->use_global         = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (e->use_globals));
 	net->encoding           = gtk_combo_box_get_active (GTK_COMBO_BOX (e->encoding));
Index: src/fe-gnome/irc-network-editor.h
===================================================================
--- src/fe-gnome/irc-network-editor.h	(révision 9974)
+++ src/fe-gnome/irc-network-editor.h	(copie de travail)
@@ -51,6 +51,7 @@
 
 	GtkWidget *autoconnect;
 	GtkWidget *use_ssl;
+	GtkWidget *allow_invalid;
 	GtkWidget *cycle;
 
 	GtkWidget *password;
Index: data/irc-network-editor.glade
===================================================================
--- data/irc-network-editor.glade	(révision 9974)
+++ data/irc-network-editor.glade	(copie de travail)
@@ -243,6 +243,25 @@
 		      </child>
 
 		      <child>
+			<widget class="GtkCheckButton" id="allow_invalid">
+			  <property name="visible">True</property>
+			  <property name="can_focus">True</property>
+			  <property name="label" translatable="yes">Accept _invalid SSL certificate</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="padding">0</property>
+			  <property name="expand">False</property>
+			  <property name="fill">False</property>
+			</packing>
+		      </child>
+
+		      <child>
 			<widget class="GtkCheckButton" id="cycle">
 			  <property name="visible">True</property>
 			  <property name="can_focus">True</property>


Index: xchat-gnome.spec
===================================================================
RCS file: /cvs/extras/rpms/xchat-gnome/devel/xchat-gnome.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- xchat-gnome.spec	20 Dec 2005 21:16:11 -0000	1.10
+++ xchat-gnome.spec	30 Dec 2005 17:53:20 -0000	1.11
@@ -6,7 +6,7 @@
 
 Name:           xchat-gnome
 Version:        0.8
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        GNOME front-end to xchat
 
 Group:          Applications/Internet
@@ -14,6 +14,7 @@
 URL:            http://%{name}.navi.cx/
 Source0:        http://flapjack.navi.cx/releases/%{name}/%{name}-%{version}.tar.bz2
 Patch0:		%{name}-config.patch
+Patch1:		%{name}-certificates.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	openssl-devel
@@ -51,6 +52,7 @@
 %prep
 %setup -q -n %{name}-%{version}
 %patch0 -p1 -b .config
+%patch1 -p0 -b .certificates
 
 
 %build
@@ -132,10 +134,13 @@
 
 
 %changelog
+* Fri Dec 30 2005 Brian Pepple <bdpepple at ameritech.net> - 0.8-2
+- add patch for self-signed certificate acceptance. (#174591)
+
 * Tue Dec 20 2005 Brian Pepple <bdpepple at ameritech.net> - 0.8-1
 - Udate to 0.8.
 
-* Sun Dec 18 2005 Brian Pepple <bdpepple at ameritech.net> - 0.8-01.rc1
+* Sun Dec 18 2005 Brian Pepple <bdpepple at ameritech.net> - 0.8-01.rc2
 - Update to 0.8rc2.
 
 * Thu Dec 15 2005 Brian Pepple <bdpepple at ameritech.net> - 0.8-01.rc1