CVS: sylpheed-claws/src compose.c,1.382.2.258.2.2,1.382.2.258.2.3 ldaputil.c,1.1.4.2,1.1.4.2.2.1 summaryview.c,1.395.2.190,1.395.2.190.2.1

Update of /cvsroot/sylpheed-claws/sylpheed-claws/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24057/src

Modified Files:
      Tag: stable_2_1
	compose.c ldaputil.c summaryview.c 
Log Message:
2006-04-24 [colin]	2.1.1cvs9-stable

	* src/compose.c
	* src/ldaputil.c
	* src/summaryview.c
		From 2.1.1cvs29 and 2.1.1cvs30
		Fix logic on error when send dialog is on
		Fix possible free of uninitialized value
		Fix 'context-menu' key

Index: compose.c
===================================================================
RCS file: /cvsroot/sylpheed-claws/sylpheed-claws/src/compose.c,v
retrieving revision 1.382.2.258.2.2
retrieving revision 1.382.2.258.2.3
diff -u -r1.382.2.258.2.2 -r1.382.2.258.2.3
--- compose.c	14 Apr 2006 06:48:18 -0000	1.382.2.258.2.2
+++ compose.c	24 Apr 2006 17:04:12 -0000	1.382.2.258.2.3
@@ -3886,12 +3886,12 @@
 	}
 
 	if (msgnum == 0) {
-		if (!discard_window) {
-			goto bail;
-		}
 		alertpanel_error(_("The message was queued but could not be "
 				   "sent.\nUse \"Send queued messages\" from "
 				   "the main window to retry."));
+		if (!discard_window) {
+			goto bail;
+		}
 		return -1;
 	}
 	
@@ -3919,12 +3919,12 @@
 		if (!discard_window)
 			compose_close(compose);
 	} else {
-		if (!discard_window) {
-			goto bail;		
-		}
 		alertpanel_error(_("The message was queued but could not be "
 				   "sent.\nUse \"Send queued messages\" from "
 				   "the main window to retry."));
+		if (!discard_window) {
+			goto bail;		
+		}
 		return -1;
  	}
 

Index: ldaputil.c
===================================================================
RCS file: /cvsroot/sylpheed-claws/sylpheed-claws/src/ldaputil.c,v
retrieving revision 1.1.4.2
retrieving revision 1.1.4.2.2.1
diff -u -r1.1.4.2 -r1.1.4.2.2.1
--- ldaputil.c	13 Jan 2006 17:24:12 -0000	1.1.4.2
+++ ldaputil.c	24 Apr 2006 17:04:12 -0000	1.1.4.2.2.1
@@ -49,7 +49,7 @@
 static GList *ldaputil_test_v3( LDAP *ld, gint tov ) {
 	GList *baseDN = NULL;
 	gint rc, i;
-	LDAPMessage *result, *e;
+	LDAPMessage *result = NULL, *e;
 	gchar *attribs[2];
 	BerElement *ber;
 	gchar *attribute;
@@ -103,7 +103,8 @@
 			ber = NULL;
 		}
 	}
-	ldap_msgfree( result );
+	if (result)
+		ldap_msgfree( result );
 	return baseDN;
 }
 
@@ -117,7 +118,7 @@
 static GList *ldaputil_test_v2( LDAP *ld, gint tov ) {
 	GList *baseDN = NULL;
 	gint rc, i;
-	LDAPMessage *result, *e;
+	LDAPMessage *result = NULL, *e;
 	gchar *attribs[1];
 	BerElement *ber;
 	gchar *attribute;
@@ -181,7 +182,8 @@
 			ber = NULL;
 		}
 	}
-	ldap_msgfree( result );
+	if (result)
+		ldap_msgfree( result );
 	return baseDN;
 }
 

Index: summaryview.c
===================================================================
RCS file: /cvsroot/sylpheed-claws/sylpheed-claws/src/summaryview.c,v
retrieving revision 1.395.2.190
retrieving revision 1.395.2.190.2.1
diff -u -r1.395.2.190 -r1.395.2.190.2.1
--- summaryview.c	5 Apr 2006 06:19:03 -0000	1.395.2.190
+++ summaryview.c	24 Apr 2006 17:04:12 -0000	1.395.2.190.2.1
@@ -4564,6 +4564,16 @@
 	summaryview->colorlabel_menu = menu;
 }
 
+static gboolean summary_popup_menu(GtkWidget *widget, gpointer data)
+{
+	SummaryView *summaryview = (SummaryView *)data;
+	summaryview->display_msg = messageview_is_visible(summaryview->messageview);
+
+	gtk_menu_popup(GTK_MENU(summaryview->popupmenu), NULL, NULL,
+		       NULL, NULL, 0, gtk_get_current_event_time());
+	return TRUE;
+}
+
 static GtkWidget *summary_ctree_create(SummaryView *summaryview)
 {
 	GtkWidget *ctree;
@@ -4666,6 +4676,8 @@
 	g_signal_connect(G_OBJECT(ctree), "button_press_event",
 			 G_CALLBACK(summary_button_pressed),
 			 summaryview);
+	g_signal_connect(G_OBJECT(ctree), "popup-menu",
+			 G_CALLBACK(summary_popup_menu), summaryview);
 	g_signal_connect(G_OBJECT(ctree), "button_release_event",
 			 G_CALLBACK(summary_button_released),
 			 summaryview);



-------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642