[evolution-patches] Remove use of deprecated GDK symbols
- From: Matthew Barnes <mbarnes redhat com>
- To: evolution-patches <evolution-patches gnome org>
- Subject: [evolution-patches] Remove use of deprecated GDK symbols
- Date: Fri, 18 Aug 2006 13:01:25 -0400
I compiled evolution-2.7.91 with deprecated GDK symbols disabled and
patched most of the errors. Some of the errors would require an API
change to fix properly, so I skipped them. Please review the attached
patch.
Note: I also tried compiling evolution-data-server-1.7.91 and
evolution-exchange-2.7.91 this way and encountered no errors.
To reproduce: $ CFLAGS=-DGDK_DISABLE_DEPRECATED=1 ./configure; make
Deprecated Symbols
------------------
GdkFont API
Found in: e-table-field-chooser-item.c
e-table-group-container.c
e-table-header-item.c
Solution: skipped (breaks API)
gdk_bitmap_ref
Found in: e-canvas-background.c
e-text.c
Solution: Use g_object_ref
gdk_bitmap_unref
Found in: e-canvas-background.c
e-cell-text.c
e-day-view-main-item.c
e-day-view-top-item.c
e-meeting-time-sel.c
e-table-header-item.c
e-table-item.c
e-task-widget.c
e-text.c
e-week-view-event-item.c
Solution: Use g_object_unref
gdk_cursor_destroy
Found in: calendar-commands.c
e-cell-text.c
e-cursor.c
e-cursors.c
e-meeting-time-sel-item.c
e-reflow.c
e-text.c
gal-combo-box.c
Solution: Use gdk_cursor_unref
gdk_draw_pixmap
Found in: e-cell-toggle.c
e-day-view-main-item.c
e-day-view-top-item.c
e-table-header-utils.c
e-week-view-event-item.c
gal-combo-box.c
Solution: Use gdk_draw_drawable
gdk_gc_destroy
Found in: e-map.c
Solution: Use g_object_unref
gdk_pixmap_unref
Found in: e-cell-toggle.c
e-day-view-main-item.c
e-day-view-top-item.c
e-table-field-chooser-item.c
e-table-header-item.c
e-table-header-utils.c
e-task-widget.c
e-week-view-event-item.c
gal-combo-box.c
Solution: Use g_object_unref
gdk_rgb_get_cmap
Found in: e-map.c
e-table.c
e-table-field-chooser.c
e-table-header-item.c
e-tree.c
Solution: Use gdk_rgb_get_colormap
gdk_window_copy_area
Found in: e-map.c
Solution: Use gdk_draw_drawable (note argument sequence)
gdk_window_get_colormap
Found in: e-table-field-chooser-item.c
e-table-header-item.c
Solution: Use gdk_drawable_get_colormap
gdk_window_get_size
Found in: e-map.c
Solution: Use gdk_drawable_get_size
Errors Encountered
------------------
### Breaks API: Fudging This ###
e-table-group-container.c: In function 'etgc_dispose':
e-table-group-container.c:109: warning: implicit declaration of function
'gdk_font_unref'
e-table-group-container.c: In function
'e_table_group_container_construct':
e-table-group-container.c:166: warning: implicit declaration of function
'gdk_font_ref'
e-table-group-container.c: In function 'etgc_reflow':
e-table-group-container.c:1010: error: dereferencing pointer to
incomplete type
e-table-group-container.c:1010: error: dereferencing pointer to
incomplete type
### Breaks API: Fudging This ###
e-entry.c: In function 'e_entry_class_init':
e-entry.c:1272: error: 'GDK_TYPE_FONT' undeclared (first use in this
function)
e-entry.c:1272: error: (Each undeclared identifier is reported only once
e-entry.c:1272: error: for each function it appears in.)
### Linker Errors ###
./.libs/libetable.so: undefined reference to `gdk_window_get_colormap'
./.libs/libemiscwidgets.so: undefined reference to `gdk_pixmap_unref'
./.libs/libemiscwidgets.so: undefined reference to `gdk_bitmap_ref'
./.libs/libemiscwidgets.so: undefined reference to `gdk_bitmap_unref'
./.libs/libemiscwidgets.so: undefined reference to `gdk_cursor_destroy'
./.libs/libemiscwidgets.so: undefined reference to `gdk_gc_destroy'
./.libs/libemiscwidgets.so: undefined reference to
`gdk_window_copy_area'
./.libs/libemiscwidgets.so: undefined reference to `gdk_window_get_size'
./.libs/libemiscwidgets.so: undefined reference to `gdk_rgb_get_cmap'
./.libs/libemiscwidgets.so: undefined reference to `gdk_draw_pixmap'
--- evolution-2.7.91/widgets/misc/gal-combo-box.c.deprecated-gdk 2006-08-17 20:35:29.000000000 -0400
+++ evolution-2.7.91/widgets/misc/gal-combo-box.c 2006-08-17 23:23:59.000000000 -0400
@@ -429,7 +429,7 @@
gtk_widget_realize (combo_box->priv->popup);
cursor = gdk_cursor_new (GDK_TOP_LEFT_ARROW);
gdk_window_set_cursor (combo_box->priv->popup->window, cursor);
- gdk_cursor_destroy (cursor);
+ gdk_cursor_unref (cursor);
combo_box->priv->torn_off = FALSE;
combo_box->priv->tearoff_window = NULL;
@@ -607,7 +607,7 @@
widget->allocation.height,
-1);
- gdk_draw_pixmap (pixmap, gc,
+ gdk_draw_drawable (GDK_DRAWABLE (pixmap), gc,
widget->window,
0, 0, 0, 0, -1, -1);
gdk_gc_unref (gc);
@@ -618,7 +618,7 @@
gdk_window_set_back_pixmap
(combo->priv->tearoff_window->window, pixmap, FALSE);
- gdk_pixmap_unref (pixmap);
+ g_object_unref (pixmap);
}
}
--- evolution-2.7.91/widgets/misc/e-reflow.c.deprecated-gdk 2006-08-17 23:00:00.000000000 -0400
+++ evolution-2.7.91/widgets/misc/e-reflow.c 2006-08-17 23:02:16.000000000 -0400
@@ -882,8 +882,8 @@
if (!item->canvas->aa) {
}
- gdk_cursor_destroy (reflow->arrow_cursor);
- gdk_cursor_destroy (reflow->default_cursor);
+ gdk_cursor_unref (reflow->arrow_cursor);
+ gdk_cursor_unref (reflow->default_cursor);
reflow->arrow_cursor = NULL;
reflow->default_cursor = NULL;
--- evolution-2.7.91/widgets/misc/e-map.c.deprecated-gdk 2006-08-17 23:08:07.000000000 -0400
+++ evolution-2.7.91/widgets/misc/e-map.c 2006-08-17 23:17:57.000000000 -0400
@@ -319,7 +319,7 @@
attr.height = widget->allocation.height;
attr.wclass = GDK_INPUT_OUTPUT;
attr.visual = gdk_rgb_get_visual ();
- attr.colormap = gdk_rgb_get_cmap ();
+ attr.colormap = gdk_rgb_get_colormap ();
attr.event_mask = gtk_widget_get_events (widget) |
GDK_EXPOSURE_MASK | GDK_BUTTON_PRESS_MASK | GDK_KEY_PRESS_MASK |
GDK_POINTER_MOTION_MASK;
@@ -1277,9 +1277,9 @@
gc = gdk_gc_new (window);
gdk_gc_set_exposures (gc, TRUE);
- gdk_window_copy_area (window, gc, dest_x, dest_y, window, src_x, src_y, width - abs (xofs), height - abs (yofs));
+ gdk_draw_drawable (GDK_DRAWABLE (window), gc, GDK_DRAWABLE (window), src_x, src_y, dest_x, dest_y, width - abs (xofs), height - abs (yofs));
- gdk_gc_destroy (gc);
+ g_object_unref (gc);
/* Add the scrolled-in region */
@@ -1429,7 +1429,7 @@
/* Get area constraints */
- gdk_window_get_size (window, &area_width, &area_height);
+ gdk_drawable_get_size (GDK_DRAWABLE (window), &area_width, &area_height);
/* Initialize area division array indexes */
@@ -1487,9 +1487,9 @@
/* Push left */
for (j = 0; j < zoom_chunk - 1; j++)
- gdk_window_copy_area (window, gc, line + j + 1, 0, window, line, 0, 1, area_height);
+ gdk_draw_drawable (GDK_DRAWABLE (window), gc, GDK_DRAWABLE (window), line, 0, line + j + 1, 0, 1, area_height);
- gdk_window_copy_area (window, gc, 0, 0, window, zoom_chunk, 0, line, area_height);
+ gdk_draw_drawable (GDK_DRAWABLE (window), gc, GDK_DRAWABLE (window), zoom_chunk, 0, 0, 0, line, area_height);
if (line > target_x) target_x -= zoom_chunk;
}
else
@@ -1497,9 +1497,9 @@
/* Push right */
for (j = 0; j < zoom_chunk - 1; j++)
- gdk_window_copy_area (window, gc, line + j - (zoom_chunk - 1), 0, window, line - zoom_chunk, 0, 1, area_height);
+ gdk_draw_drawable (GDK_DRAWABLE (window), gc, GDK_DRAWABLE (window), line - zoom_chunk, 0, line + j - (zoom_chunk - 1), 0, 1, area_height);
- gdk_window_copy_area (window, gc, line, 0, window, line - zoom_chunk, 0, area_width - line, area_height);
+ gdk_draw_drawable (GDK_DRAWABLE (window), gc, GDK_DRAWABLE (window), line - zoom_chunk, 0, line, 0, area_width - line, area_height);
if (line < target_x) target_x += zoom_chunk;
}
}
@@ -1515,9 +1515,9 @@
/* Push up */
for (j = 0; j < zoom_chunk - 1; j++)
- gdk_window_copy_area (window, gc, 0, line + j + 1, window, 0, line, area_width, 1);
+ gdk_draw_drawable (GDK_DRAWABLE (window), gc, GDK_DRAWABLE (window), 0, line, 0, line + j + 1, area_width, 1);
- gdk_window_copy_area (window, gc, 0, 0, window, 0, zoom_chunk, area_width, line);
+ gdk_draw_drawable (GDK_DRAWABLE (window), gc, GDK_DRAWABLE (window), 0, zoom_chunk, 0, 0, area_width, line);
if (line > target_y) target_y -= zoom_chunk;
}
else
@@ -1525,9 +1525,9 @@
/* Push down */
for (j = 0; j < zoom_chunk - 1; j++)
- gdk_window_copy_area (window, gc, 0, line + j - (zoom_chunk - 1), window, 0, line - zoom_chunk, area_width, 1);
+ gdk_draw_drawable (GDK_DRAWABLE (window), gc, GDK_WINDOW (window), 0, line - zoom_chunk, 0, line + j - (zoom_chunk - 1), area_width, 1);
- gdk_window_copy_area (window, gc, 0, line, window, 0, line - zoom_chunk, area_width, area_height - line);
+ gdk_draw_drawable (GDK_DRAWABLE (window), gc, GDK_DRAWABLE (window), 0, line - zoom_chunk, 0, line, area_width, area_height - line);
if (line < target_y) target_y += zoom_chunk;
}
}
@@ -1540,7 +1540,7 @@
/* Free our GC */
- gdk_gc_destroy (gc);
+ g_object_unref (gc);
}
--- evolution-2.7.91/widgets/misc/e-cursors.c.deprecated-gdk 2006-08-17 22:59:36.000000000 -0400
+++ evolution-2.7.91/widgets/misc/e-cursors.c 2006-08-17 23:01:46.000000000 -0400
@@ -143,7 +143,7 @@
int i;
for (i = 0; cursors [i].hot_x; i++)
- gdk_cursor_destroy (cursors [i].cursor);
+ gdk_cursor_unref (cursors [i].cursor);
}
--- evolution-2.7.91/widgets/misc/e-canvas-background.c.deprecated-gdk 2006-08-17 22:44:42.000000000 -0400
+++ evolution-2.7.91/widgets/misc/e-canvas-background.c 2006-08-17 22:55:25.000000000 -0400
@@ -161,11 +161,11 @@
{
if (use_value) {
if (ecb->priv->stipple)
- gdk_bitmap_unref (ecb->priv->stipple);
+ g_object_unref (ecb->priv->stipple);
ecb->priv->stipple = stipple;
if (stipple)
- gdk_bitmap_ref (stipple);
+ g_object_ref (stipple);
}
if (ecb->priv->gc) {
@@ -184,7 +184,7 @@
if (ecb->priv) {
if (ecb->priv->stipple)
- gdk_bitmap_unref (ecb->priv->stipple);
+ g_object_unref (ecb->priv->stipple);
ecb->priv->stipple = NULL;
g_free (ecb->priv);
--- evolution-2.7.91/widgets/misc/e-task-widget.c.deprecated-gdk 2006-08-17 20:35:19.000000000 -0400
+++ evolution-2.7.91/widgets/misc/e-task-widget.c 2006-08-17 22:55:40.000000000 -0400
@@ -162,9 +162,9 @@
gtk_widget_show (priv->label);
gtk_box_pack_start (GTK_BOX (box), priv->label, TRUE, TRUE, 0);
- gdk_pixmap_unref (pixmap);
+ g_object_unref (pixmap);
if (mask)
- gdk_bitmap_unref (mask);
+ g_object_unref (mask);
priv->tooltips = gtk_tooltips_new ();
g_object_ref (priv->tooltips);
--- evolution-2.7.91/widgets/table/e-cell-text.c.deprecated-gdk 2006-08-17 22:49:40.000000000 -0400
+++ evolution-2.7.91/widgets/table/e-cell-text.c 2006-08-17 23:02:30.000000000 -0400
@@ -424,9 +424,9 @@
}
if (text_view->stipple)
- gdk_bitmap_unref (text_view->stipple);
+ g_object_unref (text_view->stipple);
- gdk_cursor_destroy (text_view->i_cursor);
+ gdk_cursor_unref (text_view->i_cursor);
if (ect->colors) {
colormap = gtk_widget_get_colormap (GTK_WIDGET (text_view->canvas));
--- evolution-2.7.91/widgets/table/e-table-item.c.deprecated-gdk 2006-08-17 22:49:56.000000000 -0400
+++ evolution-2.7.91/widgets/table/e-table-item.c 2006-08-17 22:56:19.000000000 -0400
@@ -1793,7 +1793,7 @@
eti->grid_gc = NULL;
gdk_gc_unref (eti->focus_gc);
eti->focus_gc = NULL;
- gdk_bitmap_unref (eti->stipple);
+ g_object_unref (eti->stipple);
eti->stipple = NULL;
eti_unrealize_cell_views (eti);
--- evolution-2.7.91/widgets/table/e-table-header-utils.c.deprecated-gdk 2006-08-17 20:36:07.000000000 -0400
+++ evolution-2.7.91/widgets/table/e-table-header-utils.c 2006-08-17 23:24:22.000000000 -0400
@@ -455,12 +455,12 @@
gdk_gc_set_clip_rectangle (gc, NULL);
if (pixmap) {
- gdk_draw_pixmap (drawable, gc, pixmap,
+ gdk_draw_drawable (drawable, gc, pixmap,
0, 0,
xpos,
inner_y + (inner_height - clip_height) / 2,
clip_width, clip_height);
- gdk_pixmap_unref (pixmap);
+ g_object_unref (pixmap);
}
} else {
e_table_draw_elided_string (drawable, gc, widget,
--- evolution-2.7.91/widgets/table/e-table-field-chooser-item.c.deprecated-gdk 2006-08-17 20:28:14.000000000 -0400
+++ evolution-2.7.91/widgets/table/e-table-field-chooser-item.c 2006-08-17 22:40:07.000000000 -0400
@@ -564,12 +564,12 @@
E_TABLE_COL_ARROW_NONE);
gtk_drag_set_icon_pixmap (context,
- gdk_window_get_colormap (widget->window),
+ gdk_drawable_get_colormap (GDK_DRAWABLE (widget->window)),
pixmap,
NULL,
etfci->width / 2,
button_height / 2);
- gdk_pixmap_unref (pixmap);
+ g_object_unref (pixmap);
etfci->maybe_drag = FALSE;
}
--- evolution-2.7.91/widgets/table/e-tree.c.deprecated-gdk 2006-08-17 23:16:48.000000000 -0400
+++ evolution-2.7.91/widgets/table/e-tree.c 2006-08-17 23:18:46.000000000 -0400
@@ -1376,7 +1376,7 @@
et_connect_to_etta (e_tree);
- gtk_widget_push_colormap (gdk_rgb_get_cmap ());
+ gtk_widget_push_colormap (gdk_rgb_get_colormap ());
e_tree->priv->sorter = e_sorter_new();
--- evolution-2.7.91/widgets/table/e-table-field-chooser.c.deprecated-gdk 2006-08-17 23:16:17.000000000 -0400
+++ evolution-2.7.91/widgets/table/e-table-field-chooser.c 2006-08-17 23:18:20.000000000 -0400
@@ -167,7 +167,7 @@
gtk_widget_reparent(widget,
GTK_WIDGET(etfc));
- gtk_widget_push_colormap (gdk_rgb_get_cmap ());
+ gtk_widget_push_colormap (gdk_rgb_get_colormap ());
etfc->canvas = GNOME_CANVAS(glade_xml_get_widget(gui, "canvas-buttons"));
--- evolution-2.7.91/widgets/table/e-table.c.deprecated-gdk 2006-08-17 23:16:07.000000000 -0400
+++ evolution-2.7.91/widgets/table/e-table.c 2006-08-17 23:18:10.000000000 -0400
@@ -1533,7 +1533,7 @@
e_table->model = etm;
g_object_ref (etm);
- gtk_widget_push_colormap (gdk_rgb_get_cmap ());
+ gtk_widget_push_colormap (gdk_rgb_get_colormap ());
connect_header (e_table, state);
e_table->horizontal_scrolling = specification->horizontal_scrolling;
--- evolution-2.7.91/widgets/table/e-cell-toggle.c.deprecated-gdk 2006-08-17 20:36:18.000000000 -0400
+++ evolution-2.7.91/widgets/table/e-cell-toggle.c 2006-08-17 23:24:55.000000000 -0400
@@ -97,7 +97,7 @@
for (i = 0; i < etog->n_states * CACHE_SEQ_COUNT; i++)
if (toggle_view->pixmap_cache[i])
- gdk_pixmap_unref (toggle_view->pixmap_cache[i]);
+ g_object_unref (toggle_view->pixmap_cache[i]);
g_free (toggle_view->pixmap_cache);
g_free (ecell_view);
}
@@ -236,7 +236,7 @@
height = gdk_pixbuf_get_height (image);
}
- gdk_draw_pixmap (drawable, toggle_view->gc,
+ gdk_draw_drawable (drawable, toggle_view->gc,
pixmap,
0, 0,
x, y,
@@ -369,7 +369,7 @@
for (i = 0; i < toggle->n_states * CACHE_SEQ_COUNT; i++) {
if (toggle_view->pixmap_cache[i]) {
- gdk_pixmap_unref (toggle_view->pixmap_cache[i]);
+ g_object_unref (toggle_view->pixmap_cache[i]);
toggle_view->pixmap_cache[i] = NULL;
}
}
--- evolution-2.7.91/widgets/table/e-table-header-item.c.deprecated-gdk 2006-08-17 20:28:23.000000000 -0400
+++ evolution-2.7.91/widgets/table/e-table-header-item.c 2006-08-17 23:18:34.000000000 -0400
@@ -491,7 +491,7 @@
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 @@
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 @@
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 @@
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);
--- evolution-2.7.91/widgets/text/e-text.c.deprecated-gdk 2006-08-17 22:45:03.000000000 -0400
+++ evolution-2.7.91/widgets/text/e-text.c 2006-08-17 23:02:44.000000000 -0400
@@ -229,7 +229,7 @@
text->revert = NULL;
if (text->stipple)
- gdk_bitmap_unref (text->stipple);
+ g_object_unref (text->stipple);
text->stipple = NULL;
if (text->timeout_id) {
@@ -645,11 +645,11 @@
set_stipple (EText *text, GdkBitmap *stipple, int reconfigure)
{
if (text->stipple && !reconfigure)
- gdk_bitmap_unref (text->stipple);
+ g_object_unref (text->stipple);
text->stipple = stipple;
if (stipple && !reconfigure)
- gdk_bitmap_ref (stipple);
+ g_object_ref (stipple);
if (text->gc) {
if (stipple) {
@@ -1263,9 +1263,9 @@
gdk_gc_unref (text->gc);
text->gc = NULL;
- gdk_cursor_destroy (text->i_cursor);
+ gdk_cursor_unref (text->i_cursor);
text->i_cursor = NULL;
- gdk_cursor_destroy (text->default_cursor);
+ gdk_cursor_unref (text->default_cursor);
text->default_cursor = NULL;
if (parent_class->unrealize)
--- evolution-2.7.91/e-util/e-cursor.c.deprecated-gdk 2006-08-17 22:59:25.000000000 -0400
+++ evolution-2.7.91/e-util/e-cursor.c 2006-08-17 23:01:32.000000000 -0400
@@ -61,7 +61,7 @@
}
gdk_window_set_cursor (toplevel->window, window_cursor);
- gdk_cursor_destroy (window_cursor);
+ gdk_cursor_unref (window_cursor);
}
}
--- evolution-2.7.91/calendar/gui/e-day-view-top-item.c.deprecated-gdk 2006-08-17 20:35:00.000000000 -0400
+++ evolution-2.7.91/calendar/gui/e-day-view-top-item.c 2006-08-17 23:23:14.000000000 -0400
@@ -572,7 +572,7 @@
gdk_gc_set_clip_origin (gc, icon_x, icon_y);
if (mask != NULL)
gdk_gc_set_clip_mask (gc, mask);
- gdk_draw_pixmap (drawable, gc,
+ gdk_draw_drawable (drawable, gc,
pixmap,
0, 0, icon_x, icon_y,
E_DAY_VIEW_ICON_WIDTH,
@@ -580,9 +580,9 @@
icon_x -= icon_x_inc;
}
- gdk_pixmap_unref (pixmap);
+ g_object_unref (pixmap);
if (mask != NULL)
- gdk_bitmap_unref (mask);
+ g_object_unref (mask);
}
e_cal_component_free_categories_list (categories_list);
@@ -1158,7 +1158,7 @@
gdk_gc_set_clip_origin (gc, icon_x, icon_y);
if (mask != NULL)
gdk_gc_set_clip_mask (gc, mask);
- gdk_draw_pixmap (drawable, gc,
+ gdk_draw_drawable (drawable, gc,
pixmap,
0, 0, icon_x, icon_y,
E_DAY_VIEW_ICON_WIDTH,
@@ -1166,9 +1166,9 @@
icon_x -= icon_x_inc;
}
- gdk_pixmap_unref (pixmap);
+ g_object_unref (pixmap);
if (mask != NULL)
- gdk_bitmap_unref (mask);
+ g_object_unref (mask);
}
e_cal_component_free_categories_list (categories_list);
--- evolution-2.7.91/calendar/gui/e-day-view-main-item.c.deprecated-gdk 2006-08-17 20:34:22.000000000 -0400
+++ evolution-2.7.91/calendar/gui/e-day-view-main-item.c 2006-08-17 23:22:43.000000000 -0400
@@ -795,7 +795,7 @@
gdk_gc_set_clip_origin (gc, icon_x, icon_y);
if (mask != NULL)
gdk_gc_set_clip_mask (gc, mask);
- gdk_draw_pixmap (drawable, gc,
+ gdk_draw_drawable (drawable, gc,
pixmap,
0, 0, icon_x, icon_y,
MIN (E_DAY_VIEW_ICON_WIDTH,
@@ -803,9 +803,9 @@
MIN (E_DAY_VIEW_ICON_HEIGHT,
max_icon_h));
- gdk_pixmap_unref (pixmap);
+ g_object_unref (pixmap);
if (mask != NULL)
- gdk_bitmap_unref (mask);
+ g_object_unref (mask);
icon_x += icon_x_inc;
icon_y += icon_y_inc;
@@ -1930,7 +1930,7 @@
gdk_gc_set_clip_origin (gc, icon_x, icon_y);
if (mask != NULL)
gdk_gc_set_clip_mask (gc, mask);
- gdk_draw_pixmap (drawable, gc,
+ gdk_draw_drawable (drawable, gc,
pixmap,
0, 0, icon_x, icon_y,
MIN (E_DAY_VIEW_ICON_WIDTH,
@@ -1938,9 +1938,9 @@
MIN (E_DAY_VIEW_ICON_HEIGHT,
max_icon_h));
- gdk_pixmap_unref (pixmap);
+ g_object_unref (pixmap);
if (mask != NULL)
- gdk_bitmap_unref (mask);
+ g_object_unref (mask);
icon_x += icon_x_inc;
icon_y += icon_y_inc;
--- evolution-2.7.91/calendar/gui/e-week-view-event-item.c.deprecated-gdk 2006-08-17 20:35:10.000000000 -0400
+++ evolution-2.7.91/calendar/gui/e-week-view-event-item.c 2006-08-17 23:23:29.000000000 -0400
@@ -704,16 +704,16 @@
gdk_gc_set_clip_origin (gc, icon_x, icon_y);
if (mask != NULL)
gdk_gc_set_clip_mask (gc, mask);
- gdk_draw_pixmap (drawable, gc,
+ gdk_draw_drawable (drawable, gc,
pixmap,
0, 0, icon_x, icon_y,
E_WEEK_VIEW_ICON_WIDTH,
E_WEEK_VIEW_ICON_HEIGHT);
icon_x += icon_x_inc;
}
- gdk_pixmap_unref (pixmap);
+ g_object_unref (pixmap);
if (mask != NULL)
- gdk_bitmap_unref (mask);
+ g_object_unref (mask);
}
e_cal_component_free_categories_list (categories_list);
@@ -1388,16 +1388,16 @@
gdk_gc_set_clip_origin (gc, icon_x, icon_y);
if (mask != NULL)
gdk_gc_set_clip_mask (gc, mask);
- gdk_draw_pixmap (drawable, gc,
+ gdk_draw_drawable (drawable, gc,
pixmap,
0, 0, icon_x, icon_y,
E_WEEK_VIEW_ICON_WIDTH,
E_WEEK_VIEW_ICON_HEIGHT);
icon_x += icon_x_inc;
}
- gdk_pixmap_unref (pixmap);
+ g_object_unref (pixmap);
if (mask != NULL)
- gdk_bitmap_unref (mask);
+ g_object_unref (mask);
}
e_cal_component_free_categories_list (categories_list);
--- evolution-2.7.91/calendar/gui/calendar-commands.c.deprecated-gdk 2006-08-17 22:59:01.000000000 -0400
+++ evolution-2.7.91/calendar/gui/calendar-commands.c 2006-08-17 23:01:02.000000000 -0400
@@ -154,7 +154,7 @@
cursor = gdk_cursor_new (GDK_WATCH);
gdk_window_set_cursor (GTK_WIDGET (gcal)->window, cursor);
- gdk_cursor_destroy (cursor);
+ gdk_cursor_unref (cursor);
gdk_flush ();
}
--- evolution-2.7.91/calendar/gui/e-meeting-time-sel-item.c.deprecated-gdk 2006-08-17 22:59:13.000000000 -0400
+++ evolution-2.7.91/calendar/gui/e-meeting-time-sel-item.c 2006-08-17 23:01:16.000000000 -0400
@@ -159,15 +159,15 @@
mts_item = E_MEETING_TIME_SELECTOR_ITEM (object);
if (mts_item->normal_cursor) {
- gdk_cursor_destroy (mts_item->normal_cursor);
+ gdk_cursor_unref (mts_item->normal_cursor);
mts_item->normal_cursor = NULL;
}
if (mts_item->resize_cursor) {
- gdk_cursor_destroy (mts_item->resize_cursor);
+ gdk_cursor_unref (mts_item->resize_cursor);
mts_item->resize_cursor = NULL;
}
if (mts_item->busy_cursor) {
- gdk_cursor_destroy (mts_item->busy_cursor);
+ gdk_cursor_unref (mts_item->busy_cursor);
mts_item->busy_cursor = NULL;
}
--- evolution-2.7.91/calendar/gui/e-meeting-time-sel.c.deprecated-gdk 2006-08-17 22:48:48.000000000 -0400
+++ evolution-2.7.91/calendar/gui/e-meeting-time-sel.c 2006-08-17 22:55:12.000000000 -0400
@@ -822,7 +822,7 @@
e_meeting_time_selector_remove_timeout (mts);
if (mts->stipple) {
- gdk_bitmap_unref (mts->stipple);
+ g_object_unref (mts->stipple);
mts->stipple = NULL;
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
