CVS: sylpheed-claws/src compose.c,1.382.2.266,1.382.2.267 imap.c,1.179.2.109,1.179.2.110 summaryview.c,1.395.2.192,1.395.2.193

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

Modified Files:
      Tag: gtk2
	compose.c imap.c summaryview.c 
Log Message:
2006-04-24 [colin]	2.1.1cvs29

	* src/compose.c
		Fix logic on error with send dialog on
	* src/imap.c
		Fix compilation without libetpan, thanks
		to Fabien
	* src/summaryview.c
		Fix 'context-menu' key

Index: compose.c
===================================================================
RCS file: /cvsroot/sylpheed-claws/sylpheed-claws/src/compose.c,v
retrieving revision 1.382.2.266
retrieving revision 1.382.2.267
diff -u -r1.382.2.266 -r1.382.2.267
--- compose.c	19 Apr 2006 17:28:39 -0000	1.382.2.266
+++ compose.c	24 Apr 2006 17:01:04 -0000	1.382.2.267
@@ -3984,12 +3984,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;
 	}
 	
@@ -4017,12 +4017,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: imap.c
===================================================================
RCS file: /cvsroot/sylpheed-claws/sylpheed-claws/src/imap.c,v
retrieving revision 1.179.2.109
retrieving revision 1.179.2.110
diff -u -r1.179.2.109 -r1.179.2.110
--- imap.c	23 Apr 2006 12:17:23 -0000	1.179.2.109
+++ imap.c	24 Apr 2006 17:01:06 -0000	1.179.2.110
@@ -4289,10 +4289,12 @@
 
 static void imap_item_set_xml(Folder *folder, FolderItem *item, XMLTag *tag)
 {
+#ifdef HAVE_LIBETPAN
 	GList *cur;
-
+#endif
 	folder_item_set_xml(folder, item, tag);
 	
+#ifdef HAVE_LIBETPAN
 	for (cur = tag->attr; cur != NULL; cur = g_list_next(cur)) {
 		XMLAttr *attr = (XMLAttr *) cur->data;
 
@@ -4300,6 +4302,7 @@
 		if (!strcmp(attr->name, "uidnext"))
 			IMAP_FOLDER_ITEM(item)->uid_next = atoi(attr->value);
 	}
+#endif
 }
 
 static XMLTag *imap_item_get_xml(Folder *folder, FolderItem *item)
@@ -4308,8 +4311,10 @@
 
 	tag = folder_item_get_xml(folder, item);
 
+#ifdef HAVE_LIBETPAN
 	xml_tag_add_attr(tag, xml_attr_new_int("uidnext", 
 			IMAP_FOLDER_ITEM(item)->uid_next));
 
+#endif
 	return tag;
 }

Index: summaryview.c
===================================================================
RCS file: /cvsroot/sylpheed-claws/sylpheed-claws/src/summaryview.c,v
retrieving revision 1.395.2.192
retrieving revision 1.395.2.193
diff -u -r1.395.2.192 -r1.395.2.193
--- summaryview.c	6 Apr 2006 21:34:01 -0000	1.395.2.192
+++ summaryview.c	24 Apr 2006 17:01:07 -0000	1.395.2.193
@@ -4563,6 +4563,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;
@@ -4665,6 +4675,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