Added 4h, 8h and 24h update interval periods

[modest] / src / widgets / modest-folder-window.c

diff --git a/src/widgets/modest-folder-window.c b/src/widgets/modest-folder-window.c
index 1f62529..06ed53b 100644 (file)
--- a/src/widgets/modest-folder-window.c
+++ b/src/widgets/modest-folder-window.c
@@ -338,8 +338,6 @@ modest_folder_window_new (TnyFolderStoreQuery *query)
        ModestFolderWindowPrivate *priv = NULL;
        GdkPixbuf *window_icon;
        GtkWidget *scrollable;
-       guint accel_key;
-       GdkModifierType accel_mods;
        GtkWidget *top_alignment;
        
        self  = MODEST_FOLDER_WINDOW(g_object_new(MODEST_TYPE_FOLDER_WINDOW, NULL));
@@ -414,7 +412,8 @@ modest_folder_window_new (TnyFolderStoreQuery *query)
        /* Set window icon */
        window_icon = modest_platform_get_icon (MODEST_APP_ICON, MODEST_ICON_SIZE_BIG);
        if (window_icon) {
-               gtk_window_set_icon (GTK_WINDOW (self), window_icon);
+               GtkWindow *toplevel = (GtkWindow *) gtk_widget_get_toplevel ((GtkWidget *) self);
+               gtk_window_set_icon (toplevel, window_icon);
                g_object_unref (window_icon);
        }
 
@@ -456,6 +455,9 @@ modest_folder_window_new (TnyFolderStoreQuery *query)
 
 #ifdef MODEST_TOOLKIT_HILDON2
        GtkAccelGroup *accel_group;
+       guint accel_key;
+       GdkModifierType accel_mods;
+
        accel_group = gtk_accel_group_new ();
        gtk_accelerator_parse ("<Control>n", &accel_key, &accel_mods);
        gtk_widget_add_accelerator (priv->new_message_button, "clicked", accel_group,
@@ -591,6 +593,16 @@ setup_menu (ModestFolderWindow *self)
        modest_window_add_to_menu (MODEST_WINDOW (self), _("mcen_me_delete_folder"), NULL,
                                   MODEST_WINDOW_MENU_CALLBACK (set_delete_edit_mode),
                                   MODEST_DIMMING_CALLBACK (modest_ui_dimming_rules_on_folder_window_delete));
+#else
+       modest_window_add_to_menu (MODEST_WINDOW (self), _("mcen_me_rename_folder"), NULL,
+                                  MODEST_WINDOW_MENU_CALLBACK (modest_ui_actions_on_rename_folder),
+                                  NULL);
+       modest_window_add_to_menu (MODEST_WINDOW (self), _("mcen_me_move_folder"), NULL,
+                                  MODEST_WINDOW_MENU_CALLBACK (modest_ui_actions_on_move_to),
+                                  NULL);
+       modest_window_add_to_menu (MODEST_WINDOW (self), _("mcen_me_delete_folder"), NULL,
+                                  MODEST_WINDOW_MENU_CALLBACK (modest_ui_actions_on_delete_folder),
+                                  NULL);
 #endif
 
        modest_window_add_to_menu (MODEST_WINDOW (self), _("mcen_me_outbox_cancelsend"), NULL,