aboutsummaryrefslogtreecommitdiffstats
path: root/shell
diff options
context:
space:
mode:
Diffstat (limited to 'shell')
-rw-r--r--shell/ChangeLog4
-rw-r--r--shell/e-storage-set-view.c8
2 files changed, 8 insertions, 4 deletions
diff --git a/shell/ChangeLog b/shell/ChangeLog
index 1448e6de34..18496e71df 100644
--- a/shell/ChangeLog
+++ b/shell/ChangeLog
@@ -1,3 +1,7 @@
+2003-01-10 Dan Winship <danw@ximian.com>
+
+ * e-storage-set-view.c (popup_folder_menu): Make this work again.
+
2003-01-10 Ettore Perazzoli <ettore@ximian.com>
* e-shell-view.c (e_shell_view_save_defaults): Save the expansion
diff --git a/shell/e-storage-set-view.c b/shell/e-storage-set-view.c
index fd1fd6fea5..82af6389cd 100644
--- a/shell/e-storage-set-view.c
+++ b/shell/e-storage-set-view.c
@@ -756,7 +756,7 @@ popup_folder_menu (EStorageSetView *storage_set_view,
EStorageSetViewPrivate *priv;
EFolderTypeRegistry *folder_type_registry;
EFolder *folder;
- GtkWidget *menu;
+ GtkWidget *menu, *window;
FolderPropertyItemsData *folder_property_items_data;
priv = storage_set_view->priv;
@@ -771,10 +771,10 @@ popup_folder_menu (EStorageSetView *storage_set_view,
e_folder_get_type_string (folder));
menu = gtk_menu_new ();
-#if 0
- bonobo_window_add_popup (bonobo_ui_container_get_win (priv->ui_container),
+ window = gtk_widget_get_ancestor (GTK_WIDGET (storage_set_view),
+ BONOBO_TYPE_WINDOW);
+ bonobo_window_add_popup (BONOBO_WINDOW (window),
GTK_MENU (menu), "/popups/FolderPopup");
-#endif
bonobo_ui_component_set (priv->ui_component,
"/popups/FolderPopup/ComponentPlaceholder",