Accepting request 53822 from GNOME:Apps

Accepted submit request 53822 from user dimstar

OBS-URL: https://build.opensuse.org/request/show/53822
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/pidgin?expand=0&rev=61
This commit is contained in:
Ruediger Oertel
2010-11-24 09:49:30 +00:00
committed by Git OBS Bridge
parent 99734e0037
commit 8e86eb5579
6 changed files with 71 additions and 20 deletions

View File

@@ -1,6 +1,7 @@
diff -uprN gaim-1.5.0-clean/libpurple/protocols/novell/nmconn.c gaim-1.5.0-new-files/libpurple/protocols/novell/nmconn.c
--- gaim-1.5.0-clean/libpurple/protocols/novell/nmconn.c 2005-03-06 17:10:36.000000000 -0500
+++ gaim-1.5.0-new-files/libpurple/protocols/novell/nmconn.c 2005-10-05 14:57:03.000000000 -0400
Index: pidgin-2.7.6/libpurple/protocols/novell/nmconn.c
===================================================================
--- pidgin-2.7.6.orig/libpurple/protocols/novell/nmconn.c
+++ pidgin-2.7.6/libpurple/protocols/novell/nmconn.c
@@ -191,6 +191,12 @@ void nm_release_conn(NMConn *conn)
g_free(conn->ssl_conn);
conn->ssl_conn = NULL;
@@ -43,9 +44,10 @@ diff -uprN gaim-1.5.0-clean/libpurple/protocols/novell/nmconn.c gaim-1.5.0-new-f
return -1;
}
diff -uprN gaim-1.5.0-clean/libpurple/protocols/novell/nmconn.h gaim-1.5.0-new-files/libpurple/protocols/novell/nmconn.h
--- gaim-1.5.0-clean/libpurple/protocols/novell/nmconn.h 2004-06-23 13:27:56.000000000 -0400
+++ gaim-1.5.0-new-files/libpurple/protocols/novell/nmconn.h 2005-10-05 12:53:52.000000000 -0400
Index: pidgin-2.7.6/libpurple/protocols/novell/nmconn.h
===================================================================
--- pidgin-2.7.6.orig/libpurple/protocols/novell/nmconn.h
+++ pidgin-2.7.6/libpurple/protocols/novell/nmconn.h
@@ -24,6 +24,7 @@
typedef struct _NMConn NMConn;
typedef struct _NMSSLConn NMSSLConn;
@@ -64,10 +66,11 @@ diff -uprN gaim-1.5.0-clean/libpurple/protocols/novell/nmconn.h gaim-1.5.0-new-f
/* The transaction counter. */
int trans_id;
diff -uprN gaim-1.5.0-clean/libpurple/protocols/novell/novell.c gaim-1.5.0-new-files/libpurple/protocols/novell/novell.c
--- gaim-1.5.0-clean/libpurple/protocols/novell/novell.c 2005-07-24 15:27:36.000000000 -0400
+++ gaim-1.5.0-new-files/libpurple/protocols/novell/novell.c 2005-10-05 14:57:03.000000000 -0400
@@ -2166,17 +2166,12 @@ static void
Index: pidgin-2.7.6/libpurple/protocols/novell/novell.c
===================================================================
--- pidgin-2.7.6.orig/libpurple/protocols/novell/novell.c
+++ pidgin-2.7.6/libpurple/protocols/novell/novell.c
@@ -2223,17 +2223,12 @@ static void
novell_close(PurpleConnection * gc)
{
NMUser *user;