aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSrinivasa Ragavan <sragavan@gnome.org>2010-07-09 17:12:40 +0800
committerMatthew Barnes <mbarnes@redhat.com>2010-07-26 09:29:59 +0800
commitb5075fca726a3c6a0b18f9342ccc833ff0a64ccf (patch)
treecfad038f105cd63a6b89ea3381ac6a77fb1c78dd
parent909774170062bd74c6f3554b25f0d06054fb9c8b (diff)
downloadgsoc2013-evolution-b5075fca726a3c6a0b18f9342ccc833ff0a64ccf.tar
gsoc2013-evolution-b5075fca726a3c6a0b18f9342ccc833ff0a64ccf.tar.gz
gsoc2013-evolution-b5075fca726a3c6a0b18f9342ccc833ff0a64ccf.tar.bz2
gsoc2013-evolution-b5075fca726a3c6a0b18f9342ccc833ff0a64ccf.tar.lz
gsoc2013-evolution-b5075fca726a3c6a0b18f9342ccc833ff0a64ccf.tar.xz
gsoc2013-evolution-b5075fca726a3c6a0b18f9342ccc833ff0a64ccf.tar.zst
gsoc2013-evolution-b5075fca726a3c6a0b18f9342ccc833ff0a64ccf.zip
Make EMailPanedView up & working.
-rw-r--r--mail/e-mail-paned-view.c10
-rw-r--r--mail/e-mail-view.c29
-rw-r--r--mail/e-mail-view.h16
3 files changed, 51 insertions, 4 deletions
diff --git a/mail/e-mail-paned-view.c b/mail/e-mail-paned-view.c
index 9aed306b45..a1688d6232 100644
--- a/mail/e-mail-paned-view.c
+++ b/mail/e-mail-paned-view.c
@@ -87,7 +87,7 @@ enum {
#define STATE_KEY_PREVIEW_VISIBLE "PreviewVisible"
-static gpointer parent_class;
+static EMailViewClass *parent_class;
static GType mail_paned_view_type;
static void
@@ -576,7 +576,7 @@ mail_paned_view_constructed (GObject *object)
priv->formatter = em_format_html_display_new ();
/* Chain up to parent's constructed() method. */
- G_OBJECT_CLASS (parent_class)->constructed (object);
+ //G_OBJECT_CLASS (parent_class)->constructed (object);
shell_content = E_MAIL_VIEW (object)->content;
shell_view = e_shell_content_get_shell_view (shell_content);
@@ -673,7 +673,7 @@ mail_paned_view_init (EMailPanedView *shell)
}
static void
-mail_paned_view_class_init (EMailPanedViewClass *klass)
+mail_paned_view_class_init (EMailViewClass *klass)
{
GObjectClass * object_class = G_OBJECT_CLASS (klass);
@@ -683,6 +683,10 @@ mail_paned_view_class_init (EMailPanedViewClass *klass)
object_class->set_property = mail_paned_view_set_property;
object_class->get_property = mail_paned_view_get_property;
+ klass->get_searchbar = e_mail_paned_view_get_searchbar;
+ klass->set_search_strings = e_mail_paned_view_set_search_strings;
+ klass->get_view_instance = e_mail_paned_view_get_view_instance;
+ klass->update_view_instance = e_mail_paned_view_update_view_instance;
/* Inherited from EMailReader */
g_object_class_override_property (
diff --git a/mail/e-mail-view.c b/mail/e-mail-view.c
index ba07cee36b..976d223f33 100644
--- a/mail/e-mail-view.c
+++ b/mail/e-mail-view.c
@@ -104,6 +104,11 @@ e_mail_view_class_init (EMailViewClass *klass)
object_class->set_property = mail_view_set_property;
object_class->get_property = mail_view_get_property;
+ klass->get_searchbar = NULL;
+ klass->set_search_strings = NULL;
+ klass->get_view_instance = NULL;
+ klass->update_view_instance = NULL;
+
signals[PANE_CLOSE] =
g_signal_new ("pane-close",
G_OBJECT_CLASS_TYPE (object_class),
@@ -130,4 +135,28 @@ e_mail_view_class_init (EMailViewClass *klass)
}
+void
+e_mail_view_update_view_instance (EMailView *view)
+{
+ E_MAIL_VIEW_GET_CLASS (view)->update_view_instance (view);
+}
+
+GalViewInstance *
+e_mail_view_get_view_instance (EMailView *view)
+{
+ return E_MAIL_VIEW_GET_CLASS (view)->get_view_instance (view);
+}
+
+void
+e_mail_view_set_search_strings (EMailView *view,
+ GSList *search_strings)
+{
+ E_MAIL_VIEW_GET_CLASS (view)->set_search_strings (view, search_strings);
+}
+
+EShellSearchbar *
+e_mail_view_get_searchbar (EMailView *view)
+{
+ return E_MAIL_VIEW_GET_CLASS (view)->get_searchbar (view);
+}
diff --git a/mail/e-mail-view.h b/mail/e-mail-view.h
index fc5e5da306..430535b500 100644
--- a/mail/e-mail-view.h
+++ b/mail/e-mail-view.h
@@ -25,7 +25,8 @@
#include <gtk/gtk.h>
#include <shell/e-shell-content.h>
-
+#include <shell/e-shell-searchbar.h>
+#include "widgets/menus/gal-view-instance.h"
#define E_MAIL_VIEW_TYPE (e_mail_view_get_type ())
#define E_MAIL_VIEW(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), E_MAIL_VIEW_TYPE, EMailView))
@@ -49,8 +50,21 @@ typedef struct _EMailViewClass {
void (*pane_close) (EMailView *);
+ EShellSearchbar * (*get_searchbar) (EMailView *view);
+ void (*set_search_strings) (EMailView *view, GSList *search_strings);
+ GalViewInstance * (*get_view_instance) (EMailView *view);
+ void (*update_view_instance) (EMailView *view);
+
+
} EMailViewClass;
GType e_mail_view_get_type (void);
+void e_mail_view_update_view_instance (EMailView *view);
+GalViewInstance * e_mail_view_get_view_instance (EMailView *view);
+
+void e_mail_view_set_search_strings (EMailView *view, GSList *search_strings);
+
+EShellSearchbar * e_mail_view_get_searchbar (EMailView *view);
+
#endif