From a6bebee2305bd67be0ec952fdca2aaea426b69eb Mon Sep 17 00:00:00 2001 From: Thomas Leonard Date: Thu, 21 Mar 2002 12:57:10 +0000 Subject: [PATCH] r1337: Compile with GDK_DISABLE_DEPRECATED. --- ROX-Filer/src/action.c | 8 +++---- ROX-Filer/src/collection.c | 6 ++--- ROX-Filer/src/config.h.in | 1 + ROX-Filer/src/display.c | 29 +++++++++++++----------- ROX-Filer/src/dnd.c | 4 ++-- ROX-Filer/src/filer.c | 4 ++-- ROX-Filer/src/gui_support.c | 11 ++++----- ROX-Filer/src/gui_support.h | 2 -- ROX-Filer/src/icon.c | 2 +- ROX-Filer/src/infobox.c | 5 +++-- ROX-Filer/src/main.c | 3 ++- ROX-Filer/src/panel.c | 8 +++---- ROX-Filer/src/pinboard.c | 54 +++++++++++++++++++++++++++------------------ ROX-Filer/src/pixmaps.c | 23 ++++++++++--------- ROX-Filer/src/remote.c | 6 ++--- ROX-Filer/src/run.c | 6 ++--- ROX-Filer/src/type.c | 4 ++-- 17 files changed, 95 insertions(+), 81 deletions(-) diff --git a/ROX-Filer/src/action.c b/ROX-Filer/src/action.c index 408822ed..30a5f430 100644 --- a/ROX-Filer/src/action.c +++ b/ROX-Filer/src/action.c @@ -393,7 +393,7 @@ static void message_from_child(gpointer data, fclose(gui_side->to_child); gui_side->to_child = NULL; close(gui_side->from_child); - gdk_input_remove(gui_side->input_tag); + g_source_remove(gui_side->input_tag); /* XXX: gtk_widget_set_sensitive(gui_side->quiet, FALSE); */ if (gui_side->errors) @@ -682,7 +682,7 @@ static void destroy_action_window(GtkWidget *widget, gpointer data) kill(gui_side->child, SIGTERM); fclose(gui_side->to_child); close(gui_side->from_child); - gdk_input_remove(gui_side->input_tag); + g_source_remove(gui_side->input_tag); } g_free(gui_side); @@ -775,10 +775,10 @@ static GUIside *start_action(GtkWidget *abox, ActionChild *func, gpointer data, g_signal_connect(abox, "flag_toggled", G_CALLBACK(flag_toggled), gui_side); - gui_side->input_tag = gdk_input_add(gui_side->from_child, + gui_side->input_tag = gtk_input_add_full(gui_side->from_child, GDK_INPUT_READ, message_from_child, - gui_side); + NULL, gui_side, NULL); return gui_side; } diff --git a/ROX-Filer/src/collection.c b/ROX-Filer/src/collection.c index a968506e..93f27d80 100644 --- a/ROX-Filer/src/collection.c +++ b/ROX-Filer/src/collection.c @@ -361,7 +361,7 @@ static void collection_destroy(GtkObject *object) if (collection->bg_gc) { - gdk_gc_destroy(collection->bg_gc); + g_object_unref(collection->bg_gc); collection->bg_gc = NULL; } @@ -1219,7 +1219,7 @@ static gboolean as_timeout(Collection *collection) int diff = 0; gdk_window_get_pointer(window, &x, &y, &mask); - gdk_window_get_size(window, &w, NULL); + gdk_drawable_get_size(window, &w, NULL); h = collection->vadj->page_size; y -= collection->vadj->value; @@ -1493,7 +1493,7 @@ void collection_set_item_size(Collection *collection, int width, int height) { gint window_width; - gdk_window_get_size(widget->window, &window_width, NULL); + gdk_drawable_get_size(widget->window, &window_width, NULL); collection->columns = MAX(window_width / collection->item_width, 1); if (collection->cursor_item != -1) diff --git a/ROX-Filer/src/config.h.in b/ROX-Filer/src/config.h.in index 8516160c..9770746c 100644 --- a/ROX-Filer/src/config.h.in +++ b/ROX-Filer/src/config.h.in @@ -35,3 +35,4 @@ #endif #define GTK_DISABLE_DEPRECATED +#define GDK_DISABLE_DEPRECATED diff --git a/ROX-Filer/src/display.c b/ROX-Filer/src/display.c index 9f347be1..76956756 100644 --- a/ROX-Filer/src/display.c +++ b/ROX-Filer/src/display.c @@ -293,11 +293,11 @@ void draw_huge_icon(GtkWidget *widget, image_y = MAX(0, area->height - height - 6); gdk_gc_set_clip_origin(gc, image_x, area->y + image_y); - gdk_draw_pixmap(widget->window, gc, - image->huge_pixmap, - 0, 0, /* Source x,y */ - image_x, area->y + image_y, /* Dest x,y */ - width, height); + gdk_draw_drawable(widget->window, gc, + image->huge_pixmap, + 0, 0, /* Source x,y */ + image_x, area->y + image_y, /* Dest x,y */ + width, height); if (selected) { @@ -313,7 +313,7 @@ void draw_huge_icon(GtkWidget *widget, { gdk_gc_set_clip_origin(gc, image_x, area->y + 2); gdk_gc_set_clip_mask(gc, im_symlink->mask); - gdk_draw_pixmap(widget->window, gc, im_symlink->pixmap, + gdk_draw_drawable(widget->window, gc, im_symlink->pixmap, 0, 0, /* Source x,y */ image_x, area->y + 2, /* Dest x,y */ -1, -1); @@ -326,7 +326,7 @@ void draw_huge_icon(GtkWidget *widget, gdk_gc_set_clip_origin(gc, image_x, area->y + 2); gdk_gc_set_clip_mask(gc, mp->mask); - gdk_draw_pixmap(widget->window, gc, mp->pixmap, + gdk_draw_drawable(widget->window, gc, mp->pixmap, 0, 0, /* Source x,y */ image_x, area->y + 2, /* Dest x,y */ -1, -1); @@ -362,7 +362,7 @@ void draw_large_icon(GtkWidget *widget, image_y = MAX(0, area->height - height - 6); gdk_gc_set_clip_origin(gc, image_x, area->y + image_y); - gdk_draw_pixmap(widget->window, gc, + gdk_draw_drawable(widget->window, gc, image->pixmap, 0, 0, /* Source x,y */ image_x, area->y + image_y, /* Dest x,y */ @@ -382,7 +382,7 @@ void draw_large_icon(GtkWidget *widget, { gdk_gc_set_clip_origin(gc, image_x, area->y + 2); gdk_gc_set_clip_mask(gc, im_symlink->mask); - gdk_draw_pixmap(widget->window, gc, im_symlink->pixmap, + gdk_draw_drawable(widget->window, gc, im_symlink->pixmap, 0, 0, /* Source x,y */ image_x, area->y + 2, /* Dest x,y */ -1, -1); @@ -395,7 +395,7 @@ void draw_large_icon(GtkWidget *widget, gdk_gc_set_clip_origin(gc, image_x, area->y + 2); gdk_gc_set_clip_mask(gc, mp->mask); - gdk_draw_pixmap(widget->window, gc, mp->pixmap, + gdk_draw_drawable(widget->window, gc, mp->pixmap, 0, 0, /* Source x,y */ image_x, area->y + 2, /* Dest x,y */ -1, -1); @@ -1020,7 +1020,7 @@ static void draw_small_icon(GtkWidget *widget, image_y = MAX(0, SMALL_HEIGHT - image->sm_height); gdk_gc_set_clip_origin(gc, image_x, area->y + image_y); - gdk_draw_pixmap(widget->window, gc, + gdk_draw_drawable(widget->window, gc, image->sm_pixmap, 0, 0, /* Source x,y */ image_x, area->y + image_y, /* Dest x,y */ @@ -1040,7 +1040,7 @@ static void draw_small_icon(GtkWidget *widget, { gdk_gc_set_clip_origin(gc, image_x, area->y + 8); gdk_gc_set_clip_mask(gc, im_symlink->mask); - gdk_draw_pixmap(widget->window, gc, im_symlink->pixmap, + gdk_draw_drawable(widget->window, gc, im_symlink->pixmap, 0, 0, /* Source x,y */ image_x, area->y + 8, /* Dest x,y */ -1, -1); @@ -1055,7 +1055,7 @@ static void draw_small_icon(GtkWidget *widget, pixmap_make_small(mp); gdk_gc_set_clip_origin(gc, image_x + 2, area->y + 2); gdk_gc_set_clip_mask(gc, mp->sm_mask); - gdk_draw_pixmap(widget->window, gc, + gdk_draw_drawable(widget->window, gc, mp->sm_pixmap, 0, 0, /* Source x,y */ image_x + 2, area->y + 2, /* Dest x,y */ @@ -1390,6 +1390,8 @@ static void draw_string(GtkWidget *widget, if (width > area->width) { + /* XXX */ +#if 0 if (!red_gc) { red_gc = gdk_gc_new(widget->window); @@ -1399,6 +1401,7 @@ static void draw_string(GtkWidget *widget, area->x + area->width - 1, area->y, 1, area->height); gdk_gc_set_clip_rectangle(gc, NULL); +#endif } } diff --git a/ROX-Filer/src/dnd.c b/ROX-Filer/src/dnd.c index 5b1fee1c..9140d5f0 100644 --- a/ROX-Filer/src/dnd.c +++ b/ROX-Filer/src/dnd.c @@ -1162,7 +1162,7 @@ void dnd_spring_load(GdkDragContext *context, FilerWindow *src_win) dnd_spring_abort(); spring_context = context; - gdk_drag_context_ref(spring_context); + g_object_ref(spring_context); spring_src_window = src_win; spring_timeout = gtk_timeout_add( o_dnd_spring_delay.int_value, spring_now, NULL); @@ -1173,7 +1173,7 @@ void dnd_spring_abort(void) if (!spring_context) return; - gdk_drag_context_unref(spring_context); + g_object_unref(spring_context); spring_context = NULL; gtk_timeout_remove(spring_timeout); } diff --git a/ROX-Filer/src/filer.c b/ROX-Filer/src/filer.c index ebd09ab8..28182c47 100644 --- a/ROX-Filer/src/filer.c +++ b/ROX-Filer/src/filer.c @@ -242,8 +242,8 @@ static void filer_window_set_size(FilerWindow *filer_window, { gint old_w, old_h; - gdk_window_get_size(filer_window->window->window, - &old_w, &old_h); + gdk_drawable_get_size(filer_window->window->window, + &old_w, &old_h); w = MAX(w, old_w); h = MAX(h, old_h); diff --git a/ROX-Filer/src/gui_support.c b/ROX-Filer/src/gui_support.c index 7e0df2ba..cf788708 100644 --- a/ROX-Filer/src/gui_support.c +++ b/ROX-Filer/src/gui_support.c @@ -44,8 +44,6 @@ #include "pixmaps.h" #include "choices.h" -GdkGC *red_gc = NULL; /* Not automatically initialised */ -GdkColor red = {0, 0xffff, 0, 0}; gint screen_width, screen_height; static GdkAtom xa_cardinal; @@ -54,14 +52,13 @@ static GtkWidget *current_dialog = NULL; void gui_support_init() { - gdk_color_alloc(gtk_widget_get_default_colormap(), &red); /* XXX */ - - xa_cardinal = gdk_atom_intern("CARDINAL", FALSE); + xa_cardinal = gdk_atom_intern("CARDINAL", FALSE); /* This call starts returning strange values after a while, so get * the result here during init. */ - gdk_window_get_size(GDK_ROOT_PARENT(), &screen_width, &screen_height); + gdk_drawable_get_size(gdk_get_default_root_window(), + &screen_width, &screen_height); } /* Open a modal dialog box showing a message. @@ -597,7 +594,7 @@ void centre_window(GdkWindow *window, int x, int y) g_return_if_fail(window != NULL); - gdk_window_get_size(window, &w, &h); + gdk_drawable_get_size(window, &w, &h); x -= w / 2; y -= h / 2; diff --git a/ROX-Filer/src/gui_support.h b/ROX-Filer/src/gui_support.h index e120d601..01488fcd 100644 --- a/ROX-Filer/src/gui_support.h +++ b/ROX-Filer/src/gui_support.h @@ -20,8 +20,6 @@ #define WIN_HINTS_SKIP_TASKBAR (1<<2) /* Not on taskbar */ extern GdkFont *fixed_font; -extern GdkColor red; -extern GdkGC *red_gc; extern gint screen_width, screen_height; typedef void (*HelpFunc)(gpointer data); diff --git a/ROX-Filer/src/icon.c b/ROX-Filer/src/icon.c index 41e76009..2cf0f811 100644 --- a/ROX-Filer/src/icon.c +++ b/ROX-Filer/src/icon.c @@ -513,7 +513,7 @@ void icon_destroyed(Icon *icon) if (icon->panel == NULL) { - gdk_pixmap_unref(icon->mask); + g_object_unref(icon->mask); if (current_pinboard) current_pinboard->icons = g_list_remove(current_pinboard->icons, icon); diff --git a/ROX-Filer/src/infobox.c b/ROX-Filer/src/infobox.c index 1fc4f08c..23ba689e 100644 --- a/ROX-Filer/src/infobox.c +++ b/ROX-Filer/src/infobox.c @@ -377,8 +377,9 @@ static GtkWidget *make_file_says(guchar *path) fs->label = GTK_LABEL(file_label); fs->fd = file_data[0]; fs->text = g_strdup(""); - fs->input = gdk_input_add(fs->fd, GDK_INPUT_READ, - (GdkInputFunction) add_file_output, fs); + fs->input = gtk_input_add_full(fs->fd, GDK_INPUT_READ, + (GdkInputFunction) add_file_output, + NULL, fs, NULL); g_signal_connect(frame, "destroy", G_CALLBACK(file_info_destroyed), fs); break; diff --git a/ROX-Filer/src/main.c b/ROX-Filer/src/main.c index 51d4ed4b..fa544e42 100644 --- a/ROX-Filer/src/main.c +++ b/ROX-Filer/src/main.c @@ -487,7 +487,8 @@ int main(int argc, char **argv) pipe(wakeup_pipe); close_on_exec(wakeup_pipe[0], TRUE); close_on_exec(wakeup_pipe[1], TRUE); - gdk_input_add(wakeup_pipe[0], GDK_INPUT_READ, wake_up_cb, NULL); + gtk_input_add_full(wakeup_pipe[0], GDK_INPUT_READ, wake_up_cb, + NULL, NULL, NULL); to_wakeup_pipe = wakeup_pipe[1]; /* If the pipe is full then we're going to get woken up anyway... */ diff --git a/ROX-Filer/src/panel.c b/ROX-Filer/src/panel.c index 350c716c..2a759dd7 100644 --- a/ROX-Filer/src/panel.c +++ b/ROX-Filer/src/panel.c @@ -607,7 +607,7 @@ static gint draw_icon(GtkWidget *widget, GdkRectangle *badarea, Icon *icon) GdkRectangle area; int width, height; - gdk_window_get_size(widget->window, &width, &height); + gdk_drawable_get_size(widget->window, &width, &height); area.x = 0; area.width = width; @@ -1082,7 +1082,7 @@ static gint icon_motion_event(GtkWidget *widget, else prev = panel->gap; - gdk_window_get_deskrelative_origin(prev->window, &x, &y); + gdk_window_get_origin(prev->window, &x, &y); if (val <= (horz ? x : y)) dir = -1; @@ -1098,9 +1098,9 @@ static gint icon_motion_event(GtkWidget *widget, else next = panel->gap; - gdk_window_get_deskrelative_origin(next->window, &x, &y); + gdk_window_get_origin(next->window, &x, &y); - gdk_window_get_size(next->window, &w, &h); + gdk_drawable_get_size(next->window, &w, &h); x += w; y += h; diff --git a/ROX-Filer/src/pinboard.c b/ROX-Filer/src/pinboard.c index 19b19d22..a558deb0 100644 --- a/ROX-Filer/src/pinboard.c +++ b/ROX-Filer/src/pinboard.c @@ -443,8 +443,9 @@ void pinboard_clear(void) current_pinboard = NULL; release_xdnd_proxy(GDK_ROOT_WINDOW()); - gdk_window_remove_filter(GDK_ROOT_PARENT(), proxy_filter, NULL); - gdk_window_set_user_data(GDK_ROOT_PARENT(), NULL); + gdk_window_remove_filter(gdk_get_default_root_window(), + proxy_filter, NULL); + gdk_window_set_user_data(gdk_get_default_root_window(), NULL); } /* Icon's size, shape or appearance has changed - update the display */ @@ -559,7 +560,7 @@ static void set_size_and_shape(Icon *icon, int *rwidth, int *rheight) icon->height = height; if (icon->mask) - gdk_pixmap_unref(icon->mask); + g_object_unref(icon->mask); icon->mask = gdk_pixmap_new(icon->win->window, width, height, 1); if (!mask_gc) mask_gc = gdk_gc_new(icon->mask); @@ -572,7 +573,7 @@ static void set_size_and_shape(Icon *icon, int *rwidth, int *rheight) /* Make the icon area solid */ if (image->mask) { - gdk_draw_pixmap(icon->mask, mask_gc, image->mask, + gdk_draw_drawable(icon->mask, mask_gc, image->mask, 0, 0, (width - iwidth) >> 1, WINK_FRAME, @@ -591,7 +592,7 @@ static void set_size_and_shape(Icon *icon, int *rwidth, int *rheight) gdk_gc_set_function(mask_gc, GDK_OR); if (item->flags & ITEM_FLAG_SYMLINK) { - gdk_draw_pixmap(icon->mask, mask_gc, im_symlink->mask, + gdk_draw_drawable(icon->mask, mask_gc, im_symlink->mask, 0, 0, /* Source x,y */ (width - iwidth) >> 1, /* Dest x */ WINK_FRAME, /* Dest y */ @@ -600,7 +601,7 @@ static void set_size_and_shape(Icon *icon, int *rwidth, int *rheight) else if (item->flags & ITEM_FLAG_MOUNT_POINT) { /* Note: Both mount state pixmaps must have the same mask */ - gdk_draw_pixmap(icon->mask, mask_gc, im_mounted->mask, + gdk_draw_drawable(icon->mask, mask_gc, im_mounted->mask, 0, 0, /* Source x,y */ (width - iwidth) >> 1, /* Dest x */ WINK_FRAME, /* Dest y */ @@ -641,7 +642,7 @@ static gint draw_icon(GtkWidget *widget, GdkEventExpose *event, Icon *icon) /* TODO: If the shape extension is missing we might need to set * the clip mask here... */ - gdk_draw_pixmap(widget->window, gc, + gdk_draw_drawable(widget->window, gc, image->pixmap, 0, 0, image_x, @@ -653,7 +654,7 @@ static gint draw_icon(GtkWidget *widget, GdkEventExpose *event, Icon *icon) { gdk_gc_set_clip_origin(gc, image_x, WINK_FRAME); gdk_gc_set_clip_mask(gc, im_symlink->mask); - gdk_draw_pixmap(widget->window, gc, + gdk_draw_drawable(widget->window, gc, im_symlink->pixmap, 0, 0, /* Source x,y */ image_x, WINK_FRAME, /* Dest x,y */ @@ -669,7 +670,7 @@ static gint draw_icon(GtkWidget *widget, GdkEventExpose *event, Icon *icon) gdk_gc_set_clip_origin(gc, image_x, WINK_FRAME); gdk_gc_set_clip_mask(gc, mp->mask); - gdk_draw_pixmap(widget->window, gc, + gdk_draw_drawable(widget->window, gc, mp->pixmap, 0, 0, /* Source x,y */ image_x, WINK_FRAME, /* Dest x,y */ @@ -941,7 +942,7 @@ static gint icon_motion_notify(GtkWidget *widget, icon->x = x; icon->y = y; - gdk_window_get_size(icon->win->window, &width, &height); + gdk_drawable_get_size(icon->win->window, &width, &height); offset_from_centre(icon, width, height, &x, &y); gdk_window_move(icon->win->window, x, y); @@ -1074,10 +1075,12 @@ static gboolean add_root_handlers(void) return FALSE; /* Forward events from the root window to our proxy window */ - gdk_window_add_filter(GDK_ROOT_PARENT(), proxy_filter, NULL); - gdk_window_set_user_data(GDK_ROOT_PARENT(), proxy_invisible); - gdk_window_set_events(GDK_ROOT_PARENT(), - gdk_window_get_events(GDK_ROOT_PARENT()) | + gdk_window_add_filter(gdk_get_default_root_window(), + proxy_filter, NULL); + gdk_window_set_user_data(gdk_get_default_root_window(), + proxy_invisible); + gdk_window_set_events(gdk_get_default_root_window(), + gdk_window_get_events(gdk_get_default_root_window()) | GDK_EXPOSURE_MASK | GDK_PROPERTY_CHANGE_MASK); @@ -1199,7 +1202,7 @@ static GdkFilterReturn proxy_filter(GdkXEvent *xevent, else event->button.type = GDK_BUTTON_RELEASE; - gdk_window_ref(proxy); + g_object_ref(proxy); event->button.window = proxy; event->button.send_event = xev->xbutton.send_event; @@ -1340,10 +1343,12 @@ static gint shadow_x, shadow_y; static void bg_expose(GdkRectangle *area) { - GdkWindow *root = GDK_ROOT_PARENT(); + GdkWindow *root; static GdkGC *shadow_gc = NULL; static GdkColor white, black; + root = gdk_get_default_root_window(); /* XXX */ + if (!pinboard_shadow) { /* XXX: Should just disable the events */ @@ -1353,11 +1358,16 @@ static void bg_expose(GdkRectangle *area) if (!shadow_gc) { GdkColormap *cm; + gboolean success; + + white.red = white.green = white.blue = 0xffff; + black.red = black.green = black.blue = 0; - cm = gdk_window_get_colormap(root); + cm = gdk_drawable_get_colormap(root); shadow_gc = gdk_gc_new(root); - gdk_color_white(cm, &white); - gdk_color_black(cm, &black); + + gdk_colormap_alloc_colors(cm, &white, 1, FALSE, TRUE, &success); + gdk_colormap_alloc_colors(cm, &black, 1, FALSE, TRUE, &success); } gdk_gc_set_clip_rectangle(shadow_gc, area); @@ -1375,7 +1385,9 @@ static void bg_expose(GdkRectangle *area) */ static void pinboard_set_shadow(gboolean on) { - GdkWindow *root = GDK_ROOT_PARENT(); + GdkWindow *root; + + root = gdk_get_default_root_window(); if (pinboard_shadow) { @@ -1421,7 +1433,7 @@ void pinboard_move_icons(void) icon->x = x; icon->y = y; - gdk_window_get_size(icon->win->window, &width, &height); + gdk_drawable_get_size(icon->win->window, &width, &height); offset_from_centre(icon, width, height, &x, &y); gdk_window_move(icon->win->window, x, y); diff --git a/ROX-Filer/src/pixmaps.c b/ROX-Filer/src/pixmaps.c index e105f12d..2e9f3020 100644 --- a/ROX-Filer/src/pixmaps.c +++ b/ROX-Filer/src/pixmaps.c @@ -102,7 +102,7 @@ static GdkPixbuf *get_thumbnail_for(const char *path); void pixmaps_init(void) { - gtk_widget_push_colormap(gdk_rgb_get_cmap()); + gtk_widget_push_colormap(gdk_rgb_get_colormap()); pixmap_cache = g_fscache_new((GFSLoadFunc) image_from_file, NULL, NULL); @@ -164,9 +164,9 @@ void pixmap_make_huge(MaskedPixmap *mp) if (!mp->huge_pixmap) { - gdk_pixmap_ref(mp->pixmap); + g_object_ref(mp->pixmap); if (mp->mask) - gdk_bitmap_ref(mp->mask); + g_object_ref(mp->mask); mp->huge_pixmap = mp->pixmap; mp->huge_mask = mp->mask; mp->huge_width = mp->width; @@ -199,9 +199,9 @@ void pixmap_make_small(MaskedPixmap *mp) if (mp->sm_pixmap) return; - gdk_pixmap_ref(mp->pixmap); + g_object_ref(mp->pixmap); if (mp->mask) - gdk_bitmap_ref(mp->mask); + g_object_ref(mp->mask); mp->sm_pixmap = mp->pixmap; mp->sm_mask = mp->mask; mp->sm_width = mp->width; @@ -270,8 +270,9 @@ void pixmap_background_thumb(const gchar *path, GFunc callback, gpointer data) SET_LOADER("thumb-callback", callback); SET_LOADER("thumb-callback-data", data); - tag = gdk_input_add(fd, GDK_INPUT_READ, - (GdkInputFunction) got_thumb_data, loader); + tag = gtk_input_add_full(fd, GDK_INPUT_READ, + (GdkInputFunction) got_thumb_data, NULL, + loader, NULL); SET_LOADER("thumb-input-tag", GINT_TO_POINTER(tag)); } @@ -534,7 +535,7 @@ static void got_thumb_data(GdkPixbufLoader *loader, path = GET_LOADER("thumb-path"); tag = GPOINTER_TO_INT(GET_LOADER("thumb-input-tag")); - gdk_input_remove(tag); + g_source_remove(tag); gdk_pixbuf_loader_close(loader, NULL); @@ -579,18 +580,18 @@ static void masked_pixmap_finialize(GObject *object) if (mp->huge_pixbuf) { - gdk_pixbuf_unref(mp->huge_pixbuf); + g_object_unref(mp->huge_pixbuf); mp->huge_pixbuf = NULL; } if (mp->huge_pixmap) { - gdk_pixmap_unref(mp->huge_pixmap); + g_object_unref(mp->huge_pixmap); mp->huge_pixmap = NULL; } if (mp->huge_mask) { - gdk_bitmap_unref(mp->huge_mask); + g_object_unref(mp->huge_mask); mp->huge_mask = NULL; } diff --git a/ROX-Filer/src/remote.c b/ROX-Filer/src/remote.c index d91ca8e2..a634a95d 100644 --- a/ROX-Filer/src/remote.c +++ b/ROX-Filer/src/remote.c @@ -187,7 +187,7 @@ gboolean remote_init(xmlDocPtr rpc, gboolean new_copy) G_CALLBACK(client_event), NULL); /* Make the root window contain a pointer to the IPC window */ - gdk_property_change(GDK_ROOT_PARENT(), filer_atom, + gdk_property_change(gdk_get_default_root_window(), filer_atom, gdk_x11_xatom_to_atom(XA_WINDOW), 32, GDK_PROP_MODE_REPLACE, (void *) &xwindow, 1); @@ -205,7 +205,7 @@ gboolean remote_init(xmlDocPtr rpc, gboolean new_copy) GDK_PROP_MODE_REPLACE, (void *) &xwindow, 1); /* ... and on the root */ - gdk_property_change(GDK_ROOT_PARENT(), filer_atom_any, + gdk_property_change(gdk_get_default_root_window(), filer_atom_any, gdk_x11_xatom_to_atom(XA_WINDOW), 32, GDK_PROP_MODE_REPLACE, (void *) &xwindow, 1); @@ -307,7 +307,7 @@ static GdkWindow *get_existing_ipc_window(void) Window xid, xid_confirm; GdkWindow *window; - if (!get_ipc_property(GDK_ROOT_PARENT(), &xid)) + if (!get_ipc_property(gdk_get_default_root_window(), &xid)) return NULL; if (gdk_window_lookup(xid)) diff --git a/ROX-Filer/src/run.c b/ROX-Filer/src/run.c index 2f2e9cf8..d3519f9d 100644 --- a/ROX-Filer/src/run.c +++ b/ROX-Filer/src/run.c @@ -177,8 +177,8 @@ void run_with_data(const char *path, gpointer data, gulong length) memcpy(pd->data, data, length); pd->length = length; pd->sent = 0; - pd->tag = gdk_input_add(fds[1], GDK_INPUT_WRITE, - write_data, pd); + pd->tag = gtk_input_add_full(fds[1], GDK_INPUT_WRITE, + write_data, NULL, pd, NULL); break; } @@ -415,7 +415,7 @@ static void write_data(gpointer data, gint fd, GdkInputCondition cond) } finish: - gdk_input_remove(pd->tag); + g_source_remove(pd->tag); g_free(pd->data); g_free(pd); close(fd); diff --git a/ROX-Filer/src/type.c b/ROX-Filer/src/type.c index 83f862f5..c6f2c872 100644 --- a/ROX-Filer/src/type.c +++ b/ROX-Filer/src/type.c @@ -1202,7 +1202,7 @@ static void alloc_type_colours(void) */ if (allocated && (change_count || !o_display_colour_types.int_value)) { - gdk_colormap_free_colors(gdk_rgb_get_cmap(), + gdk_colormap_free_colors(gdk_rgb_get_colormap(), type_colours, NUM_TYPE_COLOURS); allocated = FALSE; } @@ -1213,7 +1213,7 @@ static void alloc_type_colours(void) */ if (!allocated && o_display_colour_types.int_value) { - gdk_colormap_alloc_colors(gdk_rgb_get_cmap(), + gdk_colormap_alloc_colors(gdk_rgb_get_colormap(), type_colours, NUM_TYPE_COLOURS, FALSE, TRUE, success); allocated = TRUE; -- 2.11.4.GIT