Refactor gtk_window_set_title for ModestWindow children. We may finally

make gtk ModestWindow parent be something different and not a GtkWindow

diff --git a/src/hildon2/modest-hildon2-window.c b/src/hildon2/modest-hildon2-window.c
index e561d02..f0e33a1 100644 (file)
--- a/src/hildon2/modest-hildon2-window.c
+++ b/src/hildon2/modest-hildon2-window.c
@@ -63,6 +63,8 @@ static void modest_hildon2_window_show_toolbar (ModestWindow *self,
                                                 gboolean show_toolbar);
 static void modest_hildon2_window_add_toolbar (ModestWindow *self,
                                               GtkToolbar *toolbar);
+static void modest_hildon2_window_set_title (ModestWindow *self,
+                                            const gchar *title);
 static gboolean modest_hildon2_window_toggle_menu (HildonWindow *window,
                                                    guint button,
                                                    guint32 time);
@@ -165,6 +167,7 @@ modest_hildon2_window_class_init (gpointer klass, gpointer class_data)
        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->add_toolbar_func = modest_hildon2_window_add_toolbar;
+       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;
@@ -360,6 +363,14 @@ modest_hildon2_window_add_toolbar (ModestWindow *self,
 }
 
 static void
+modest_hildon2_window_set_title (ModestWindow *self,
+                                const gchar *title)
+{
+       gtk_window_set_title (GTK_WINDOW (self),
+                             title);
+}
+
+static void
 modest_hildon2_window_show_progress (ModestWindow *self,
                                     gboolean show)
 {

diff --git a/src/widgets/modest-window.c b/src/widgets/modest-window.c
index dd30edb..3dadb68 100644 (file)
--- a/src/widgets/modest-window.c
+++ b/src/widgets/modest-window.c
@@ -68,6 +68,9 @@ static void     modest_window_show_toolbar_default       (ModestWindow *window,
 static void     modest_window_add_toolbar_default       (ModestWindow *window,
                                                         GtkToolbar *toolbar);
 
+static void     modest_window_set_title_default       (ModestWindow *window,
+                                                      const gchar *title);
+
 static void     modest_window_set_zoom_default           (ModestWindow *window,
                                                          gdouble zoom);
 
@@ -139,6 +142,7 @@ modest_window_class_init (ModestWindowClass *klass)
        klass->zoom_minus_func = modest_window_zoom_minus_default;
        klass->show_toolbar_func = modest_window_show_toolbar_default;
        klass->add_toolbar_func = modest_window_add_toolbar_default;
+       klass->set_title_func = modest_window_set_title_default;
        klass->disconnect_signals_func = modest_window_disconnect_signals_default;
        klass->show_progress_func = modest_window_show_progress_default;
 
@@ -426,6 +430,14 @@ modest_window_add_toolbar (ModestWindow *window,
 }
 
 void 
+modest_window_set_title (ModestWindow *window,
+                        const gchar *title)
+{
+       MODEST_WINDOW_GET_CLASS (window)->set_title_func (window,
+                                                         title);
+}
+
+void 
 modest_window_disconnect_signals (ModestWindow *window)
 {
        MODEST_WINDOW_GET_CLASS (window)->disconnect_signals_func (window);
@@ -484,6 +496,13 @@ modest_window_add_toolbar_default (ModestWindow *window,
 }
 
 static void 
+modest_window_set_title_default (ModestWindow *window,
+                                const gchar *title)
+{
+       g_warning ("modest: You should implement %s", __FUNCTION__);
+}
+
+static void 
 modest_window_disconnect_signals_default (ModestWindow *self)
 {
        g_warning ("modest: You should implement %s", __FUNCTION__);

diff --git a/src/widgets/modest-window.h b/src/widgets/modest-window.h
index c3d4440..3002d8a 100644 (file)
--- a/src/widgets/modest-window.h
+++ b/src/widgets/modest-window.h
@@ -109,6 +109,7 @@ struct _ModestWindowClass {
        void (*disconnect_signals_func) (ModestWindow *self);
        void (*show_progress_func) (ModestWindow *self, gboolean show);
        void (*add_toolbar_func) (ModestWindow *self, GtkToolbar *toolbar);
+       void (*set_title_func) (ModestWindow *self, const gchar *title);
 };
 
 /**
@@ -324,6 +325,8 @@ void modest_window_show_progress (ModestWindow *self, gboolean show_progress);
 
 void modest_window_add_toolbar (ModestWindow *self, GtkToolbar *toolbar);
 
+void modest_window_set_title (ModestWindow *self, const gchar *title);
+
 
 G_END_DECLS