sync with 0.8.1cvs29

diff --git a/ChangeLog b/ChangeLog
index cc552c9128dfd11fbb40fbfe12f2c2ac2887b619..b220033e459004094c27d8d099a08adc1fd76b1a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2002-08-23
+
+       * src/alertpanel.c: alertpanel_create(): modified the layout.
+       * src/rfc2015.c: check_signature(): don't abort on error.
+

 2002-08-22
 
        * src/compose.c: compose_wrap_line_all(): freeze widget only if
 2002-08-22
 
        * src/compose.c: compose_wrap_line_all(): freeze widget only if

diff --git a/ChangeLog.claws b/ChangeLog.claws
index f1930d248dfbff25825ad27104654d0d86129677..68e8a2ec741d9b0a37955b4fcff98ce7334e7400 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,8 @@
+2002-08-23 [paul]      0.8.1claws105
+
+       * sync with 0.8.1cvs29
+               see ChangeLog 2002-08-23
+

 2002-08-23 [colin]     0.8.1claws104
 
        * src/summaryview.c
 2002-08-23 [colin]     0.8.1claws104
 
        * src/summaryview.c

diff --git a/ChangeLog.jp b/ChangeLog.jp
index 20e6f2ba26e7a47e9c8c0e08445b0877c8fd985d..2052cc1a8c79c4e5e896a1d7b96c00757ce9c48a 100644 (file)
--- a/ChangeLog.jp
+++ b/ChangeLog.jp
@@ -1,3 +1,8 @@
+2002-08-23
+
+       * src/alertpanel.c: alertpanel_create(): ¥ì¥¤¥¢¥¦¥È¤ò½¤Àµ¡£
+       * src/rfc2015.c: check_signature(): ¥¨¥é¡¼»þ¤Ë abort ¤·¤Ê¤¤¤è¤¦¤Ë¤·¤¿¡£
+

 2002-08-22
 
        * src/compose.c: compose_wrap_line_all(): ¤Á¤é¤Ä¤­¤òÍÞ¤¨¤ë¤¿¤á¤Ë
 2002-08-22
 
        * src/compose.c: compose_wrap_line_all(): ¤Á¤é¤Ä¤­¤òÍÞ¤¨¤ë¤¿¤á¤Ë

diff --git a/configure.in b/configure.in
index 9146718e4a8853f4b4b9faa02ad590b61022ebd1..0b5243c640c670dde6661db5620bf2f59f6405f7 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -8,7 +8,7 @@ MINOR_VERSION=8
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=claws104
+EXTRA_VERSION=claws105

 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target

diff --git a/src/alertpanel.c b/src/alertpanel.c
index ef5f4acfdcc387729341aabae58ffcc35b5484e7..cdaefc305e00a575ad36d16fc9405fa86fb4effd 100644 (file)
--- a/src/alertpanel.c
+++ b/src/alertpanel.c
@@ -197,7 +197,8 @@ static void alertpanel_create(const gchar *title,
        GtkWidget *label;
        GtkWidget *hbox;
        GtkWidget *vbox;
        GtkWidget *label;
        GtkWidget *hbox;
        GtkWidget *vbox;

-       GtkWidget *vbox2;
+       GtkWidget *spc_vbox;
+       GtkWidget *msg_vbox;

        GtkWidget *disable_chkbtn;
        GtkWidget *confirm_area;
        GtkWidget *button1;
        GtkWidget *disable_chkbtn;
        GtkWidget *confirm_area;
        GtkWidget *button1;


@@ -244,27 +245,44 @@ static void alertpanel_create(const gchar *title,
        vbox = gtk_vbox_new(FALSE, 0);
        gtk_container_add(GTK_CONTAINER(GTK_DIALOG(dialog)->action_area),
                          vbox);
        vbox = gtk_vbox_new(FALSE, 0);
        gtk_container_add(GTK_CONTAINER(GTK_DIALOG(dialog)->action_area),
                          vbox);

-       vbox2 = gtk_vbox_new(FALSE, 0);
-       gtk_container_set_border_width(GTK_CONTAINER(vbox2), 20);
-       gtk_box_pack_start(GTK_BOX(vbox), vbox2, TRUE, TRUE, 0);
+
+       spc_vbox = gtk_vbox_new(FALSE, 0);
+       gtk_box_pack_start(GTK_BOX(vbox), spc_vbox, FALSE, FALSE, 0);
+       gtk_widget_set_usize(spc_vbox, -1, 16);
+
+       msg_vbox = gtk_vbox_new(FALSE, 0);
+       gtk_box_pack_start(GTK_BOX(vbox), msg_vbox, FALSE, FALSE, 0);

 
        /* for message label */
        hbox = gtk_hbox_new(FALSE, 0);
 
        /* for message label */
        hbox = gtk_hbox_new(FALSE, 0);

-       gtk_box_pack_start(GTK_BOX(vbox2), hbox, FALSE, FALSE, 0);
+       gtk_box_pack_start(GTK_BOX(msg_vbox), hbox, FALSE, FALSE, 0);

 
        /* message label */
        label = gtk_label_new(message);
 
        /* message label */
        label = gtk_label_new(message);

-       gtk_box_pack_start(GTK_BOX(hbox), label, TRUE, TRUE, 12);
+       gtk_box_pack_start(GTK_BOX(hbox), label, TRUE, TRUE, 24);

        gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
        gtk_label_set_justify(GTK_LABEL(label), GTK_JUSTIFY_LEFT);
 
        gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
        gtk_label_set_justify(GTK_LABEL(label), GTK_JUSTIFY_LEFT);
 

-       /* custom widget */
-       if (custom_widget) {
-               GtkWidget *hbox2 = gtk_hbox_new(FALSE, 0);
-               gtk_box_pack_start(GTK_BOX(vbox2), hbox2, FALSE, FALSE, 0);
-               gtk_box_pack_start(GTK_BOX(hbox2), custom_widget, FALSE, FALSE, 
-                                  12);
+       if (can_disable) {
+               hbox = gtk_hbox_new(FALSE, 0);
+               gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
+               gtk_container_set_border_width(GTK_CONTAINER(hbox), 8);
+
+               disable_chkbtn = gtk_check_button_new_with_label
+                       (_("Show this message next time"));
+               gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(disable_chkbtn),
+                                            TRUE);
+               gtk_box_pack_start(GTK_BOX(hbox), disable_chkbtn,
+                                  FALSE, FALSE, 0);
+               gtk_signal_connect(GTK_OBJECT(disable_chkbtn), "toggled",
+                                  GTK_SIGNAL_FUNC(alertpanel_button_toggled),
+                                  GUINT_TO_POINTER(G_ALERTDISABLE));
+       } else {
+               spc_vbox = gtk_vbox_new(FALSE, 0);
+               gtk_box_pack_start(GTK_BOX(vbox), spc_vbox, FALSE, FALSE, 0);
+               gtk_widget_set_usize(spc_vbox, -1, 20);

        }
        }

+

        /* for button(s) */
        if (!button1_label)
                button1_label = _("OK");
        /* for button(s) */
        if (!button1_label)
                button1_label = _("OK");


@@ -302,18 +320,6 @@ static void alertpanel_create(const gchar *title,
                                   GTK_SIGNAL_FUNC(alertpanel_button_clicked),
                                   GUINT_TO_POINTER(G_ALERTOTHER));
 
                                   GTK_SIGNAL_FUNC(alertpanel_button_clicked),
                                   GUINT_TO_POINTER(G_ALERTOTHER));
 

-       if (can_disable) {
-               disable_chkbtn = gtk_check_button_new_with_label
-                       (_("Show this message next time"));
-               gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(disable_chkbtn),
-                                            TRUE);
-               gtk_box_pack_end(GTK_BOX(vbox), disable_chkbtn,
-                                FALSE, FALSE, 0);
-               gtk_signal_connect(GTK_OBJECT(disable_chkbtn), "toggled",
-                                  GTK_SIGNAL_FUNC(alertpanel_button_toggled),
-                                  GUINT_TO_POINTER(G_ALERTDISABLE));
-       }
-

        gtk_widget_show_all(dialog);
 }
 
        gtk_widget_show_all(dialog);
 }
 

diff --git a/src/rfc2015.c b/src/rfc2015.c
index 96147a0bec95b489e71ef5cb5e6cf4fd81718def..2f89a7da94501e6697367205dd22fca5a8d01323 100644 (file)
--- a/src/rfc2015.c
+++ b/src/rfc2015.c
@@ -304,8 +304,10 @@ static void check_signature (MimeInfo *mimeinfo, MimeInfo *partinfo, FILE *fp)
     }
 
     err = gpgme_op_verify (ctx, sig, text, &status);
     }
 
     err = gpgme_op_verify (ctx, sig, text, &status);

-    if (err) 
+    if (err)  {

         debug_print ("gpgme_op_verify failed: %s\n", gpgme_strerror (err));
         debug_print ("gpgme_op_verify failed: %s\n", gpgme_strerror (err));

+        goto leave;
+    }

 
     /* FIXME: check what the heck this sig_status_full stuff is.
      * it should better go into sigstatus.c */
 
     /* FIXME: check what the heck this sig_status_full stuff is.
      * it should better go into sigstatus.c */


@@ -316,9 +318,8 @@ leave:
     result = gpgmegtk_sig_status_to_string(status);
     debug_print("verification status: %s\n", result);
     if (prefs_common.gpg_signature_popup)
     result = gpgmegtk_sig_status_to_string(status);
     debug_print("verification status: %s\n", result);
     if (prefs_common.gpg_signature_popup)

-       gpgmegtk_sig_status_update (statuswindow,ctx);
+       gpgmegtk_sig_status_update (statuswindow, ctx);

 
 

-    g_assert (!err); /* FIXME: Hey: this may indeed happen */

     g_free (partinfo->sigstatus);
     partinfo->sigstatus = g_strdup (result);
 
     g_free (partinfo->sigstatus);
     partinfo->sigstatus = g_strdup (result);