aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@redhat.com>2011-01-09 02:49:10 +0800
committerMatthew Barnes <mbarnes@redhat.com>2011-01-09 02:50:51 +0800
commit9c74ed8a465fa12901a85671fe933da7eb6b3b2f (patch)
treed7f07d6eda0a87d5f82764ed18c9e1ec62ffc3b7
parent3e09259db4cc5f557d5a58268f321c6f88307c32 (diff)
downloadgsoc2013-evolution-9c74ed8a465fa12901a85671fe933da7eb6b3b2f.tar
gsoc2013-evolution-9c74ed8a465fa12901a85671fe933da7eb6b3b2f.tar.gz
gsoc2013-evolution-9c74ed8a465fa12901a85671fe933da7eb6b3b2f.tar.bz2
gsoc2013-evolution-9c74ed8a465fa12901a85671fe933da7eb6b3b2f.tar.lz
gsoc2013-evolution-9c74ed8a465fa12901a85671fe933da7eb6b3b2f.tar.xz
gsoc2013-evolution-9c74ed8a465fa12901a85671fe933da7eb6b3b2f.tar.zst
gsoc2013-evolution-9c74ed8a465fa12901a85671fe933da7eb6b3b2f.zip
EAttachmentIconView: Fix runtime warnings with GTK3.
GtkIconView changed some implementation details, apparently.
-rw-r--r--widgets/misc/e-attachment-icon-view.c106
1 files changed, 58 insertions, 48 deletions
diff --git a/widgets/misc/e-attachment-icon-view.c b/widgets/misc/e-attachment-icon-view.c
index 9ec8fce83d..54bf9be9ed 100644
--- a/widgets/misc/e-attachment-icon-view.c
+++ b/widgets/misc/e-attachment-icon-view.c
@@ -128,6 +128,63 @@ attachment_icon_view_finalize (GObject *object)
G_OBJECT_CLASS (e_attachment_icon_view_parent_class)->finalize (object);
}
+static void
+attachment_icon_view_constructed (GObject *object)
+{
+ GtkCellLayout *cell_layout;
+ GtkCellRenderer *renderer;
+
+ cell_layout = GTK_CELL_LAYOUT (object);
+
+ /* This needs to happen after constructor properties are set
+ * so that GtkCellLayout.get_area() returns something valid. */
+
+ renderer = gtk_cell_renderer_pixbuf_new ();
+ g_object_set (renderer, "stock-size", icon_size, NULL);
+ gtk_cell_layout_pack_start (cell_layout, renderer, FALSE);
+
+ gtk_cell_layout_add_attribute (
+ cell_layout, renderer, "gicon",
+ E_ATTACHMENT_STORE_COLUMN_ICON);
+
+ renderer = gtk_cell_renderer_text_new ();
+ g_object_set (
+ renderer, "alignment", PANGO_ALIGN_CENTER,
+ "wrap-mode", PANGO_WRAP_WORD, "wrap-width", 150,
+ "yalign", 0.0, NULL);
+ gtk_cell_layout_pack_start (cell_layout, renderer, FALSE);
+
+ gtk_cell_layout_add_attribute (
+ cell_layout, renderer, "text",
+ E_ATTACHMENT_STORE_COLUMN_CAPTION);
+
+ renderer = gtk_cell_renderer_progress_new ();
+ g_object_set (renderer, "text", _("Loading"), NULL);
+ gtk_cell_layout_pack_start (cell_layout, renderer, TRUE);
+
+ gtk_cell_layout_add_attribute (
+ cell_layout, renderer, "value",
+ E_ATTACHMENT_STORE_COLUMN_PERCENT);
+
+ gtk_cell_layout_add_attribute (
+ cell_layout, renderer, "visible",
+ E_ATTACHMENT_STORE_COLUMN_LOADING);
+
+ renderer = gtk_cell_renderer_progress_new ();
+ g_object_set (renderer, "text", _("Saving"), NULL);
+ gtk_cell_layout_pack_start (cell_layout, renderer, TRUE);
+
+ gtk_cell_layout_add_attribute (
+ cell_layout, renderer, "value",
+ E_ATTACHMENT_STORE_COLUMN_PERCENT);
+
+ gtk_cell_layout_add_attribute (
+ cell_layout, renderer, "visible",
+ E_ATTACHMENT_STORE_COLUMN_SAVING);
+
+ e_extensible_load_extensions (E_EXTENSIBLE (object));
+}
+
static gboolean
attachment_icon_view_button_press_event (GtkWidget *widget,
GdkEventButton *event)
@@ -446,6 +503,7 @@ e_attachment_icon_view_class_init (EAttachmentIconViewClass *class)
object_class->get_property = attachment_icon_view_get_property;
object_class->dispose = attachment_icon_view_dispose;
object_class->finalize = attachment_icon_view_finalize;
+ object_class->constructed = attachment_icon_view_constructed;
widget_class = GTK_WIDGET_CLASS (class);
widget_class->button_press_event = attachment_icon_view_button_press_event;
@@ -473,60 +531,12 @@ e_attachment_icon_view_class_init (EAttachmentIconViewClass *class)
static void
e_attachment_icon_view_init (EAttachmentIconView *icon_view)
{
- GtkCellLayout *cell_layout;
- GtkCellRenderer *renderer;
- cell_layout = GTK_CELL_LAYOUT (icon_view);
icon_view->priv = E_ATTACHMENT_ICON_VIEW_GET_PRIVATE (icon_view);
e_attachment_view_init (E_ATTACHMENT_VIEW (icon_view));
gtk_icon_view_set_selection_mode (
GTK_ICON_VIEW (icon_view), GTK_SELECTION_MULTIPLE);
-
- renderer = gtk_cell_renderer_pixbuf_new ();
- g_object_set (renderer, "stock-size", icon_size, NULL);
- gtk_cell_layout_pack_start (cell_layout, renderer, FALSE);
-
- gtk_cell_layout_add_attribute (
- cell_layout, renderer, "gicon",
- E_ATTACHMENT_STORE_COLUMN_ICON);
-
- renderer = gtk_cell_renderer_text_new ();
- g_object_set (
- renderer, "alignment", PANGO_ALIGN_CENTER,
- "wrap-mode", PANGO_WRAP_WORD, "wrap-width", 150,
- "yalign", 0.0, NULL);
- gtk_cell_layout_pack_start (cell_layout, renderer, FALSE);
-
- gtk_cell_layout_add_attribute (
- cell_layout, renderer, "text",
- E_ATTACHMENT_STORE_COLUMN_CAPTION);
-
- renderer = gtk_cell_renderer_progress_new ();
- g_object_set (renderer, "text", _("Loading"), NULL);
- gtk_cell_layout_pack_start (cell_layout, renderer, TRUE);
-
- gtk_cell_layout_add_attribute (
- cell_layout, renderer, "value",
- E_ATTACHMENT_STORE_COLUMN_PERCENT);
-
- gtk_cell_layout_add_attribute (
- cell_layout, renderer, "visible",
- E_ATTACHMENT_STORE_COLUMN_LOADING);
-
- renderer = gtk_cell_renderer_progress_new ();
- g_object_set (renderer, "text", _("Saving"), NULL);
- gtk_cell_layout_pack_start (cell_layout, renderer, TRUE);
-
- gtk_cell_layout_add_attribute (
- cell_layout, renderer, "value",
- E_ATTACHMENT_STORE_COLUMN_PERCENT);
-
- gtk_cell_layout_add_attribute (
- cell_layout, renderer, "visible",
- E_ATTACHMENT_STORE_COLUMN_SAVING);
-
- e_extensible_load_extensions (E_EXTENSIBLE (icon_view));
}
static void