From ca3faa17a9a26479ce39649976264f96cbaf5f4c Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 6 Dec 2010 14:23:20 +0100 Subject: Free/busy meeting view doesn't work due to non-working extension --- mail/e-mail-attachment-bar.c | 3 +++ 1 file changed, 3 insertions(+) (limited to 'mail/e-mail-attachment-bar.c') diff --git a/mail/e-mail-attachment-bar.c b/mail/e-mail-attachment-bar.c index 8ba46cdccf..7d974dda5d 100644 --- a/mail/e-mail-attachment-bar.c +++ b/mail/e-mail-attachment-bar.c @@ -320,6 +320,9 @@ mail_attachment_bar_constructed (GObject *object) key = "/apps/evolution/shell/attachment_view"; gconf_bridge_bind_property (bridge, key, object, "active-view"); + + if (G_OBJECT_CLASS (parent_class)->constructed) + G_OBJECT_CLASS (parent_class)->constructed (object); } static void -- cgit v1.2.3 From a3ba231fcc2746e664a67c85d88eb49a64813989 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Tue, 9 Nov 2010 08:48:33 -0500 Subject: Drop backward-compatibility cruft. --- mail/e-mail-attachment-bar.c | 3 --- 1 file changed, 3 deletions(-) (limited to 'mail/e-mail-attachment-bar.c') diff --git a/mail/e-mail-attachment-bar.c b/mail/e-mail-attachment-bar.c index 7d974dda5d..519eaf89b7 100644 --- a/mail/e-mail-attachment-bar.c +++ b/mail/e-mail-attachment-bar.c @@ -29,9 +29,6 @@ #include "e-attachment-icon-view.h" #include "e-attachment-tree-view.h" -/* backward-compatibility cruft */ -#include "e-util/gtk-compat.h" - #define E_MAIL_ATTACHMENT_BAR_GET_PRIVATE(obj) \ (G_TYPE_INSTANCE_GET_PRIVATE \ ((obj), E_TYPE_MAIL_ATTACHMENT_BAR, EMailAttachmentBarPrivate)) -- cgit v1.2.3 From b5aba428f4d7daca78a6b079e1766d9fba5a8bc3 Mon Sep 17 00:00:00 2001 From: Rodrigo Moya Date: Fri, 10 Dec 2010 13:15:27 +0100 Subject: Adapt size_request vfuncs to latest gtk+-3.0 API. --- mail/e-mail-attachment-bar.c | 24 ------------------------ 1 file changed, 24 deletions(-) (limited to 'mail/e-mail-attachment-bar.c') diff --git a/mail/e-mail-attachment-bar.c b/mail/e-mail-attachment-bar.c index 519eaf89b7..954a3e056f 100644 --- a/mail/e-mail-attachment-bar.c +++ b/mail/e-mail-attachment-bar.c @@ -322,26 +322,6 @@ mail_attachment_bar_constructed (GObject *object) G_OBJECT_CLASS (parent_class)->constructed (object); } -static void -mail_attachment_bar_size_request (GtkWidget *widget, - GtkRequisition *requisition) -{ - /* XXX This works around GtkHTMLEmbedded not taking visibility - * into account when calculating its size (at least I think - * that's where it's broken). Without the workaround, we - * get a sizable gap between the headers and body when this - * widget is invisible. Once we finally move to WebKit, - * remove this. */ - if (!gtk_widget_get_visible (widget)) { - requisition->width = 0; - requisition->height = 0; - return; - } - - /* Chain up to parent's size_request() method. */ - GTK_WIDGET_CLASS (parent_class)->size_request (widget, requisition); -} - static EAttachmentViewPrivate * mail_attachment_bar_get_private (EAttachmentView *view) { @@ -461,7 +441,6 @@ static void mail_attachment_bar_class_init (EMailAttachmentBarClass *class) { GObjectClass *object_class; - GtkWidgetClass *widget_class; parent_class = g_type_class_peek_parent (class); g_type_class_add_private (class, sizeof (EMailAttachmentBarPrivate)); @@ -472,9 +451,6 @@ mail_attachment_bar_class_init (EMailAttachmentBarClass *class) object_class->dispose = mail_attachment_bar_dispose; object_class->constructed = mail_attachment_bar_constructed; - widget_class = GTK_WIDGET_CLASS (class); - widget_class->size_request = mail_attachment_bar_size_request; - g_object_class_install_property ( object_class, PROP_ACTIVE_VIEW, -- cgit v1.2.3 From 274697623e2a6749a3b173c28f4832d9e88019e3 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Sat, 12 Feb 2011 11:37:05 -0500 Subject: Remove NULL checks for GObject methods. As of GLib 2.28 all GObject virtual methods, including constructed(), are safe to chain up to unconditionally. Remove unnecessary checks. --- mail/e-mail-attachment-bar.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'mail/e-mail-attachment-bar.c') diff --git a/mail/e-mail-attachment-bar.c b/mail/e-mail-attachment-bar.c index 954a3e056f..88cf81a51a 100644 --- a/mail/e-mail-attachment-bar.c +++ b/mail/e-mail-attachment-bar.c @@ -318,8 +318,8 @@ mail_attachment_bar_constructed (GObject *object) key = "/apps/evolution/shell/attachment_view"; gconf_bridge_bind_property (bridge, key, object, "active-view"); - if (G_OBJECT_CLASS (parent_class)->constructed) - G_OBJECT_CLASS (parent_class)->constructed (object); + /* Chain up to parent's constructed() method. */ + G_OBJECT_CLASS (parent_class)->constructed (object); } static EAttachmentViewPrivate * -- cgit v1.2.3 From c003c99a75587ba39a45d164272760c33f9666b5 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Fri, 25 Feb 2011 16:20:41 +0100 Subject: Bug #614480 - Avoid using G_TYPE_INSTANCE_GET_PRIVATE repeatedly --- mail/e-mail-attachment-bar.c | 30 +++++++++++++----------------- 1 file changed, 13 insertions(+), 17 deletions(-) (limited to 'mail/e-mail-attachment-bar.c') diff --git a/mail/e-mail-attachment-bar.c b/mail/e-mail-attachment-bar.c index 88cf81a51a..22f27fac20 100644 --- a/mail/e-mail-attachment-bar.c +++ b/mail/e-mail-attachment-bar.c @@ -29,10 +29,6 @@ #include "e-attachment-icon-view.h" #include "e-attachment-tree-view.h" -#define E_MAIL_ATTACHMENT_BAR_GET_PRIVATE(obj) \ - (G_TYPE_INSTANCE_GET_PRIVATE \ - ((obj), E_TYPE_MAIL_ATTACHMENT_BAR, EMailAttachmentBarPrivate)) - #define NUM_VIEWS 2 struct _EMailAttachmentBarPrivate { @@ -186,7 +182,7 @@ mail_attachment_bar_dispose (GObject *object) { EMailAttachmentBarPrivate *priv; - priv = E_MAIL_ATTACHMENT_BAR_GET_PRIVATE (object); + priv = E_MAIL_ATTACHMENT_BAR (object)->priv; if (priv->model != NULL) { g_object_unref (priv->model); @@ -259,7 +255,7 @@ mail_attachment_bar_constructed (GObject *object) GConfBridge *bridge; const gchar *key; - priv = E_MAIL_ATTACHMENT_BAR_GET_PRIVATE (object); + priv = E_MAIL_ATTACHMENT_BAR (object)->priv; bridge = gconf_bridge_get (); @@ -327,7 +323,7 @@ mail_attachment_bar_get_private (EAttachmentView *view) { EMailAttachmentBarPrivate *priv; - priv = E_MAIL_ATTACHMENT_BAR_GET_PRIVATE (view); + priv = E_MAIL_ATTACHMENT_BAR (view)->priv; view = E_ATTACHMENT_VIEW (priv->icon_view); return e_attachment_view_get_private (view); @@ -338,7 +334,7 @@ mail_attachment_bar_get_store (EAttachmentView *view) { EMailAttachmentBarPrivate *priv; - priv = E_MAIL_ATTACHMENT_BAR_GET_PRIVATE (view); + priv = E_MAIL_ATTACHMENT_BAR (view)->priv; view = E_ATTACHMENT_VIEW (priv->icon_view); return e_attachment_view_get_store (view); @@ -351,7 +347,7 @@ mail_attachment_bar_get_path_at_pos (EAttachmentView *view, { EMailAttachmentBarPrivate *priv; - priv = E_MAIL_ATTACHMENT_BAR_GET_PRIVATE (view); + priv = E_MAIL_ATTACHMENT_BAR (view)->priv; view = E_ATTACHMENT_VIEW (priv->icon_view); return e_attachment_view_get_path_at_pos (view, x, y); @@ -362,7 +358,7 @@ mail_attachment_bar_get_selected_paths (EAttachmentView *view) { EMailAttachmentBarPrivate *priv; - priv = E_MAIL_ATTACHMENT_BAR_GET_PRIVATE (view); + priv = E_MAIL_ATTACHMENT_BAR (view)->priv; view = E_ATTACHMENT_VIEW (priv->icon_view); return e_attachment_view_get_selected_paths (view); @@ -374,7 +370,7 @@ mail_attachment_bar_path_is_selected (EAttachmentView *view, { EMailAttachmentBarPrivate *priv; - priv = E_MAIL_ATTACHMENT_BAR_GET_PRIVATE (view); + priv = E_MAIL_ATTACHMENT_BAR (view)->priv; view = E_ATTACHMENT_VIEW (priv->icon_view); return e_attachment_view_path_is_selected (view, path); @@ -386,7 +382,7 @@ mail_attachment_bar_select_path (EAttachmentView *view, { EMailAttachmentBarPrivate *priv; - priv = E_MAIL_ATTACHMENT_BAR_GET_PRIVATE (view); + priv = E_MAIL_ATTACHMENT_BAR (view)->priv; view = E_ATTACHMENT_VIEW (priv->icon_view); e_attachment_view_select_path (view, path); @@ -398,7 +394,7 @@ mail_attachment_bar_unselect_path (EAttachmentView *view, { EMailAttachmentBarPrivate *priv; - priv = E_MAIL_ATTACHMENT_BAR_GET_PRIVATE (view); + priv = E_MAIL_ATTACHMENT_BAR (view)->priv; view = E_ATTACHMENT_VIEW (priv->icon_view); e_attachment_view_unselect_path (view, path); @@ -409,7 +405,7 @@ mail_attachment_bar_select_all (EAttachmentView *view) { EMailAttachmentBarPrivate *priv; - priv = E_MAIL_ATTACHMENT_BAR_GET_PRIVATE (view); + priv = E_MAIL_ATTACHMENT_BAR (view)->priv; view = E_ATTACHMENT_VIEW (priv->icon_view); e_attachment_view_select_all (view); @@ -420,7 +416,7 @@ mail_attachment_bar_unselect_all (EAttachmentView *view) { EMailAttachmentBarPrivate *priv; - priv = E_MAIL_ATTACHMENT_BAR_GET_PRIVATE (view); + priv = E_MAIL_ATTACHMENT_BAR (view)->priv; view = E_ATTACHMENT_VIEW (priv->icon_view); e_attachment_view_unselect_all (view); @@ -431,7 +427,7 @@ mail_attachment_bar_update_actions (EAttachmentView *view) { EMailAttachmentBarPrivate *priv; - priv = E_MAIL_ATTACHMENT_BAR_GET_PRIVATE (view); + priv = E_MAIL_ATTACHMENT_BAR (view)->priv; view = E_ATTACHMENT_VIEW (priv->icon_view); e_attachment_view_update_actions (view); @@ -506,7 +502,7 @@ mail_attachment_bar_init (EMailAttachmentBar *bar) GtkWidget *widget; GtkAction *action; - bar->priv = E_MAIL_ATTACHMENT_BAR_GET_PRIVATE (bar); + bar->priv = G_TYPE_INSTANCE_GET_PRIVATE (bar, E_TYPE_MAIL_ATTACHMENT_BAR, EMailAttachmentBarPrivate); bar->priv->model = e_attachment_store_new (); gtk_box_set_spacing (GTK_BOX (bar), 6); -- cgit v1.2.3 From 498337e8524e1acf9f9471fc8c54038341035911 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Wed, 2 Mar 2011 15:12:02 +0100 Subject: Do not leak attachments in a mail view --- mail/e-mail-attachment-bar.c | 1 + 1 file changed, 1 insertion(+) (limited to 'mail/e-mail-attachment-bar.c') diff --git a/mail/e-mail-attachment-bar.c b/mail/e-mail-attachment-bar.c index 22f27fac20..0a5a3271fe 100644 --- a/mail/e-mail-attachment-bar.c +++ b/mail/e-mail-attachment-bar.c @@ -185,6 +185,7 @@ mail_attachment_bar_dispose (GObject *object) priv = E_MAIL_ATTACHMENT_BAR (object)->priv; if (priv->model != NULL) { + e_attachment_store_remove_all (E_ATTACHMENT_STORE (priv->model)); g_object_unref (priv->model); priv->model = NULL; } -- cgit v1.2.3 From 7aacf983b32ecac26bc9707697da622b3ef164a3 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Sat, 5 Mar 2011 12:33:49 -0500 Subject: Coding style and whitespace cleanup. --- mail/e-mail-attachment-bar.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'mail/e-mail-attachment-bar.c') diff --git a/mail/e-mail-attachment-bar.c b/mail/e-mail-attachment-bar.c index 0a5a3271fe..786fda255c 100644 --- a/mail/e-mail-attachment-bar.c +++ b/mail/e-mail-attachment-bar.c @@ -503,7 +503,8 @@ mail_attachment_bar_init (EMailAttachmentBar *bar) GtkWidget *widget; GtkAction *action; - bar->priv = G_TYPE_INSTANCE_GET_PRIVATE (bar, E_TYPE_MAIL_ATTACHMENT_BAR, EMailAttachmentBarPrivate); + bar->priv = G_TYPE_INSTANCE_GET_PRIVATE ( + bar, E_TYPE_MAIL_ATTACHMENT_BAR, EMailAttachmentBarPrivate); bar->priv->model = e_attachment_store_new (); gtk_box_set_spacing (GTK_BOX (bar), 6); -- cgit v1.2.3 From c24038c4f62f37b89d1bda9542ca5ccc843d4ea0 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Fri, 27 May 2011 15:23:07 +0200 Subject: Bug #646109 - Fix use of include to make sure translations work --- mail/e-mail-attachment-bar.c | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'mail/e-mail-attachment-bar.c') diff --git a/mail/e-mail-attachment-bar.c b/mail/e-mail-attachment-bar.c index 786fda255c..17a7ae1421 100644 --- a/mail/e-mail-attachment-bar.c +++ b/mail/e-mail-attachment-bar.c @@ -19,6 +19,10 @@ * */ +#ifdef HAVE_CONFIG_H +#include +#endif + #include "e-mail-attachment-bar.h" #include -- cgit v1.2.3 From 004eb21e79a68f50cf08a2cb1b005db8b4b20189 Mon Sep 17 00:00:00 2001 From: Rodrigo Moya Date: Fri, 14 Oct 2011 13:50:43 +0200 Subject: Migrate EMailAttachmentBar to GSettings --- mail/e-mail-attachment-bar.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) (limited to 'mail/e-mail-attachment-bar.c') diff --git a/mail/e-mail-attachment-bar.c b/mail/e-mail-attachment-bar.c index 17a7ae1421..f3567f2887 100644 --- a/mail/e-mail-attachment-bar.c +++ b/mail/e-mail-attachment-bar.c @@ -27,8 +27,6 @@ #include -#include "e-util/gconf-bridge.h" - #include "e-attachment-store.h" #include "e-attachment-icon-view.h" #include "e-attachment-tree-view.h" @@ -257,13 +255,11 @@ static void mail_attachment_bar_constructed (GObject *object) { EMailAttachmentBarPrivate *priv; - GConfBridge *bridge; + GSettings *settings; const gchar *key; priv = E_MAIL_ATTACHMENT_BAR (object)->priv; - bridge = gconf_bridge_get (); - /* Set up property-to-property bindings. */ g_object_bind_property ( @@ -314,10 +310,10 @@ mail_attachment_bar_constructed (GObject *object) G_BINDING_BIDIRECTIONAL | G_BINDING_SYNC_CREATE); - /* Set up property-to-GConf bindings. */ - - key = "/apps/evolution/shell/attachment_view"; - gconf_bridge_bind_property (bridge, key, object, "active-view"); + /* Set up property-to-GSettings bindings. */ + settings = g_settings_new ("org.gnome.evolution.shell"); + g_settings_bind (settings, "attachment-view", object, "active-view", G_SETTINGS_BIND_DEFAULT); + g_object_unref (settings); /* Chain up to parent's constructed() method. */ G_OBJECT_CLASS (parent_class)->constructed (object); -- cgit v1.2.3 From c75f58d01bb7bbe139cd73a85894dc5f50185816 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Fri, 18 Nov 2011 09:58:44 -0500 Subject: Fix compiler warnings. --- mail/e-mail-attachment-bar.c | 1 - 1 file changed, 1 deletion(-) (limited to 'mail/e-mail-attachment-bar.c') diff --git a/mail/e-mail-attachment-bar.c b/mail/e-mail-attachment-bar.c index f3567f2887..c07d0e8707 100644 --- a/mail/e-mail-attachment-bar.c +++ b/mail/e-mail-attachment-bar.c @@ -256,7 +256,6 @@ mail_attachment_bar_constructed (GObject *object) { EMailAttachmentBarPrivate *priv; GSettings *settings; - const gchar *key; priv = E_MAIL_ATTACHMENT_BAR (object)->priv; -- cgit v1.2.3