Set proper logical id for "Invitation" string to mail_fi_invitation.

[modest] / src / hildon2 / modest-hildon2-window.c

diff --git a/src/hildon2/modest-hildon2-window.c b/src/hildon2/modest-hildon2-window.c
index f068745..d29430f 100644 (file)
--- a/src/hildon2/modest-hildon2-window.c
+++ b/src/hildon2/modest-hildon2-window.c
@@ -76,9 +76,6 @@ static void modest_hildon2_window_set_title (ModestWindow *self,
 static gboolean modest_hildon2_window_toggle_menu (HildonWindow *window,
                                                    guint button,
                                                    guint32 time);
-static void modest_hildon2_window_pack_toolbar_not_implemented (ModestHildon2Window *self,
-                                                               GtkPackType pack_type,
-                                                               GtkWidget *toolbar);
 static EditModeRegister *edit_mode_register_new (const gchar *description,
                                                 const gchar *button_label,
                                                 GtkTreeView *tree_view,
@@ -153,7 +150,6 @@ modest_hildon2_window_class_init (gpointer klass, gpointer class_data)
        gobject_class = (GObjectClass*) klass;
        ModestWindowClass *modest_window_class = (ModestWindowClass *) klass;
        HildonWindowClass *hildon_window_class = (HildonWindowClass *) klass;
-       ModestHildon2WindowClass *modest_hildon2_window_class = (ModestHildon2WindowClass *) klass;
 
        parent_class            = g_type_class_peek_parent (klass);
        gobject_class->dispose  = modest_hildon2_window_dispose;
@@ -180,7 +176,6 @@ modest_hildon2_window_class_init (gpointer klass, gpointer class_data)
        modest_window_class->set_title_func = modest_hildon2_window_set_title;
        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
@@ -223,7 +218,6 @@ modest_hildon2_window_instance_init (GTypeInstance *instance, gpointer g_class)
        priv->edit_mode_registry = g_hash_table_new_full (g_direct_hash, g_direct_equal,
                                                          NULL, edit_mode_register_destroy);
 
-       parent_priv->ui_dimming_manager = modest_ui_dimming_manager_new();
        priv->app_menu_dimming_group = modest_dimming_rules_group_new (MODEST_DIMMING_RULES_MENU, FALSE);
        gtk_window_add_accel_group (GTK_WINDOW (self), priv->accel_group);
 
@@ -244,30 +238,9 @@ on_zoom_minus_plus_not_implemented (ModestWindow *window)
 {
        g_return_val_if_fail (MODEST_IS_HILDON2_WINDOW (window), FALSE);
 
-       hildon_banner_show_information (NULL, NULL, _CS("ckct_ib_cannot_zoom_here"));
+       hildon_banner_show_information (NULL, NULL, _CS_CANNOT_ZOOM_HERE);
        return FALSE;
 }
-
-static void 
-modest_hildon2_window_pack_toolbar_not_implemented (ModestHildon2Window *self,
-                                                   GtkPackType pack_type,
-                                                   GtkWidget *toolbar)
-{
-       g_return_if_fail (MODEST_IS_HILDON2_WINDOW (self));
-
-       g_debug ("%s not implemented", __FUNCTION__);
-}
-
-void
-modest_hildon2_window_pack_toolbar (ModestHildon2Window *self,
-                                   GtkPackType pack_type,
-                                   GtkWidget *toolbar)
-{
-       g_return_if_fail (MODEST_IS_HILDON2_WINDOW (self));
-
-       MODEST_HILDON2_WINDOW_GET_CLASS (self)->pack_toolbar_func (self, pack_type, toolbar);
-}
-
 void 
 modest_hildon2_window_add_item_to_menu (ModestWindow *self,
                                        GtkWidget *button,
@@ -462,8 +435,8 @@ modest_hildon2_window_set_edit_mode (ModestHildon2Window *self,
                                       reg->description);
        hildon_edit_toolbar_set_button_label (HILDON_EDIT_TOOLBAR (priv->edit_toolbar),
                                              reg->button_label);
-       modest_hildon2_window_pack_toolbar (self, GTK_PACK_START,
-                                           priv->edit_toolbar);
+       modest_window_pack_toolbar (MODEST_WINDOW (self), GTK_PACK_START,
+                                   priv->edit_toolbar);
 
        g_signal_connect (G_OBJECT (priv->edit_toolbar), "button-clicked",
                          G_CALLBACK (edit_toolbar_button_clicked), (gpointer) self);
@@ -552,7 +525,7 @@ edit_toolbar_button_clicked (HildonEditToolbar *toolbar,
                                                        GINT_TO_POINTER (priv->edit_command));
 
        if (reg) {
-               if ((reg->action == NULL) || reg->action (self))
+               if ((reg->action == NULL) || reg->action (MODEST_WINDOW (self)))
                        modest_hildon2_window_unset_edit_mode (self);
        } else {
                modest_hildon2_window_unset_edit_mode (self);