Added a kludge, 'is_active' which is a static variable that holds whether

2000-12-11  Jeffrey Stedfast  <fejj@helixcode.com>

	* filter-folder.c (button_clicked): Added a kludge, 'is_active'
	which is a static variable that holds whether or not there is an
	active shell folder dialog up or not.

	* vfolder-editor.c (rule_delete): Autoselect the rule that ends up
	in the same position (or the one above it if the list is shorter
	than the position).

svn path=/trunk/; revision=6927
This commit is contained in:
Jeffrey Stedfast
2000-12-12 00:17:11 +00:00
committed by Jeffrey Stedfast
parent 6287bb1af4
commit 96cf97e4de
2 changed files with 12 additions and 0 deletions
+4
View File
@@ -1,5 +1,9 @@
2000-12-11 Jeffrey Stedfast <fejj@helixcode.com>
* filter-folder.c (button_clicked): Added a kludge, 'is_active'
which is a static variable that holds whether or not there is an
active shell folder dialog up or not.
* vfolder-editor.c (rule_delete): Autoselect the rule that ends up
in the same position (or the one above it if the list is shorter
than the position).
+8
View File
@@ -204,8 +204,14 @@ button_clicked (GtkButton *button, FilterFolder *ff)
#ifdef SHELL
const char *allowed_types[] = { "mail", NULL };
char *def, *physical_uri, *evolution_uri;
static gboolean is_active = FALSE;
gchar *s;
if (is_active)
return;
is_active = TRUE;
def = ff->uri ? ff->uri : "";
evolution_shell_client_user_select_folder (global_shell_client,
@@ -227,6 +233,8 @@ button_clicked (GtkButton *button, FilterFolder *ff)
g_free (physical_uri);
}
g_free (evolution_uri);
is_active = FALSE;
#else
GnomeDialog *gd;
GtkEntry *entry;