aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCosimo Cecchi <cosimoc@gnome.org>2011-03-09 09:56:37 +0800
committerMatthew Barnes <mbarnes@redhat.com>2011-03-09 09:59:03 +0800
commite9f08a79f5db23ed5475f7cb26afc0de580f492f (patch)
treea2692261a6a55d2bb7543698dbfbc9ecd1dcf8bf
parentcf7a5095c20f8ae5bd4fd2ad92fe78599dd0768b (diff)
downloadgsoc2013-evolution-e9f08a79f5db23ed5475f7cb26afc0de580f492f.tar.gz
gsoc2013-evolution-e9f08a79f5db23ed5475f7cb26afc0de580f492f.tar.zst
gsoc2013-evolution-e9f08a79f5db23ed5475f7cb26afc0de580f492f.zip
Bug 644235 - Make EActivityProxy a GtkFrame
So it can inherit the theme from the widget below. Was previously a GtkEventBox for historical reasons that no one remembers.
-rw-r--r--widgets/misc/e-activity-proxy.c11
-rw-r--r--widgets/misc/e-activity-proxy.h4
2 files changed, 5 insertions, 10 deletions
diff --git a/widgets/misc/e-activity-proxy.c b/widgets/misc/e-activity-proxy.c
index d52451fa37..91dd5765ea 100644
--- a/widgets/misc/e-activity-proxy.c
+++ b/widgets/misc/e-activity-proxy.c
@@ -47,7 +47,7 @@ enum {
G_DEFINE_TYPE (
EActivityProxy,
e_activity_proxy,
- GTK_TYPE_EVENT_BOX)
+ GTK_TYPE_FRAME)
static void
activity_proxy_feedback (EActivityProxy *proxy)
@@ -262,14 +262,9 @@ e_activity_proxy_init (EActivityProxy *proxy)
proxy->priv = G_TYPE_INSTANCE_GET_PRIVATE (
proxy, E_TYPE_ACTIVITY_PROXY, EActivityProxyPrivate);
- container = GTK_WIDGET (proxy);
-
- widget = gtk_frame_new (NULL);
- gtk_frame_set_shadow_type (GTK_FRAME (widget), GTK_SHADOW_IN);
- gtk_container_add (GTK_CONTAINER (container), widget);
- gtk_widget_show (widget);
+ gtk_frame_set_shadow_type (GTK_FRAME (proxy), GTK_SHADOW_IN);
- container = widget;
+ container = GTK_WIDGET (proxy);
widget = gtk_hbox_new (FALSE, 3);
gtk_container_add (GTK_CONTAINER (container), widget);
diff --git a/widgets/misc/e-activity-proxy.h b/widgets/misc/e-activity-proxy.h
index cb44d6b025..975cd6ff05 100644
--- a/widgets/misc/e-activity-proxy.h
+++ b/widgets/misc/e-activity-proxy.h
@@ -51,12 +51,12 @@ typedef struct _EActivityProxyClass EActivityProxyClass;
typedef struct _EActivityProxyPrivate EActivityProxyPrivate;
struct _EActivityProxy {
- GtkEventBox parent;
+ GtkFrame parent;
EActivityProxyPrivate *priv;
};
struct _EActivityProxyClass {
- GtkEventBoxClass parent_class;
+ GtkFrameClass parent_class;
};
GType e_activity_proxy_get_type (void);