Replace deprecated GTK symbols. Fixes part of bug #572325
svn path=/trunk/; revision=9283
This commit is contained in:
parent
e09d3371e8
commit
e5208bc543
4 changed files with 25 additions and 20 deletions
|
@ -1,3 +1,9 @@
|
||||||
|
2009-02-22 Thomas H.P. Andersen <phomes@gmail.com>
|
||||||
|
|
||||||
|
* 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 <jensgr@gmx.net>
|
2009-02-18 Jens Granseuer <jensgr@gmx.net>
|
||||||
|
|
||||||
Patch by: Jonas Bonn
|
Patch by: Jonas Bonn
|
||||||
|
|
|
@ -105,9 +105,8 @@ sample_expose (GtkWidget *darea,
|
||||||
0, 0,
|
0, 0,
|
||||||
darea->allocation.width - 1, darea->allocation.height - 1);
|
darea->allocation.width - 1, darea->allocation.height - 1);
|
||||||
|
|
||||||
gdk_pixbuf_render_to_drawable (pixbuf, darea->window, NULL,
|
gdk_draw_pixbuf (darea->window, NULL, pixbuf, 0, 0, x, y, width, height,
|
||||||
0, 0, x, y, width, height,
|
GDK_RGB_DITHER_NORMAL, 0, 0);
|
||||||
GDK_RGB_DITHER_NORMAL, 0, 0);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
typedef enum {
|
typedef enum {
|
||||||
|
|
|
@ -235,23 +235,23 @@ event_box_button_press_event (GtkWidget *widget,
|
||||||
double_click_time = gconf_value_get_int (value);
|
double_click_time = gconf_value_get_int (value);
|
||||||
|
|
||||||
if (test_maybe_timeout_id != 0)
|
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)
|
if (test_on_timeout_id != 0)
|
||||||
gtk_timeout_remove (test_on_timeout_id);
|
g_source_remove (test_on_timeout_id);
|
||||||
|
|
||||||
switch (double_click_state) {
|
switch (double_click_state) {
|
||||||
case DOUBLE_CLICK_TEST_OFF:
|
case DOUBLE_CLICK_TEST_OFF:
|
||||||
double_click_state = DOUBLE_CLICK_TEST_MAYBE;
|
double_click_state = DOUBLE_CLICK_TEST_MAYBE;
|
||||||
data.image = image;
|
data.image = image;
|
||||||
data.timeout_id = &test_maybe_timeout_id;
|
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;
|
break;
|
||||||
case DOUBLE_CLICK_TEST_MAYBE:
|
case DOUBLE_CLICK_TEST_MAYBE:
|
||||||
if (event->time - double_click_timestamp < double_click_time) {
|
if (event->time - double_click_timestamp < double_click_time) {
|
||||||
double_click_state = DOUBLE_CLICK_TEST_ON;
|
double_click_state = DOUBLE_CLICK_TEST_ON;
|
||||||
data.image = image;
|
data.image = image;
|
||||||
data.timeout_id = &test_on_timeout_id;
|
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;
|
break;
|
||||||
case DOUBLE_CLICK_TEST_ON:
|
case DOUBLE_CLICK_TEST_ON:
|
||||||
|
|
|
@ -205,19 +205,19 @@ set_pixmap_background (GtkWidget *window)
|
||||||
height,
|
height,
|
||||||
-1);
|
-1);
|
||||||
|
|
||||||
gdk_pixbuf_render_to_drawable_alpha (tmp_pixbuf,
|
gdk_draw_pixbuf (pixmap,
|
||||||
pixmap,
|
NULL,
|
||||||
0,
|
tmp_pixbuf,
|
||||||
0,
|
0,
|
||||||
0,
|
0,
|
||||||
0,
|
0,
|
||||||
width,
|
0,
|
||||||
height,
|
width,
|
||||||
GDK_PIXBUF_ALPHA_BILEVEL,
|
height,
|
||||||
0,
|
GDK_RGB_DITHER_NONE,
|
||||||
GDK_RGB_DITHER_NONE,
|
0,
|
||||||
0,
|
0);
|
||||||
0);
|
|
||||||
g_object_unref (tmp_pixbuf);
|
g_object_unref (tmp_pixbuf);
|
||||||
|
|
||||||
gdk_window_set_back_pixmap (window->window, pixmap, FALSE);
|
gdk_window_set_back_pixmap (window->window, pixmap, FALSE);
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue