diff options
author | Matthew Barnes <mbarnes@redhat.com> | 2006-09-18 21:06:49 +0800 |
---|---|---|
committer | Harish Krishnaswamy <kharish@src.gnome.org> | 2006-09-18 21:06:49 +0800 |
commit | 7a205fe6d0eb35f5fea8485fcb67f70d9d6446f7 (patch) | |
tree | ae2856e35bc84ed4736c3d98a709b94ebb8f0d38 /widgets/table/e-table-header-item.c | |
parent | 6a807f9488adba7c10573e6eaa28030e9c9cb222 (diff) | |
download | gsoc2013-evolution-7a205fe6d0eb35f5fea8485fcb67f70d9d6446f7.tar.gz gsoc2013-evolution-7a205fe6d0eb35f5fea8485fcb67f70d9d6446f7.tar.zst gsoc2013-evolution-7a205fe6d0eb35f5fea8485fcb67f70d9d6446f7.zip |
** Fixes bug #352450
2006-08-23 Matthew Barnes <mbarnes@redhat.com>
** Fixes bug #352450
* misc/e-canvas-background.c:
* misc/e-cursors.c:
* misc/e-map.c:
* misc/e-reflow.c:
* misc/e-task-widget.c:
* misc/gal-combo-box.c:
* table/e-cell-text.c:
* table/e-cell-toggle.c:
* table/e-table-field-chooser-item.c:
* table/e-table-field-chooser.c:
* table/e-table-header-item.c:
* table/e-table-header-utils.c:
* table/e-table-item.c:
* table/e-table.c:
* table/e-tree-memory.c:
* table/e-tree-sorted.c:
* table/e-tree.c:
* table/e-text.c:
Replace deprecated GLib and GDK function calls.
svn path=/trunk/; revision=32783
Diffstat (limited to 'widgets/table/e-table-header-item.c')
-rw-r--r-- | widgets/table/e-table-header-item.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/widgets/table/e-table-header-item.c b/widgets/table/e-table-header-item.c index 1e6d9bad29..d42696be83 100644 --- a/widgets/table/e-table-header-item.c +++ b/widgets/table/e-table-header-item.c @@ -491,7 +491,7 @@ make_shaped_window_from_xpm (const char **xpm) gdk_pixbuf_render_pixmap_and_mask (pixbuf, &pixmap, &bitmap, 128); gdk_pixbuf_unref (pixbuf); - gtk_widget_push_colormap (gdk_rgb_get_cmap ()); + gtk_widget_push_colormap (gdk_rgb_get_colormap ()); win = gtk_window_new (GTK_WINDOW_POPUP); pix = gtk_image_new_from_pixmap (pixmap, bitmap); @@ -500,8 +500,8 @@ make_shaped_window_from_xpm (const char **xpm) gtk_widget_shape_combine_mask (win, bitmap, 0, 0); gtk_widget_pop_colormap (); - gdk_pixmap_unref (pixmap); - gdk_bitmap_unref (bitmap); + g_object_unref (pixmap); + g_object_unref (bitmap); return win; } @@ -950,7 +950,7 @@ ethi_unrealize (GnomeCanvasItem *item) gtk_drag_dest_unset (GTK_WIDGET (item->canvas)); if (ethi->stipple){ - gdk_bitmap_unref (ethi->stipple); + g_object_unref (ethi->stipple); ethi->stipple = NULL; } @@ -1216,12 +1216,12 @@ ethi_start_drag (ETableHeaderItem *ethi, GdkEvent *event) arrows, GINT_TO_POINTER (ecol->col_idx))); gtk_drag_set_icon_pixmap ( context, - gdk_window_get_colormap (widget->window), + gdk_drawable_get_colormap (GDK_DRAWABLE (widget->window)), pixmap, NULL, col_width / 2, ethi->height / 2); - gdk_pixmap_unref (pixmap); + g_object_unref (pixmap); ethi->maybe_drag = FALSE; g_hash_table_destroy (arrows); |