alx/mu4e
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* mu-msg-view.c: don't keep widgets around, re-create them (this needs fixing)

Browse Source
This commit is contained in:
Dirk-Jan C. Binnema
2011-01-24 01:01:43 +02:00
parent 7356e17b89
commit 140786dc89
1 changed files with 26 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
widgets/mu-msg-view.c
View File

@ -84,21 +84,25 @@ mu_msg_view_class_init (MuMsgViewClass *klass)
static void static void
each_child_remove (GtkWidget *child, MuMsgView *self) each_child_remove (GtkWidget *child, MuMsgView *self)
{ {
/* g_object_ref (child); /\* save the children *\/ */
gtk_container_remove (GTK_CONTAINER(self), child); gtk_container_remove (GTK_CONTAINER(self), child);
} }
static void static void
clear_widgets (MuMsgView *self) remove_widgets (MuMsgView *self)
{ {
/* FIXME: keep the widgets around for re-use */
/* remove the old children */ /* remove the old children */
gtk_container_foreach (GTK_CONTAINER(self), gtk_container_foreach (GTK_CONTAINER(self),
(GtkCallback)each_child_remove, (GtkCallback)each_child_remove,
self); self);
self->_priv->_normal_view = NULL; self->_priv->_normal_view = NULL;
self->_priv->_source_view = NULL; self->_priv->_source_view = NULL;
self->_priv->_internal_view = NULL; self->_priv->_internal_view = NULL;
} }
static void static void
@ -149,31 +153,35 @@ get_source_view (MuMsgView *self, MuMsg *msg)
static GtkWidget* static GtkWidget*
get_normal_view (MuMsgView *self, MuMsg *msg) get_normal_view (MuMsgView *self, MuMsg *msg)
{ {
GtkWidget *scrolledwin; GtkWidget *scrolledwin;
if (!self->_priv->_normal_view) { if (self->_priv->_normal_view) {
self->_priv->_normal_view = mu_msg_normal_view_new (); mu_msg_normal_view_set_message
g_signal_connect (self->_priv->_normal_view, (MU_MSG_NORMAL_VIEW(self->_priv->_normal_view), msg);
"action-requested", return gtk_widget_get_parent (self->_priv->_normal_view);
G_CALLBACK(on_action_requested),
self);
} }
self->_priv->_normal_view = mu_msg_normal_view_new ();
mu_msg_normal_view_set_message mu_msg_normal_view_set_message
(MU_MSG_NORMAL_VIEW(self->_priv->_normal_view), msg); (MU_MSG_NORMAL_VIEW(self->_priv->_normal_view), msg);
gtk_widget_show (self->_priv->_normal_view); g_signal_connect (self->_priv->_normal_view,
"action-requested",
G_CALLBACK(on_action_requested),
self);
scrolledwin = gtk_scrolled_window_new (NULL, NULL); scrolledwin = gtk_scrolled_window_new (NULL, NULL);
gtk_scrolled_window_set_policy ( gtk_scrolled_window_set_policy (
GTK_SCROLLED_WINDOW(scrolledwin), GTK_SCROLLED_WINDOW(scrolledwin),
GTK_POLICY_AUTOMATIC,GTK_POLICY_AUTOMATIC); GTK_POLICY_AUTOMATIC,GTK_POLICY_AUTOMATIC);
gtk_scrolled_window_add_with_viewport gtk_scrolled_window_add_with_viewport
(GTK_SCROLLED_WINDOW(scrolledwin), (GTK_SCROLLED_WINDOW(scrolledwin),
self->_priv->_normal_view); self->_priv->_normal_view);
gtk_widget_show (self->_priv->_normal_view);
gtk_widget_show (scrolledwin); gtk_widget_show (scrolledwin);
return scrolledwin; return scrolledwin;
@ -204,10 +212,10 @@ static void
mu_msg_view_init (MuMsgView *self) mu_msg_view_init (MuMsgView *self)
{ {
self->_priv = MU_MSG_VIEW_GET_PRIVATE(self); self->_priv = MU_MSG_VIEW_GET_PRIVATE(self);
self->_priv->_normal_view = NULL; self->_priv->_normal_view = NULL;
self->_priv->_source_view = NULL; self->_priv->_source_view = NULL;
self->_priv->_internal_view = NULL;
self->_priv->_view_source = FALSE; self->_priv->_view_source = FALSE;
} }
@ -244,7 +252,7 @@ mu_msg_view_set_message (MuMsgView *self, MuMsg *msg)
self->_priv->_msg = msg ? mu_msg_ref (msg) : NULL; self->_priv->_msg = msg ? mu_msg_ref (msg) : NULL;
clear_widgets (self); remove_widgets (self);
if (!self->_priv->_view_source) if (!self->_priv->_view_source)
gtk_box_pack_start (GTK_BOX(self), gtk_box_pack_start (GTK_BOX(self),
@ -263,7 +271,7 @@ mu_msg_view_set_note (MuMsgView *self, const gchar* html)
g_return_if_fail (MU_IS_MSG_VIEW(self)); g_return_if_fail (MU_IS_MSG_VIEW(self));
clear_widgets (self); remove_widgets (self);
gtk_box_pack_start (GTK_BOX(self), gtk_box_pack_start (GTK_BOX(self),
get_internal_view (self, html), get_internal_view (self, html),