Mercurial > pidgin.yaz

changeset 20511:bced1f19cb1d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
explicit merge of '996cf0c57149ba6e1c714ebb1f11d5d4bac8fb68' and 'a50b5c8c98f4e121b414810d37417458e919de79'
author Richard Laager <rlaager@wiktel.com>
date Sun, 16 Sep 2007 18:01:18 +0000
parents e21002d106ab (diff) b77adb803eca (current diff)
children f489d760121f
files libpurple/protocols/msn/msn-utils.c libpurple/protocols/msn/msn-utils.h
diffstat 7 files changed, 70 insertions(+), 16 deletions(-) [+]
line wrap: on
line diff
--- a/finch/libgnt/gntmenu.c	Sun Sep 16 17:59:57 2007 +0000
+++ b/finch/libgnt/gntmenu.c	Sun Sep 16 18:01:18 2007 +0000
@@ -221,8 +221,13 @@
 {
 	/* check for a trigger key */
 	GList *iter;
+	GList *find;
 	GList *nth = g_list_find(menu->list, gnt_tree_get_selection_data(GNT_TREE(menu)));
-	GList *find = find_item_with_trigger(nth->next, NULL, trigger);
+
+	if (nth == NULL)
+		return FALSE;
+		
+	find = find_item_with_trigger(nth->next, NULL, trigger);
 	if (!find)
 		find = find_item_with_trigger(menu->list, nth->next, trigger);
 	if (!find)
--- a/libpurple/certificate.c	Sun Sep 16 17:59:57 2007 +0000
+++ b/libpurple/certificate.c	Sun Sep 16 18:01:18 2007 +0000
@@ -580,7 +580,12 @@
 	"x509",                         /* Scheme name */
 	"singleuse",                    /* Verifier name */
 	x509_singleuse_start_verify,    /* start_verification function */
-	x509_singleuse_destroy_request  /* Request cleanup operation */
+	x509_singleuse_destroy_request, /* Request cleanup operation */
+
+	NULL,
+	NULL,
+	NULL,
+	NULL
 };
 
 
@@ -872,7 +877,13 @@
 	x509_ca_get_cert,             /* Cert retriever */
 	x509_ca_put_cert,             /* Cert writer */
 	x509_ca_delete_cert,          /* Cert remover */
-	x509_ca_get_idlist            /* idlist retriever */
+	x509_ca_get_idlist,           /* idlist retriever */
+
+	NULL,
+	NULL,
+	NULL,
+	NULL
+
 };
 
 
@@ -1034,7 +1045,12 @@
 	x509_tls_peers_get_cert,      /* Cert retriever */
 	x509_tls_peers_put_cert,      /* Cert writer */
 	x509_tls_peers_delete_cert,   /* Cert remover */
-	x509_tls_peers_get_idlist     /* idlist retriever */
+	x509_tls_peers_get_idlist,    /* idlist retriever */
+
+	NULL,
+	NULL,
+	NULL,
+	NULL
 };
 
 
@@ -1459,7 +1475,13 @@
 	"x509",                         /* Scheme name */
 	"tls_cached",                   /* Verifier name */
 	x509_tls_cached_start_verify,   /* Verification begin */
-	x509_tls_cached_destroy_request /* Request cleanup */
+	x509_tls_cached_destroy_request,/* Request cleanup */
+
+	NULL,
+	NULL,
+	NULL,
+	NULL
+
 };
 
 /****************************************************************************/
--- a/libpurple/certificate.h	Sun Sep 16 17:59:57 2007 +0000
+++ b/libpurple/certificate.h	Sun Sep 16 18:01:18 2007 +0000
@@ -123,6 +123,11 @@
 
 	/** Returns a list of IDs stored in the pool */
 	GList * (* get_idlist)(void);
+
+	void (*_purple_reserved1)(void);
+	void (*_purple_reserved2)(void);
+	void (*_purple_reserved3)(void);
+	void (*_purple_reserved4)(void);
 };
 
 /** A certificate type
@@ -241,7 +246,10 @@
 	/** Retrieve the certificate activation/expiration times */
 	gboolean (* get_times)(PurpleCertificate *crt, time_t *activation, time_t *expiration);
 	
-	/* TODO: Fill out this structure */
+	void (*_purple_reserved1)(void);
+	void (*_purple_reserved2)(void);
+	void (*_purple_reserved3)(void);
+	void (*_purple_reserved4)(void);
 };
 
 /** A set of operations used to provide logic for verifying a Certificate's
@@ -286,6 +294,11 @@
 	 * @param vrq       Request to destroy
 	 */
 	void (* destroy_request)(PurpleCertificateVerificationRequest *vrq);
+
+	void (*_purple_reserved1)(void);
+	void (*_purple_reserved2)(void);
+	void (*_purple_reserved3)(void);
+	void (*_purple_reserved4)(void);
 };
 
 /** Structure for a single certificate request
--- a/libpurple/plugins/ssl/ssl-gnutls.c	Sun Sep 16 17:59:57 2007 +0000
+++ b/libpurple/plugins/ssl/ssl-gnutls.c	Sun Sep 16 18:01:18 2007 +0000
@@ -911,7 +911,13 @@
 	x509_issuer_dn,                  /* Issuer Unique ID */
 	x509_common_name,                /* Subject name */
 	x509_check_name,                 /* Check subject name */
-	x509_times                       /* Activation/Expiration time */
+	x509_times,                      /* Activation/Expiration time */
+
+	NULL,
+	NULL,
+	NULL,
+	NULL
+
 };
 
 static PurpleSslOps ssl_ops =
--- a/libpurple/plugins/ssl/ssl-nss.c	Sun Sep 16 17:59:57 2007 +0000
+++ b/libpurple/plugins/ssl/ssl-nss.c	Sun Sep 16 18:01:18 2007 +0000
@@ -641,7 +641,12 @@
 	NULL,                            /* Issuer Unique ID */
 	x509_common_name,                /* Subject name */
 	x509_check_name,                 /* Check subject name */
-	x509_times                       /* Activation/Expiration time */
+	x509_times,                      /* Activation/Expiration time */
+
+	NULL,
+	NULL,
+	NULL,
+	NULL
 };
 
 static PurpleSslOps ssl_ops =
--- a/libpurple/protocols/oscar/family_feedbag.c	Sun Sep 16 17:59:57 2007 +0000
+++ b/libpurple/protocols/oscar/family_feedbag.c	Sun Sep 16 18:01:18 2007 +0000
@@ -505,13 +505,13 @@
 	 * buddy ID#s, which makes things more efficient.  I think.
 	 */
 
-	/* Additions */
+	/* Deletions */
 	if (!od->ssi.pending) {
-		for (cur1=od->ssi.local; cur1 && (n < 15); cur1=cur1->next) {
-			if (!aim_ssi_itemlist_find(od->ssi.official, cur1->gid, cur1->bid)) {
+		for (cur1=od->ssi.official; cur1 && (n < 15); cur1=cur1->next) {
+			if (!aim_ssi_itemlist_find(od->ssi.local, cur1->gid, cur1->bid)) {
 				n++;
 				new = (struct aim_ssi_tmp *)g_malloc(sizeof(struct aim_ssi_tmp));
-				new->action = SNAC_SUBTYPE_FEEDBAG_ADD;
+				new->action = SNAC_SUBTYPE_FEEDBAG_DEL;
 				new->ack = 0xffff;
 				new->name = NULL;
 				new->item = cur1;
@@ -525,13 +525,13 @@
 		}
 	}
 
-	/* Deletions */
+	/* Additions */
 	if (!od->ssi.pending) {
-		for (cur1=od->ssi.official; cur1 && (n < 15); cur1=cur1->next) {
-			if (!aim_ssi_itemlist_find(od->ssi.local, cur1->gid, cur1->bid)) {
+		for (cur1=od->ssi.local; cur1 && (n < 15); cur1=cur1->next) {
+			if (!aim_ssi_itemlist_find(od->ssi.official, cur1->gid, cur1->bid)) {
 				n++;
 				new = (struct aim_ssi_tmp *)g_malloc(sizeof(struct aim_ssi_tmp));
-				new->action = SNAC_SUBTYPE_FEEDBAG_DEL;
+				new->action = SNAC_SUBTYPE_FEEDBAG_ADD;
 				new->ack = 0xffff;
 				new->name = NULL;
 				new->item = cur1;
--- a/pidgin/gtkcertmgr.c	Sun Sep 16 17:59:57 2007 +0000
+++ b/pidgin/gtkcertmgr.c	Sun Sep 16 18:01:18 2007 +0000
@@ -454,6 +454,9 @@
 			"text", TPM_HOSTNAME_COLUMN,
 			NULL);
 		gtk_tree_view_append_column(GTK_TREE_VIEW(listview), column);
+
+		gtk_tree_sortable_set_sort_column_id(GTK_TREE_SORTABLE(store),
+				TPM_HOSTNAME_COLUMN, GTK_SORT_ASCENDING);
 	}
 	
 	/* Get the treeview selector into the struct */