/* 'private'/'protected' functions */
static void modest_hildon2_window_class_init (gpointer klass, gpointer class_data);
static void modest_hildon2_window_instance_init (GTypeInstance *instance, gpointer g_class);
-static void modest_hildon2_window_finalize (GObject *obj);
+static void modest_hildon2_window_dispose (GObject *obj);
static gboolean on_zoom_minus_plus_not_implemented (ModestWindow *window);
+static void modest_hildon2_window_show_progress (ModestWindow *window,
+ gboolean show);
static void setup_menu (ModestHildon2Window *self);
static void modest_hildon2_window_show_toolbar (ModestWindow *self,
ModestHildon2WindowClass *modest_hildon2_window_class = (ModestHildon2WindowClass *) klass;
parent_class = g_type_class_peek_parent (klass);
- gobject_class->finalize = modest_hildon2_window_finalize;
+ gobject_class->dispose = modest_hildon2_window_dispose;
signals[EDIT_MODE_CHANGED_SIGNAL] =
g_signal_new ("edit-mode-changed",
modest_window_class->zoom_minus_func = on_zoom_minus_plus_not_implemented;
modest_window_class->zoom_plus_func = on_zoom_minus_plus_not_implemented;
modest_window_class->show_toolbar_func = modest_hildon2_window_show_toolbar;
+ modest_window_class->show_progress_func = modest_hildon2_window_show_progress;
modest_hildon2_window_class->pack_toolbar_func = modest_hildon2_window_pack_toolbar_not_implemented;
}
static void
-modest_hildon2_window_finalize (GObject *obj)
+modest_hildon2_window_dispose (GObject *obj)
{
ModestHildon2WindowPrivate *priv;
priv = MODEST_HILDON2_WINDOW_GET_PRIVATE(obj);
- g_object_unref (priv->app_menu_dimming_group);
- priv->app_menu_dimming_group = NULL;
+ if (priv->app_menu_dimming_group) {
+ g_object_unref (priv->app_menu_dimming_group);
+ priv->app_menu_dimming_group = NULL;
+ }
- g_hash_table_destroy (priv->edit_mode_registry);
- priv->edit_mode_registry = NULL;
+ if (priv->edit_mode_registry) {
+ g_hash_table_unref (priv->edit_mode_registry);
+ priv->edit_mode_registry = NULL;
+ }
- G_OBJECT_CLASS(parent_class)->finalize (obj);
+ G_OBJECT_CLASS(parent_class)->dispose (obj);
}
static void
{
g_return_if_fail (MODEST_IS_HILDON2_WINDOW (self));
- g_warning ("%s not implemented", __FUNCTION__);
+ g_debug ("%s not implemented", __FUNCTION__);
}
void
g_return_if_fail (GTK_IS_BUTTON (button));
priv = MODEST_HILDON2_WINDOW_GET_PRIVATE (self);
+ modest_ui_dimming_manager_set_widget_dimming_mode (GTK_WIDGET (button),
+ MODEST_UI_DIMMING_MODE_HIDE);
+
if (dimming_callback)
modest_dimming_rules_group_add_widget_rule (priv->app_menu_dimming_group,
GTK_WIDGET (button),
(GCallback) dimming_callback,
MODEST_WINDOW (self));
hildon_app_menu_append (HILDON_APP_MENU (priv->app_menu), GTK_BUTTON (button));
+ gtk_widget_show (GTK_WIDGET (button));
}
void
* doesn't switch toolbar visibility */
}
+static void
+modest_hildon2_window_show_progress (ModestWindow *self,
+ gboolean show)
+{
+ hildon_gtk_window_set_progress_indicator (GTK_WINDOW (self),
+ show);
+}
+
void
modest_hildon2_window_register_edit_mode (ModestHildon2Window *self,
gint edit_mode_id,