aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--shell/ChangeLog5
-rw-r--r--shell/e-shell-folder-title-bar.c4
2 files changed, 8 insertions, 1 deletions
diff --git a/shell/ChangeLog b/shell/ChangeLog
index ed666dfca0..3e29f5605f 100644
--- a/shell/ChangeLog
+++ b/shell/ChangeLog
@@ -1,3 +1,8 @@
+2001-01-15 JP Rosevear <jpr@ximian.com>
+
+ * e-shell-folder-title-bar.c (e_shell_folder_title_bar_new): push/pop
+ the color map
+
2001-01-15 Iain Holmes <iain@ximian.com>
* importer/importer.c (import_druid_cancel): Just destroy the wizard.
diff --git a/shell/e-shell-folder-title-bar.c b/shell/e-shell-folder-title-bar.c
index 7a51e77ad3..788bec2a24 100644
--- a/shell/e-shell-folder-title-bar.c
+++ b/shell/e-shell-folder-title-bar.c
@@ -256,7 +256,7 @@ realize (GtkWidget *widget)
priv = folder_title_bar->priv;
pixmap = make_icon_pixmap (folder_title_bar, priv->icon);
- priv->icon_widget = gtk_pixmap_new (pixmap, NULL);
+ priv->icon_widget = gnome_pixmap_new (pixmap, NULL);
gdk_pixmap_unref (pixmap);
gtk_widget_show (priv->icon_widget);
@@ -418,7 +418,9 @@ e_shell_folder_title_bar_new (void)
{
EShellFolderTitleBar *new;
+ gtk_widget_push_colormap (gdk_rgb_get_cmap ());
new = gtk_type_new (e_shell_folder_title_bar_get_type ());
+ gtk_widget_pop_colormap ();
e_shell_folder_title_bar_construct (new);