aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--e-util/ChangeLog7
-rw-r--r--e-util/e-dialog-utils.c2
-rw-r--r--e-util/e-event.c5
3 files changed, 12 insertions, 2 deletions
diff --git a/e-util/ChangeLog b/e-util/ChangeLog
index 4e9a519b24..bc0c7e4fdf 100644
--- a/e-util/ChangeLog
+++ b/e-util/ChangeLog
@@ -1,3 +1,10 @@
+2007-07-27 Lucky Wankhede <wlakke@novell.com>
+
+ ** Fixes bug #451211
+
+ * e-event.c
+ Changed in (e_event_emit)
+
2007-07-27 Hiroyuki Ikezoe <poincare@ikezoe.net>
* e-util.h: Remove E_MAKE_TYPE macro.
diff --git a/e-util/e-dialog-utils.c b/e-util/e-dialog-utils.c
index 1ce839d185..a65f946ace 100644
--- a/e-util/e-dialog-utils.c
+++ b/e-util/e-dialog-utils.c
@@ -366,7 +366,7 @@ e_file_get_save_filesel (GtkWidget *parent, const char *title, const char *name,
NULL,
action,
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
- GTK_STOCK_SAVE, GTK_RESPONSE_OK,
+ (action == GTK_FILE_CHOOSER_ACTION_OPEN) ? GTK_STOCK_OPEN:GTK_STOCK_SAVE, GTK_RESPONSE_OK,
NULL);
gtk_dialog_set_default_response (GTK_DIALOG (filesel), GTK_RESPONSE_OK);
gtk_file_chooser_set_local_only (GTK_FILE_CHOOSER (filesel), FALSE);
diff --git a/e-util/e-event.c b/e-util/e-event.c
index 9510a6ce74..e02cee4829 100644
--- a/e-util/e-event.c
+++ b/e-util/e-event.c
@@ -260,7 +260,10 @@ e_event_emit(EEvent *emp, const char *id, EEventTarget *target)
d(printf("emit event %s\n", id));
- g_assert(emp->target == NULL);
+ if(emp->target == NULL){
+ g_warning ("Event already in progress.\n");
+ return;
+ }
emp->target = target;
events = p->sorted;