rpms/balsa/devel balsa-gmime-537507.patch, NONE, 1.1 balsa.spec, 1.43, 1.44

Pawel Salek pawsa at fedoraproject.org
Thu Dec 18 21:32:25 UTC 2008 

Author: pawsa

Update of /cvs/pkgs/rpms/balsa/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23415

Modified Files:
	balsa.spec 
Added Files:
	balsa-gmime-537507.patch 
Log Message:
- Port to gmime-2.4 using http://bugzilla.gnome.org/537507 


balsa-gmime-537507.patch:

--- NEW FILE balsa-gmime-537507.patch ---
Index: src/balsa-mime-widget-message.c
===================================================================
--- src/balsa-mime-widget-message.c	(revision 7967)
+++ src/balsa-mime-widget-message.c	(working copy)
@@ -305,9 +305,9 @@
 
     /* create a message */
     message = libbalsa_message_new();
-    data = internet_address_to_string(balsa_app.current_ident->ia, FALSE);
-    message->headers->from = internet_address_parse_string(data);
-    g_free(data);
+    message->headers->from = internet_address_list_new();
+    internet_address_list_add(message->headers->from,
+                              balsa_app.current_ident->ia);
 
     data = libbalsa_message_body_get_parameter(mime_body, "subject");
     if (data) {
@@ -316,7 +316,7 @@
     }
 
     data = libbalsa_message_body_get_parameter(mime_body, "server");
-    message->headers->to_list = internet_address_parse_string(data);
+    message->headers->to_list = internet_address_list_parse_string(data);
     g_free(data);
 
     /* the original body my have some data to be returned as commands... */
@@ -614,7 +614,7 @@
 {
     gchar *value;
 
-    if (list == NULL)
+    if (list == NULL || internet_address_list_length(list) == 0)
 	return;
 
     if (!(bm->shown_headers == HEADERS_ALL ||
Index: src/store-address.c
===================================================================
--- src/store-address.c	(revision 7967)
+++ src/store-address.c	(working copy)
@@ -59,13 +59,13 @@
                                        StoreAddressInfo * info);
 static void store_address_add_address(StoreAddressInfo * info,
                                       const gchar * label,
-                                      const InternetAddress * address,
-                                      const InternetAddress * group);
+                                      InternetAddress * address,
+                                      InternetAddress * group);
 static void store_address_add_lbaddress(StoreAddressInfo * info,
                                         const LibBalsaAddress *address);
 static void store_address_add_list(StoreAddressInfo * info,
                                    const gchar * label,
-				   const InternetAddressList * list);
+				   InternetAddressList * list);
 
 /* 
  * public interface: balsa_store_address
@@ -348,8 +348,8 @@
  * make a new page in the notebook */
 static void
 store_address_add_address(StoreAddressInfo * info,
-                          const gchar * lab, const InternetAddress * ia,
-			  const InternetAddress * group)
+                          const gchar * lab, InternetAddress * ia,
+			  InternetAddress * group)
 {
     gchar *text;
     LibBalsaAddress *address;
@@ -366,7 +366,7 @@
     address = libbalsa_address_new();
     address->full_name =
         g_strdup(ia->name ? ia->name : group ? group->name : NULL);
-    address->address_list = g_list_prepend(NULL, g_strdup(ia->value.addr));
+    address->address_list = g_list_prepend(NULL, g_strdup(INTERNET_ADDRESS_MAILBOX (ia)->addr));
     ew = libbalsa_address_get_edit_widget(address, entries, NULL, NULL);
     g_object_unref(address);
 
@@ -409,20 +409,22 @@
 static void
 store_address_add_list(StoreAddressInfo * info,
                        const gchar * label,
-                       const InternetAddressList * list)
+                       InternetAddressList * list)
 {
-    for (; list; list = list->next) {
-        InternetAddress *ia = list->address;
-
-        if (ia->type == INTERNET_ADDRESS_NAME)
+    int i, j;
+    
+    for (i = 0; i < internet_address_list_length (list); i++) {
+        InternetAddress *ia = internet_address_list_get_address (list, i);
+	
+        if (INTERNET_ADDRESS_IS_MAILBOX (ia))
             store_address_add_address(info, label, ia, NULL);
-        else if (ia->type == INTERNET_ADDRESS_GROUP) {
-            InternetAddressList *member;
+        else {
+            InternetAddressList *members = INTERNET_ADDRESS_GROUP (ia)->members;
 
-            for (member = ia->value.members; member; member = member->next) {
-                InternetAddress *member_address = member->address;
+            for (j = 0; j < internet_address_list_length (members); j++) {
+                InternetAddress *member_address = internet_address_list_get_address (members, j);
 
-                if (member_address->type == INTERNET_ADDRESS_NAME)
+                if (INTERNET_ADDRESS_IS_MAILBOX (member_address))
                     store_address_add_address(info, label, member_address,
                                               ia);
             }
Index: src/sendmsg-window.c
===================================================================
--- src/sendmsg-window.c	(revision 7967)
+++ src/sendmsg-window.c	(working copy)
@@ -890,26 +890,29 @@
 static gint
 delete_handler(BalsaSendmsg * bsmsg)
 {
-    InternetAddressList *l =
-        libbalsa_address_view_get_list(bsmsg->recipient_view, "To:");
-    const gchar *tmp = l && l->address && l->address->name ?
-        l->address->name : _("(No name)");
+    InternetAddressList *list;
+    const InternetAddress *ia;
+    const gchar *tmp;
     gint reply;
     GtkWidget *d;
 
     if (balsa_app.debug)
-        printf("delete_event_cb\n");
+        printf("%s\n", __func__);
 
     if (bsmsg->state == SENDMSG_STATE_CLEAN)
         return FALSE;
 
+    list = libbalsa_address_view_get_list(bsmsg->recipient_view, "To:");
+    ia = internet_address_list_get_address(list, 0);
+    tmp = ia && ia->name ? ia->name : _("(No name)");
+
     d = gtk_message_dialog_new(GTK_WINDOW(bsmsg->window),
                                GTK_DIALOG_DESTROY_WITH_PARENT,
                                GTK_MESSAGE_QUESTION,
                                GTK_BUTTONS_YES_NO,
                                _("The message to '%s' is modified.\n"
                                  "Save message to Draftbox?"), tmp);
-    internet_address_list_destroy(l);
+    g_object_unref(list);
     gtk_dialog_set_default_response(GTK_DIALOG(d), GTK_RESPONSE_YES);
     gtk_dialog_add_button(GTK_DIALOG(d),
                           GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL);
@@ -1243,7 +1246,7 @@
                 libbalsa_address_view_get_list(bsmsg->recipient_view,
                                                address_types[type]);
             gchar *p = internet_address_list_to_string(list, FALSE);
-            internet_address_list_destroy(list);
+            g_object_unref(list);
             fprintf(tmp, "%s %s\n", _(address_types[type]), p);
             g_free(p);
         }
@@ -1455,39 +1458,49 @@
 #endif
 
     if (bsmsg->ident->bcc) {
-        InternetAddressList *l,
-                            *old_ident_list, *new_ident_list,
-                            *old_list, *new_list = NULL;
+        InternetAddressList *bcc_list, *ident_list;
+	int i, j;
 
-        /* Copy the old list of Bcc addresses, omitting any that came
-         * from the old identity: */
-        old_ident_list = internet_address_parse_string(bsmsg->ident->bcc);
-        old_list =
-            libbalsa_address_view_get_list(bsmsg->recipient_view,
-                                           "Bcc:");
-        for (l = old_list; l; l = l->next) {
-            InternetAddress *ia = l->address;
-            InternetAddressList *m;
+        bcc_list =
+            libbalsa_address_view_get_list(bsmsg->recipient_view, "Bcc:");
 
-            for (m = old_ident_list; m; m = m->next)
-                if (libbalsa_ia_rfc2821_equal(ia, m->address))
-                    break;
-            if (!m)     /* We didn't find this address. */
-                new_list = internet_address_list_append(new_list, ia);
+        ident_list = internet_address_list_parse_string(bsmsg->ident->bcc);
+        if (ident_list) {
+            /* Remove any Bcc addresses that came from the old identity
+             * from the list. */
+            gint ident_list_len = internet_address_list_length(ident_list);
+
+            for (i = 0; i < internet_address_list_length(bcc_list); i++) {
+                InternetAddress *ia =
+                    internet_address_list_get_address (bcc_list, i);
+
+                for (j = 0; j < ident_list_len; j++) {
+                    InternetAddress *ia2 =
+                        internet_address_list_get_address(ident_list, j);
+                    if (libbalsa_ia_rfc2821_equal(ia, ia2))
[...3389 lines suppressed...]
             }
 
-            filter = g_mime_filter_crlf_new(GMIME_FILTER_CRLF_DECODE,
-                                            GMIME_FILTER_CRLF_MODE_CRLF_ONLY);
+            filter = g_mime_filter_crlf_new(FALSE, FALSE);
             g_mime_stream_filter_add(GMIME_STREAM_FILTER(stream), filter);
             g_object_unref(filter);
         }
--- ./configure.orig	2008-12-18 21:42:34.000000000 +0100
+++ ./configure	2008-12-18 21:43:29.000000000 +0100
@@ -6960,14 +6960,14 @@
     { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"
 glib-2.0
 gtk+-2.0 >= 2.4
-gmime-2.0 >= 2.1.9
+gmime-2.4 >= 2.1.9
 \$gnome_extras
 \$gnome_print_extras
 \"") >&5
   ($PKG_CONFIG --exists --print-errors "
 glib-2.0
 gtk+-2.0 >= 2.4
-gmime-2.0 >= 2.1.9
+gmime-2.4 >= 2.1.9
 $gnome_extras
 $gnome_print_extras
 ") 2>&5
@@ -6977,7 +6977,7 @@
   pkg_cv_BALSA_CFLAGS=`$PKG_CONFIG --cflags "
 glib-2.0
 gtk+-2.0 >= 2.4
-gmime-2.0 >= 2.1.9
+gmime-2.4 >= 2.1.9
 $gnome_extras
 $gnome_print_extras
 " 2>/dev/null`
@@ -6994,14 +6994,14 @@
     { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"
 glib-2.0
 gtk+-2.0 >= 2.4
-gmime-2.0 >= 2.1.9
+gmime-2.4 >= 2.1.9
 \$gnome_extras
 \$gnome_print_extras
 \"") >&5
   ($PKG_CONFIG --exists --print-errors "
 glib-2.0
 gtk+-2.0 >= 2.4
-gmime-2.0 >= 2.1.9
+gmime-2.4 >= 2.1.9
 $gnome_extras
 $gnome_print_extras
 ") 2>&5
@@ -7011,7 +7011,7 @@
   pkg_cv_BALSA_LIBS=`$PKG_CONFIG --libs "
 glib-2.0
 gtk+-2.0 >= 2.4
-gmime-2.0 >= 2.1.9
+gmime-2.4 >= 2.1.9
 $gnome_extras
 $gnome_print_extras
 " 2>/dev/null`
@@ -7035,7 +7035,7 @@
 	        BALSA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "
 glib-2.0
 gtk+-2.0 >= 2.4
-gmime-2.0 >= 2.1.9
+gmime-2.4 >= 2.1.9
 $gnome_extras
 $gnome_print_extras
 " 2>&1`
@@ -7043,7 +7043,7 @@
 	        BALSA_PKG_ERRORS=`$PKG_CONFIG --print-errors "
 glib-2.0
 gtk+-2.0 >= 2.4
-gmime-2.0 >= 2.1.9
+gmime-2.4 >= 2.1.9
 $gnome_extras
 $gnome_print_extras
 " 2>&1`
@@ -7054,7 +7054,7 @@
 	{ { echo "$as_me:$LINENO: error: Package requirements (
 glib-2.0
 gtk+-2.0 >= 2.4
-gmime-2.0 >= 2.1.9
+gmime-2.4 >= 2.1.9
 $gnome_extras
 $gnome_print_extras
 ) were not met:
@@ -7071,7 +7071,7 @@
 echo "$as_me: error: Package requirements (
 glib-2.0
 gtk+-2.0 >= 2.4
-gmime-2.0 >= 2.1.9
+gmime-2.4 >= 2.1.9
 $gnome_extras
 $gnome_print_extras
 ) were not met:
@@ -7129,13 +7129,13 @@
    libgnome-2.0 libgnomeui-2.0
    glib-2.0
    gtk+-2.0 >= 2.4
-   gmime-2.0 >= 2.1.9
+   gmime-2.4 >= 2.1.9
 \"") >&5
   ($PKG_CONFIG --exists --print-errors "
    libgnome-2.0 libgnomeui-2.0
    glib-2.0
    gtk+-2.0 >= 2.4
-   gmime-2.0 >= 2.1.9
+   gmime-2.4 >= 2.1.9
 ") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -7144,7 +7144,7 @@
    libgnome-2.0 libgnomeui-2.0
    glib-2.0
    gtk+-2.0 >= 2.4
-   gmime-2.0 >= 2.1.9
+   gmime-2.4 >= 2.1.9
 " 2>/dev/null`
 else
   pkg_failed=yes
@@ -7160,13 +7160,13 @@
    libgnome-2.0 libgnomeui-2.0
    glib-2.0
    gtk+-2.0 >= 2.4
-   gmime-2.0 >= 2.1.9
+   gmime-2.4 >= 2.1.9
 \"") >&5
   ($PKG_CONFIG --exists --print-errors "
    libgnome-2.0 libgnomeui-2.0
    glib-2.0
    gtk+-2.0 >= 2.4
-   gmime-2.0 >= 2.1.9
+   gmime-2.4 >= 2.1.9
 ") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -7175,7 +7175,7 @@
    libgnome-2.0 libgnomeui-2.0
    glib-2.0
    gtk+-2.0 >= 2.4
-   gmime-2.0 >= 2.1.9
+   gmime-2.4 >= 2.1.9
 " 2>/dev/null`
 else
   pkg_failed=yes
@@ -7198,14 +7198,14 @@
    libgnome-2.0 libgnomeui-2.0
    glib-2.0
    gtk+-2.0 >= 2.4
-   gmime-2.0 >= 2.1.9
+   gmime-2.4 >= 2.1.9
 " 2>&1`
         else
 	        BALSA_AB_PKG_ERRORS=`$PKG_CONFIG --print-errors "
    libgnome-2.0 libgnomeui-2.0
    glib-2.0
    gtk+-2.0 >= 2.4
-   gmime-2.0 >= 2.1.9
+   gmime-2.4 >= 2.1.9
 " 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
@@ -7215,7 +7215,7 @@
    libgnome-2.0 libgnomeui-2.0
    glib-2.0
    gtk+-2.0 >= 2.4
-   gmime-2.0 >= 2.1.9
+   gmime-2.4 >= 2.1.9
 ) were not met:
 
 $BALSA_AB_PKG_ERRORS
@@ -7231,7 +7231,7 @@
    libgnome-2.0 libgnomeui-2.0
    glib-2.0
    gtk+-2.0 >= 2.4
-   gmime-2.0 >= 2.1.9
+   gmime-2.4 >= 2.1.9
 ) were not met:
 
 $BALSA_AB_PKG_ERRORS
@@ -10703,14 +10703,14 @@
 HICOLOR_ICON_DIR=`$PKG_CONFIG --variable=prefix gtk+-2.0`/share/icons/hicolor
 
 
-if $PKG_CONFIG --atleast-version=2.2.5 gmime-2.0 ; then
+if $PKG_CONFIG --atleast-version=2.2.5 gmime-2.4 ; then
 
 cat >>confdefs.h <<\_ACEOF
 #define HAVE_GMIME_2_2_5 1
 _ACEOF
 
 fi
-if $PKG_CONFIG --atleast-version=2.2.7 gmime-2.0 ; then
+if $PKG_CONFIG --atleast-version=2.2.7 gmime-2.4 ; then
 
 cat >>confdefs.h <<\_ACEOF
 #define HAVE_GMIME_2_2_7 1


Index: balsa.spec
===================================================================
RCS file: /cvs/pkgs/rpms/balsa/devel/balsa.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- balsa.spec	8 Sep 2008 16:46:27 -0000	1.43
+++ balsa.spec	18 Dec 2008 21:31:53 -0000	1.44
@@ -2,13 +2,14 @@
 
 Name:           balsa
 Version:        2.3.26
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Mail Client
 
 Group:          Applications/Internet
 License:        GPLv2+
 URL:            http://balsa.gnome.org/
 Source0:        http://balsa.gnome.org/%{name}-%{version}.tar.bz2
+Patch1: 	balsa-gmime-537507.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires: libesmtp >= 1.0.4
@@ -41,8 +42,9 @@
 
 %prep
 %setup -q
+%patch1 -p0
 
-perl -pi -e 's,-DGTK_DISABLE_DEPRECATED,,g' libbalsa/Makefile.in libinit_balsa/Makefile.in src/Makefile.in
+perl -pi -e 's,-DGTK_DISABLE_DEPRECATED,,g' libbalsa/Makefile* libinit_balsa/Makefile* src/Makefile*
 
 %build
 
@@ -104,6 +106,9 @@
 
 
 %changelog
+* Thu Dec 18 2008 Pawel Salek <pawsa at theochem.kth.se> - 2.3.26-3
+- Port to gmime-2.4 using http://bugzilla.gnome.org/537507 
+
 * Sun Sep 08 2008 Pawel Salek <pawsa at theochem.kth.se> - 2.3.26-2
 - Use deprecated GTK+ interface until upstream fixes their bugs.

More information about the fedora-extras-commits mailing list