aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--calendar/ChangeLog13
-rw-r--r--calendar/gui/calendar-commands.c2
-rw-r--r--calendar/gui/e-day-view-main-item.c12
-rw-r--r--calendar/gui/e-day-view-top-item.c12
-rw-r--r--calendar/gui/e-meeting-list-view.c2
-rw-r--r--calendar/gui/e-meeting-time-sel-item.c6
-rw-r--r--calendar/gui/e-meeting-time-sel.c2
-rw-r--r--calendar/gui/e-week-view-event-item.c12
8 files changed, 37 insertions, 24 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index 327928a4c5..b29c7537d5 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,16 @@
+2006-09-18 Matthew Barnes <mbarnes@redhat.com>
+
+ ** Fixes bug #352450
+
+ * gui/calendar-commands.c:
+ * gui/e-day-view-main-item.c:
+ * gui/e-day-view-top-item.c:
+ * gui/e-meeting-list-view.c:
+ * gui/e-meeting-time-sel-item.c:
+ * gui/e-meeting-time-sel.c:
+ * gui/e-week-view-event-item.c:
+ Replace deprecated GLib and GDK function calls.
+
2006-09-11 Chenthill Palanisamy <pchenthill@novell.com>
Fixes #344276
diff --git a/calendar/gui/calendar-commands.c b/calendar/gui/calendar-commands.c
index be5aef1bfb..40abe4efaf 100644
--- a/calendar/gui/calendar-commands.c
+++ b/calendar/gui/calendar-commands.c
@@ -154,7 +154,7 @@ set_clock_cursor (GnomeCalendar *gcal)
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 ();
}
diff --git a/calendar/gui/e-day-view-main-item.c b/calendar/gui/e-day-view-main-item.c
index e700ffb4ab..6b818d3d66 100644
--- a/calendar/gui/e-day-view-main-item.c
+++ b/calendar/gui/e-day-view-main-item.c
@@ -795,7 +795,7 @@ e_day_view_main_item_draw_day_event (EDayViewMainItem *dvmitem,
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 @@ e_day_view_main_item_draw_day_event (EDayViewMainItem *dvmitem,
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 @@ e_day_view_main_item_draw_day_event (EDayViewMainItem *dvmitem,
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 @@ e_day_view_main_item_draw_day_event (EDayViewMainItem *dvmitem,
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;
diff --git a/calendar/gui/e-day-view-top-item.c b/calendar/gui/e-day-view-top-item.c
index e2818eaf2f..f628d0ad6a 100644
--- a/calendar/gui/e-day-view-top-item.c
+++ b/calendar/gui/e-day-view-top-item.c
@@ -572,7 +572,7 @@ e_day_view_top_item_draw_long_event (EDayViewTopItem *dvtitem,
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 @@ e_day_view_top_item_draw_long_event (EDayViewTopItem *dvtitem,
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 @@ e_day_view_top_item_draw_long_event (EDayViewTopItem *dvtitem,
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 @@ e_day_view_top_item_draw_long_event (EDayViewTopItem *dvtitem,
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);
diff --git a/calendar/gui/e-meeting-list-view.c b/calendar/gui/e-meeting-list-view.c
index 7dac185c7a..ed50c0bb9a 100644
--- a/calendar/gui/e-meeting-list-view.c
+++ b/calendar/gui/e-meeting-list-view.c
@@ -787,7 +787,7 @@ process_section (EMeetingListView *view, GList *destinations, icalparameter_role
g_slist_free (*la);
*la = NULL;
} else
- *la = g_slist_remove_link (*la, g_slist_find_custom (*la, attendee, (GCompareFunc)g_strcasecmp));
+ *la = g_slist_remove_link (*la, g_slist_find_custom (*la, attendee, (GCompareFunc)g_ascii_strcasecmp));
}
}
diff --git a/calendar/gui/e-meeting-time-sel-item.c b/calendar/gui/e-meeting-time-sel-item.c
index ced272cb8f..4969f70c7f 100644
--- a/calendar/gui/e-meeting-time-sel-item.c
+++ b/calendar/gui/e-meeting-time-sel-item.c
@@ -159,15 +159,15 @@ e_meeting_time_selector_item_destroy (GtkObject *object)
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;
}
diff --git a/calendar/gui/e-meeting-time-sel.c b/calendar/gui/e-meeting-time-sel.c
index 6b683e25db..36354c74a6 100644
--- a/calendar/gui/e-meeting-time-sel.c
+++ b/calendar/gui/e-meeting-time-sel.c
@@ -822,7 +822,7 @@ e_meeting_time_selector_destroy (GtkObject *object)
e_meeting_time_selector_remove_timeout (mts);
if (mts->stipple) {
- gdk_bitmap_unref (mts->stipple);
+ g_object_unref (mts->stipple);
mts->stipple = NULL;
}
diff --git a/calendar/gui/e-week-view-event-item.c b/calendar/gui/e-week-view-event-item.c
index 3d810ef7e8..5f0d7fc634 100644
--- a/calendar/gui/e-week-view-event-item.c
+++ b/calendar/gui/e-week-view-event-item.c
@@ -704,16 +704,16 @@ e_week_view_event_item_draw_icons (EWeekViewEventItem *wveitem,
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 @@ e_week_view_event_item_draw_icons (EWeekViewEventItem *wveitem,
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);
}
cairo_destroy (cr);
generated by cgit (git 2.34.1) at 2024-11-14 08:01:57 +0800