aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenjamin Otte <otte@redhat.com>2010-10-21 17:31:18 +0800
committerMatthew Barnes <mbarnes@redhat.com>2010-10-30 01:50:04 +0800
commit8563661b4e952167e01e21252b4b72e524b2eae4 (patch)
treee03fc9aac1a9585c7dc70ea079ef0c85694e7d96
parentd98a5c50d468a1e3af48a8d4d2a5c8ad37e3d2df (diff)
downloadgsoc2013-evolution-8563661b4e952167e01e21252b4b72e524b2eae4.tar.gz
gsoc2013-evolution-8563661b4e952167e01e21252b4b72e524b2eae4.tar.zst
gsoc2013-evolution-8563661b4e952167e01e21252b4b72e524b2eae4.zip
e-table: Don't push/pop colormaps
It's not necessary anymore.
-rw-r--r--widgets/table/e-table-field-chooser.c3
-rw-r--r--widgets/table/e-table-header-item.c2
-rw-r--r--widgets/table/e-table.c4
-rw-r--r--widgets/table/e-tree.c4
4 files changed, 0 insertions, 13 deletions
diff --git a/widgets/table/e-table-field-chooser.c b/widgets/table/e-table-field-chooser.c
index cad87e7483..f0e3ece84c 100644
--- a/widgets/table/e-table-field-chooser.c
+++ b/widgets/table/e-table-field-chooser.c
@@ -183,8 +183,6 @@ e_table_field_chooser_init (ETableFieldChooser *etfc)
gtk_widget_set_size_request (widget, -1, 250);
gtk_box_pack_start (GTK_BOX (etfc), widget, TRUE, TRUE, 0);
- gtk_widget_push_colormap (gdk_rgb_get_colormap ());
-
etfc->rect = gnome_canvas_item_new (gnome_canvas_root ( GNOME_CANVAS ( etfc->canvas ) ),
gnome_canvas_rect_get_type (),
"x1", (gdouble) 0,
@@ -215,7 +213,6 @@ e_table_field_chooser_init (ETableFieldChooser *etfc)
G_CALLBACK (allocate_callback),
etfc);
- gtk_widget_pop_colormap ();
gtk_widget_show_all (widget);
}
diff --git a/widgets/table/e-table-header-item.c b/widgets/table/e-table-header-item.c
index e1c6c57198..5135c69a11 100644
--- a/widgets/table/e-table-header-item.c
+++ b/widgets/table/e-table-header-item.c
@@ -474,7 +474,6 @@ make_shaped_window_from_xpm (const gchar **xpm)
gdk_pixbuf_render_pixmap_and_mask (pixbuf, &pixmap, &bitmap, 128);
g_object_unref (pixbuf);
- gtk_widget_push_colormap (gdk_rgb_get_colormap ());
win = gtk_window_new (GTK_WINDOW_POPUP);
gtk_window_set_type_hint (GTK_WINDOW (win), GDK_WINDOW_TYPE_HINT_NOTIFICATION);
@@ -482,7 +481,6 @@ make_shaped_window_from_xpm (const gchar **xpm)
gtk_widget_realize (win);
gtk_container_add (GTK_CONTAINER (win), pix);
gtk_widget_shape_combine_mask (win, bitmap, 0, 0);
- gtk_widget_pop_colormap ();
g_object_unref (pixmap);
g_object_unref (bitmap);
diff --git a/widgets/table/e-table.c b/widgets/table/e-table.c
index 6f17c67610..4cbd6556af 100644
--- a/widgets/table/e-table.c
+++ b/widgets/table/e-table.c
@@ -1647,8 +1647,6 @@ et_real_construct (ETable *e_table, ETableModel *etm, ETableExtras *ete,
e_table->model = etm;
g_object_ref (etm);
- gtk_widget_push_colormap (gdk_rgb_get_colormap ());
-
connect_header (e_table, state);
e_table->horizontal_scrolling = specification->horizontal_scrolling;
e_table->horizontal_resize = specification->horizontal_resize;
@@ -1713,8 +1711,6 @@ et_real_construct (ETable *e_table, ETableModel *etm, ETableExtras *ete,
GTK_FILL | GTK_EXPAND,
0, 0);
- gtk_widget_pop_colormap ();
-
g_object_unref (ete);
return e_table;
diff --git a/widgets/table/e-tree.c b/widgets/table/e-tree.c
index d69a11118a..01db243b33 100644
--- a/widgets/table/e-tree.c
+++ b/widgets/table/e-tree.c
@@ -1542,8 +1542,6 @@ et_real_construct (ETree *e_tree, ETreeModel *etm, ETableExtras *ete,
et_connect_to_etta (e_tree);
- gtk_widget_push_colormap (gdk_rgb_get_colormap ());
-
e_tree->priv->sorter = e_sorter_new ();
g_object_set (e_tree->priv->selection,
@@ -1592,8 +1590,6 @@ et_real_construct (ETree *e_tree, ETreeModel *etm, ETableExtras *ete,
GTK_FILL | GTK_EXPAND,
0, 0);
- gtk_widget_pop_colormap ();
-
g_object_unref (ete);
return e_tree != NULL;