aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--mail/ChangeLog8
-rw-r--r--mail/em-folder-browser.c4
-rw-r--r--mail/em-folder-view.c4
3 files changed, 12 insertions, 4 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index 0cd03307b5..ac4cf2a430 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,11 @@
+2006-12-04 Matthew Barnes <mbarnes@redhat.com>
+
+ Fixes bug #357970
+
+ * em-folder-browser.c:
+ * em-folder-view.c:
+ Don't call deprecated GLib / GDK functions.
+
2006-12-03 Harish Krishnaswamy <kharish@novell.com>
* mail-component.c: (mc_startup): Do not attempt to
diff --git a/mail/em-folder-browser.c b/mail/em-folder-browser.c
index 366bf2a4d8..07638ddcb9 100644
--- a/mail/em-folder-browser.c
+++ b/mail/em-folder-browser.c
@@ -325,13 +325,13 @@ generate_viewoption_menu (GtkWidget *emfv)
GtkImage *image;
gdk_color_parse(label->colour, &colour);
- gdk_color_alloc(gdk_colormap_get_system(), &colour);
+ gdk_colormap_alloc_color(gdk_colormap_get_system(), &colour, FALSE, TRUE);
pixmap = gdk_pixmap_new(((GtkWidget *)emfv)->window, 16, 16, -1);
gc = gdk_gc_new(((GtkWidget *)emfv)->window);
gdk_gc_set_foreground(gc, &colour);
gdk_draw_rectangle(pixmap, gc, TRUE, 0, 0, 16, 16);
- gdk_gc_unref(gc);
+ g_object_unref(gc);
image = gtk_image_new_from_pixmap(pixmap, NULL); */
str = string_without_underscores (label->name);
diff --git a/mail/em-folder-view.c b/mail/em-folder-view.c
index 6f1dac6cb3..f7467b409c 100644
--- a/mail/em-folder-view.c
+++ b/mail/em-folder-view.c
@@ -1249,13 +1249,13 @@ emfv_popup(EMFolderView *emfv, GdkEvent *event, int on_display)
item->visible = EM_POPUP_SELECT_MANY|EM_FOLDER_VIEW_SELECT_LISTONLY;
gdk_color_parse(label->colour, &colour);
- gdk_color_alloc(gdk_colormap_get_system(), &colour);
+ gdk_colormap_alloc_color(gdk_colormap_get_system(), &colour, FALSE, TRUE);
pixmap = gdk_pixmap_new(((GtkWidget *)emfv)->window, 16, 16, -1);
gc = gdk_gc_new(((GtkWidget *)emfv)->window);
gdk_gc_set_foreground(gc, &colour);
gdk_draw_rectangle(pixmap, gc, TRUE, 0, 0, 16, 16);
- gdk_gc_unref(gc);
+ g_object_unref(gc);
item->image = gtk_image_new_from_pixmap(pixmap, NULL);
gtk_widget_show(item->image);