diff --git a/ChangeLog b/ChangeLog index ee03ceda4..0f5367e70 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2009-02-22 Thomas H.P. Andersen + + * capplets/appearance/appearance-font.c: + * capplets/mouse/gnome-mouse-properties.c: + * typing-break/drw-utils.c: Replace deprecated GTK sybmols. Bug #572325 + 2009-02-18 Jens Granseuer Patch by: Jonas Bonn diff --git a/capplets/appearance/appearance-font.c b/capplets/appearance/appearance-font.c index 26888ded8..9a262378e 100644 --- a/capplets/appearance/appearance-font.c +++ b/capplets/appearance/appearance-font.c @@ -105,9 +105,8 @@ sample_expose (GtkWidget *darea, 0, 0, darea->allocation.width - 1, darea->allocation.height - 1); - gdk_pixbuf_render_to_drawable (pixbuf, darea->window, NULL, - 0, 0, x, y, width, height, - GDK_RGB_DITHER_NORMAL, 0, 0); + gdk_draw_pixbuf (darea->window, NULL, pixbuf, 0, 0, x, y, width, height, + GDK_RGB_DITHER_NORMAL, 0, 0); } typedef enum { diff --git a/capplets/mouse/gnome-mouse-properties.c b/capplets/mouse/gnome-mouse-properties.c index c9344de7b..dd81d0b02 100644 --- a/capplets/mouse/gnome-mouse-properties.c +++ b/capplets/mouse/gnome-mouse-properties.c @@ -235,23 +235,23 @@ event_box_button_press_event (GtkWidget *widget, double_click_time = gconf_value_get_int (value); if (test_maybe_timeout_id != 0) - gtk_timeout_remove (test_maybe_timeout_id); + g_source_remove (test_maybe_timeout_id); if (test_on_timeout_id != 0) - gtk_timeout_remove (test_on_timeout_id); + g_source_remove (test_on_timeout_id); switch (double_click_state) { case DOUBLE_CLICK_TEST_OFF: double_click_state = DOUBLE_CLICK_TEST_MAYBE; data.image = image; data.timeout_id = &test_maybe_timeout_id; - test_maybe_timeout_id = gtk_timeout_add (double_click_time, (GtkFunction) test_maybe_timeout, &data); + test_maybe_timeout_id = g_timeout_add (double_click_time, (GtkFunction) test_maybe_timeout, &data); break; case DOUBLE_CLICK_TEST_MAYBE: if (event->time - double_click_timestamp < double_click_time) { double_click_state = DOUBLE_CLICK_TEST_ON; data.image = image; data.timeout_id = &test_on_timeout_id; - test_on_timeout_id = gtk_timeout_add (2500, (GtkFunction) test_maybe_timeout, &data); + test_on_timeout_id = g_timeout_add (2500, (GtkFunction) test_maybe_timeout, &data); } break; case DOUBLE_CLICK_TEST_ON: diff --git a/typing-break/drw-utils.c b/typing-break/drw-utils.c index 2eac50201..64cbbe6d0 100644 --- a/typing-break/drw-utils.c +++ b/typing-break/drw-utils.c @@ -205,19 +205,19 @@ set_pixmap_background (GtkWidget *window) height, -1); - gdk_pixbuf_render_to_drawable_alpha (tmp_pixbuf, - pixmap, - 0, - 0, - 0, - 0, - width, - height, - GDK_PIXBUF_ALPHA_BILEVEL, - 0, - GDK_RGB_DITHER_NONE, - 0, - 0); + gdk_draw_pixbuf (pixmap, + NULL, + tmp_pixbuf, + 0, + 0, + 0, + 0, + width, + height, + GDK_RGB_DITHER_NONE, + 0, + 0); + g_object_unref (tmp_pixbuf); gdk_window_set_back_pixmap (window->window, pixmap, FALSE);