[Commits] gtkutils.c 1.5.2.95.2.1 1.5.2.95.2.2 progressdialog.c 1.1.4.27.2.1 1.1.4.27.2.2 progressdialog.h 1.1.4.16 1.1.4.16.2.1 sslcertwindow.c 1.9.2.32 1.9.2.32.2.1
miras at claws-mail.org
miras at claws-mail.org
Sun Feb 5 23:11:14 CET 2012
Update of /home/claws-mail/claws/src/gtk
In directory srv:/tmp/cvs-serv2369/src/gtk
Modified Files:
Tag: new-contacts
gtkutils.c progressdialog.c progressdialog.h sslcertwindow.c
Log Message:
2012-02-05 [mir] 3.7.10cvs16.22-new-contacts
* src/addressbook-dbus.c
* src/addressbook-dbus.h
* src/claws-contacts.xml
* src/compose.c
* src/folder.c
* src/folderview.c
* src/inc.c
* src/jpilot.c
* src/main.c
* src/mainwindow.c
* src/messageview.c
* src/messageview.h
* src/mutt.c
* src/pine.c
* src/prefs_common.c
* src/prefs_common.h
* src/procmime.c
* src/procmsg.c
* src/procmsg.h
* src/send_message.c
* src/summaryview.c
* src/summaryview.h
* src/vcard.c
* src/gtk/gtkutils.c
* src/gtk/progressdialog.c
* src/gtk/progressdialog.h
* src/gtk/sslcertwindow.c
Applied patch 3.8.0cvs18 to 3.8.0cvs26 from HEAD.
Index: progressdialog.c
===================================================================
RCS file: /home/claws-mail/claws/src/gtk/progressdialog.c,v
retrieving revision 1.1.4.27.2.1
retrieving revision 1.1.4.27.2.2
diff -u -d -r1.1.4.27.2.1 -r1.1.4.27.2.2
--- progressdialog.c 29 Nov 2011 00:15:25 -0000 1.1.4.27.2.1
+++ progressdialog.c 5 Feb 2012 22:11:11 -0000 1.1.4.27.2.2
@@ -50,6 +50,7 @@
GtkWidget *hbox;
GtkWidget *vbox;
GtkWidget *label;
+ GtkWidget *showlog_btn;
GtkWidget *cancel_btn;
GtkWidget *progressbar;
GtkWidget *scrolledwin;
@@ -81,6 +82,9 @@
gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 8);
gtk_widget_show(label);
+ showlog_btn = gtk_dialog_add_button(GTK_DIALOG(dialog),
+ _("_View log"),
+ GTK_RESPONSE_NONE);
cancel_btn = gtk_dialog_add_button(GTK_DIALOG(dialog),
GTK_STOCK_CANCEL,
GTK_RESPONSE_NONE);
@@ -100,7 +104,6 @@
GTK_POLICY_AUTOMATIC,
GTK_POLICY_AUTOMATIC);
-
store = gtk_list_store_new(N_PROGRESS_COLUMNS, GDK_TYPE_PIXBUF, G_TYPE_STRING,
G_TYPE_STRING, G_TYPE_POINTER);
@@ -142,6 +145,7 @@
progress->window = dialog;
progress->label = label;
+ progress->showlog_btn = showlog_btn;
progress->cancel_btn = cancel_btn;
progress->progressbar = progressbar;
progress->treeview = treeview;
Index: gtkutils.c
===================================================================
RCS file: /home/claws-mail/claws/src/gtk/gtkutils.c,v
retrieving revision 1.5.2.95.2.1
retrieving revision 1.5.2.95.2.2
diff -u -d -r1.5.2.95.2.1 -r1.5.2.95.2.2
--- gtkutils.c 29 Nov 2011 00:15:25 -0000 1.5.2.95.2.1
+++ gtkutils.c 5 Feb 2012 22:11:11 -0000 1.5.2.95.2.2
@@ -451,7 +451,7 @@
wcs = g_utf8_to_ucs4(str, -1, &items_read, &items_written, &error);
if (error != NULL) {
- g_warning("An error occured while converting a string from UTF-8 to UCS-4: %s\n",
+ g_warning("An error occurred while converting a string from UTF-8 to UCS-4: %s\n",
error->message);
g_error_free(error);
}
@@ -487,7 +487,8 @@
wcs = g_utf8_to_ucs4(str, -1, &items_read, &items_written, &error);
if (error != NULL) {
- g_warning("An error occured while converting a string from UTF-8 to UCS-4: %s\n", error->message);
+ g_warning("An error occurred while converting a string from UTF-8 to UCS-4: %s\n",
+ error->message);
g_error_free(error);
}
if (!wcs || items_written <= 0) return FALSE;
@@ -1147,7 +1148,7 @@
if ((gdk_pixbuf_get_width(pixbuf) != 48) || (gdk_pixbuf_get_height(pixbuf) != 48)) {
g_object_unref(pixbuf);
- g_warning("wrong_size");
+ g_warning("wrong_size\n");
return NULL;
}
@@ -1253,7 +1254,7 @@
gtk_widget_set_style(btn_label, style);
#if !GTK_CHECK_VERSION(3, 0, 0)
} else
- g_warning("about_create(): color allocation failed.\n");
+ g_warning("color allocation failed\n");
#endif
g_signal_connect(G_OBJECT(btn), "enter",
Index: sslcertwindow.c
===================================================================
RCS file: /home/claws-mail/claws/src/gtk/sslcertwindow.c,v
retrieving revision 1.9.2.32
retrieving revision 1.9.2.32.2.1
diff -u -d -r1.9.2.32 -r1.9.2.32.2.1
--- sslcertwindow.c 16 Feb 2011 07:16:22 -0000 1.9.2.32
+++ sslcertwindow.c 5 Feb 2012 22:11:11 -0000 1.9.2.32.2.1
@@ -94,8 +94,8 @@
tmp = g_malloc(BUFFSIZE);
if (gnutls_x509_crt_get_issuer_dn_by_oid(cert->x509_cert,
GNUTLS_OID_X520_COUNTRY_NAME, 0, 0, tmp, &n) == 0) {
- strncat(issuer_location, ", ", BUFFSIZE-strlen(issuer_location));
- strncat(issuer_location, tmp, BUFFSIZE-strlen(issuer_location));
+ strncat(issuer_location, ", ", BUFFSIZE-strlen(issuer_location)-1);
+ strncat(issuer_location, tmp, BUFFSIZE-strlen(issuer_location)-1);
}
g_free(tmp);
}
@@ -121,8 +121,8 @@
tmp = g_malloc(BUFFSIZE);
if (gnutls_x509_crt_get_dn_by_oid(cert->x509_cert,
GNUTLS_OID_X520_COUNTRY_NAME, 0, 0, tmp, &n) == 0) {
- strncat(subject_location, ", ", BUFFSIZE-strlen(subject_location));
- strncat(subject_location, tmp, BUFFSIZE-strlen(subject_location));
+ strncat(subject_location, ", ", BUFFSIZE-strlen(subject_location)-1);
+ strncat(subject_location, tmp, BUFFSIZE-strlen(subject_location)-1);
}
g_free(tmp);
}
Index: progressdialog.h
===================================================================
RCS file: /home/claws-mail/claws/src/gtk/progressdialog.h,v
retrieving revision 1.1.4.16
retrieving revision 1.1.4.16.2.1
diff -u -d -r1.1.4.16 -r1.1.4.16.2.1
--- progressdialog.h 16 Feb 2011 07:16:22 -0000 1.1.4.16
+++ progressdialog.h 5 Feb 2012 22:11:11 -0000 1.1.4.16.2.1
@@ -29,6 +29,7 @@
{
GtkWidget *window;
GtkWidget *label;
+ GtkWidget *showlog_btn;
GtkWidget *cancel_btn;
GtkWidget *progressbar;
GtkWidget *treeview;
More information about the Commits
mailing list