gfgit/claws-mail
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

2005-05-24 [colin] 1.9.11cvs6

Browse source 
* src/folderview.c
	* src/prefs_common.c
	* src/prefs_common.h
		Add a confirmation to folder drag and drop
		fixes bug #156
	* src/alertpanel.c
	* src/alertpanel.h
		fix _with_disable parameters so that
		the buttons labels are specifiable too
	* src/plugins/pgpmime/sgpgme.c
		reflect said change
This commit is contained in:
Colin Leroy 2005-05-24 01:09:19 +00:00
parent 5efaf007f1
commit 88caec5d1c
9 changed files with 46 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
ChangeLog-gtk2.claws
View file

@ -1,3 +1,18 @@
2005-05-24 [colin] 1.9.11cvs6
* src/folderview.c
* src/prefs_common.c
* src/prefs_common.h
Add a confirmation to folder drag and drop
fixes bug #156
* src/alertpanel.c
* src/alertpanel.h
fix _with_disable parameters so that
the buttons labels are specifiable too
* src/plugins/pgpmime/sgpgme.c
reflect said change
2005-05-24 [colin] 1.9.11cvs5
* src/folderview.c

1
PATCHSETS
View file

@ -494,3 +494,4 @@
( cvs diff -u -r 1.1.2.16 -r 1.1.2.17 src/plugins/pgpmime/pgpmime.c; ) > 1.9.11cvs3.patchset
( cvs diff -u -r 1.13.2.12 -r 1.13.2.13 src/common/socket.c; ) > 1.9.11cvs4.patchset
( cvs diff -u -r 1.207.2.35 -r 1.207.2.36 src/folderview.c; ) > 1.9.11cvs5.patchset
( cvs diff -u -r 1.207.2.36 -r 1.207.2.37 src/folderview.c; cvs diff -u -r 1.204.2.37 -r 1.204.2.38 src/prefs_common.c; cvs diff -u -r 1.103.2.16 -r 1.103.2.17 src/prefs_common.h; cvs diff -u -r 1.17.2.13 -r 1.17.2.14 src/alertpanel.c; cvs diff -u -r 1.5.2.3 -r 1.5.2.4 src/alertpanel.h; cvs diff -u -r 1.1.2.7 -r 1.1.2.8 src/plugins/pgpmime/sgpgme.c; ) > 1.9.11cvs6.patchset

2
configure.ac
View file

@ -11,7 +11,7 @@ MINOR_VERSION=9
MICRO_VERSION=11
INTERFACE_AGE=0
BINARY_AGE=0
EXTRA_VERSION=5
EXTRA_VERSION=6
EXTRA_RELEASE=
EXTRA_GTK2_VERSION=

7
src/alertpanel.c
View file

@ -124,6 +124,9 @@ static void alertpanel_message(const gchar *title, const gchar *message, gint ty
AlertValue alertpanel_message_with_disable(const gchar *title,
const gchar *message,
const gchar *button1_label,
const gchar *button2_label,
const gchar *button3_label,
gint alert_type)
{
if (alertpanel_is_open)
@ -131,8 +134,8 @@ AlertValue alertpanel_message_with_disable(const gchar *title,
else
alertpanel_is_open = TRUE;
alertpanel_create(title, message, NULL, NULL, NULL, TRUE, NULL,
alert_type);
alertpanel_create(title, message, button1_label, button2_label,
button3_label, TRUE, NULL, alert_type);
alertpanel_show();
return value;

3
src/alertpanel.h
View file

@ -64,6 +64,9 @@ AlertValue alertpanel_with_type (const gchar *title,
AlertValue alertpanel_message_with_disable (const gchar *title,
const gchar *message,
const gchar *button1_label,
const gchar *button2_label,
const gchar *button3_label,
gint alert_type);
void alertpanel_notice (const gchar *format,

16
src/folderview.c
View file

@ -1855,6 +1855,22 @@ void folderview_move_folder(FolderView *folderview, FolderItem *from_folder,
src_node = gtk_ctree_find_by_row_data(GTK_CTREE(folderview->ctree), NULL, from_folder);
from_parent = folder_item_parent(from_folder);
if (prefs_common.warn_dnd) {
buf = g_strdup_printf(_("Do you really want to move folder `%s' to a "
"sub-folder of `%s' ?"), from_folder->name,
to_folder->name);
status = alertpanel_message_with_disable(_("Move folder"), buf,
_("Yes"), _("No"), NULL, ALERT_QUESTION);
g_free(buf);
if (status != G_ALERTDEFAULT
&& status != (G_ALERTDEFAULT | G_ALERTDISABLE))
return;
if (status & G_ALERTDISABLE)
prefs_common.warn_dnd = FALSE;
}
buf = g_strdup_printf(_("Moving %s to %s..."), from_folder->name, to_folder->name);
STATUSBAR_PUSH(folderview->mainwin, buf);
g_free(buf);

3
src/plugins/pgpmime/sgpgme.c
View file

@ -353,7 +353,8 @@ void sgpgme_init()
(_("Warning"),
_("GnuPG is not installed properly, or needs "
"to be upgraded.\n"
"OpenPGP support disabled."), ALERT_WARNING);
"OpenPGP support disabled."),
NULL, NULL, NULL, ALERT_WARNING);
if (val & G_ALERTDISABLE)
prefs_gpg_get_config()->gpg_warning = FALSE;
}

2
src/prefs_common.c
View file

@ -749,6 +749,8 @@ static PrefParam param[] = {
NULL, NULL, NULL},
{"filteringwin_height", "-1", &prefs_common.filteringwin_height, P_INT,
NULL, NULL, NULL},
{"warn_dnd", "1", &prefs_common.warn_dnd, P_INT,
NULL, NULL, NULL},
{NULL, NULL, NULL, P_OTHER, NULL, NULL, NULL}
};

1
src/prefs_common.h
View file

@ -313,6 +313,7 @@ struct _PrefsCommon
gint filteringwin_width;
gint filteringwin_height;
gint warn_dnd;
};
extern PrefsCommon prefs_common;