aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--shell/ChangeLog23
-rw-r--r--shell/e-sidebar.c7
2 files changed, 21 insertions, 9 deletions
diff --git a/shell/ChangeLog b/shell/ChangeLog
index d0a6b43c2c..f7ebfa58ce 100644
--- a/shell/ChangeLog
+++ b/shell/ChangeLog
@@ -1,12 +1,19 @@
+2006-05-15 Li Yuan <li.yuan@sun.com>
+
+ Fixes #341525
+
+ * e-sidebar.c: (button_toggled_callback):
+ If the button has been selected, it is no need to emit the signal.
+
2006-04-30 Nancy Cai <nancy.cai@sun.com>
-
- Fixes #323853
-
- * e-shell-importer.c: (filename_changed), (item_selected),
- (importer_file_page_new), (prepare_file_page):
- replacing GnomeFileEntry by GtkFileButton, which can import task files
- with none UTF-8 filenames.
-
+
+ Fixes #323853
+
+ * e-shell-importer.c: (filename_changed), (item_selected),
+ (importer_file_page_new), (prepare_file_page):
+ replacing GnomeFileEntry by GtkFileButton, which can import task files
+ with none UTF-8 filenames.
+
2006-04-27 Andre Klapper <a9016009@gmx.de>
* main.c: update last stable version number from 2.4.2.1 to 2.6.1
diff --git a/shell/e-sidebar.c b/shell/e-sidebar.c
index c483543971..6c3499c98f 100644
--- a/shell/e-sidebar.c
+++ b/shell/e-sidebar.c
@@ -136,6 +136,7 @@ button_toggled_callback (GtkToggleButton *toggle_button,
ESidebar *sidebar)
{
int id = 0;
+ gboolean is_actived = FALSE;
GSList *p;
if (sidebar->priv->in_toggle)
@@ -143,6 +144,9 @@ button_toggled_callback (GtkToggleButton *toggle_button,
sidebar->priv->in_toggle = TRUE;
+ if (gtk_toggle_button_get_active (toggle_button))
+ is_actived = TRUE;
+
for (p = sidebar->priv->buttons; p != NULL; p = p->next) {
Button *button = p->data;
@@ -156,7 +160,8 @@ button_toggled_callback (GtkToggleButton *toggle_button,
sidebar->priv->in_toggle = FALSE;
- g_signal_emit (sidebar, signals[BUTTON_SELECTED], 0, id);
+ if (is_actived)
+ g_signal_emit (sidebar, signals[BUTTON_SELECTED], 0, id);
}