Index: plugins/musicmessaging/musicmessaging.c =================================================================== RCS file: /cvsroot/gaim/gaim/plugins/musicmessaging/musicmessaging.c,v retrieving revision 1.20 diff -u -p -r1.20 musicmessaging.c --- plugins/musicmessaging/musicmessaging.c 11 Feb 2006 19:16:37 -0000 1.20 +++ plugins/musicmessaging/musicmessaging.c 13 Feb 2006 02:51:52 -0000 @@ -513,7 +513,7 @@ static void run_editor (MMConversation * args[1] = "-session_id"; session_id = g_string_new(""); - g_string_sprintfa(session_id, "%d", mmconv_from_conv_loc(mmconv->conv)); + g_string_append_printf(session_id, "%d", mmconv_from_conv_loc(mmconv->conv)); args[2] = session_id->str; args[3] = NULL; Index: src/ft.c =================================================================== RCS file: /cvsroot/gaim/gaim/src/ft.c,v retrieving revision 1.97 diff -u -p -r1.97 ft.c --- src/ft.c 11 Feb 2006 05:24:30 -0000 1.97 +++ src/ft.c 13 Feb 2006 02:51:53 -0000 @@ -457,7 +457,7 @@ gaim_xfer_request_accepted(GaimXfer *xfe gaim_xfer_set_local_filename(xfer, filename); gaim_xfer_set_size(xfer, st.st_size); - utf8 = g_filename_to_utf8(g_basename(filename), -1, NULL, NULL, NULL); + utf8 = g_filename_to_utf8(g_path_get_basename(filename), -1, NULL, NULL, NULL); gaim_xfer_set_filename(xfer, utf8); msg = g_strdup_printf(_("Offering to send %s to %s"), Index: src/gtkimhtml.c =================================================================== RCS file: /cvsroot/gaim/gaim/src/gtkimhtml.c,v retrieving revision 1.478 diff -u -p -r1.478 gtkimhtml.c --- src/gtkimhtml.c 11 Feb 2006 07:51:04 -0000 1.478 +++ src/gtkimhtml.c 13 Feb 2006 02:51:55 -0000 @@ -701,7 +701,7 @@ gtk_imhtml_expose_event (GtkWidget gc, TRUE, visible_rect.x, visible_rect.y, visible_rect.width, visible_rect.height); - gdk_gc_unref(gc); + g_object_unref(gc); if (GTK_WIDGET_CLASS (parent_class)->expose_event) return (* GTK_WIDGET_CLASS (parent_class)->expose_event) @@ -791,7 +791,7 @@ gtk_imhtml_expose_event (GtkWidget !gtk_text_iter_begins_tag(&cur, NULL)); } - gdk_gc_unref(gc); + g_object_unref(gc); if (GTK_WIDGET_CLASS (parent_class)->expose_event) return (* GTK_WIDGET_CLASS (parent_class)->expose_event) Index: src/gtkplugin.c =================================================================== RCS file: /cvsroot/gaim/gaim/src/gtkplugin.c,v retrieving revision 1.42 diff -u -p -r1.42 gtkplugin.c --- src/gtkplugin.c 18 Jan 2006 18:27:06 -0000 1.42 +++ src/gtkplugin.c 13 Feb 2006 02:51:56 -0000 @@ -136,7 +136,7 @@ update_plugin_list(void *data) gtk_list_store_append (ls, &iter); - name = g_markup_escape_text(plug->info->name ? _(plug->info->name) : g_basename(plug->path), -1); + name = g_markup_escape_text(plug->info->name ? _(plug->info->name) : g_path_get_basename(plug->path), -1); version = g_markup_escape_text(plug->info->version, -1); summary = g_markup_escape_text(_(plug->info->summary), -1); Index: src/gtkstatusbox.c =================================================================== RCS file: /cvsroot/gaim/gaim/src/gtkstatusbox.c,v retrieving revision 1.108 diff -u -p -r1.108 gtkstatusbox.c --- src/gtkstatusbox.c 12 Feb 2006 16:30:57 -0000 1.108 +++ src/gtkstatusbox.c 13 Feb 2006 02:51:57 -0000 @@ -766,13 +766,13 @@ cache_pixbufs(GtkGaimStatusBox *status_b } if (status_box->connecting_pixbufs[0] != NULL) - gdk_pixbuf_unref(status_box->connecting_pixbufs[0]); + g_object_unref(status_box->connecting_pixbufs[0]); if (status_box->connecting_pixbufs[1] != NULL) - gdk_pixbuf_unref(status_box->connecting_pixbufs[1]); + g_object_unref(status_box->connecting_pixbufs[1]); if (status_box->connecting_pixbufs[2] != NULL) - gdk_pixbuf_unref(status_box->connecting_pixbufs[2]); + g_object_unref(status_box->connecting_pixbufs[2]); if (status_box->connecting_pixbufs[3] != NULL) - gdk_pixbuf_unref(status_box->connecting_pixbufs[3]); + g_object_unref(status_box->connecting_pixbufs[3]); status_box->connecting_index = 0; status_box->connecting_pixbufs[0] = gtk_widget_render_icon (GTK_WIDGET(status_box->vbox), GAIM_STOCK_STATUS_CONNECT0, @@ -785,13 +785,13 @@ cache_pixbufs(GtkGaimStatusBox *status_b icon_size, "GtkGaimStatusBox"); if (status_box->typing_pixbufs[0] != NULL) - gdk_pixbuf_unref(status_box->typing_pixbufs[0]); + g_object_unref(status_box->typing_pixbufs[0]); if (status_box->typing_pixbufs[1] != NULL) - gdk_pixbuf_unref(status_box->typing_pixbufs[1]); + g_object_unref(status_box->typing_pixbufs[1]); if (status_box->typing_pixbufs[2] != NULL) - gdk_pixbuf_unref(status_box->typing_pixbufs[2]); + g_object_unref(status_box->typing_pixbufs[2]); if (status_box->typing_pixbufs[3] != NULL) - gdk_pixbuf_unref(status_box->typing_pixbufs[3]); + g_object_unref(status_box->typing_pixbufs[3]); status_box->typing_index = 0; status_box->typing_pixbufs[0] = gtk_widget_render_icon (GTK_WIDGET(status_box->vbox), GAIM_STOCK_STATUS_TYPING0, Index: src/gtkwhiteboard.c =================================================================== RCS file: /cvsroot/gaim/gaim/src/gtkwhiteboard.c,v retrieving revision 1.12 diff -u -p -r1.12 gtkwhiteboard.c --- src/gtkwhiteboard.c 10 Nov 2005 19:47:54 -0000 1.12 +++ src/gtkwhiteboard.c 13 Feb 2006 02:51:57 -0000 @@ -633,7 +633,7 @@ void gaim_gtk_whiteboard_draw_brush_poin update_rect.x, update_rect.y, update_rect.width, update_rect.height); - gdk_gc_unref(gfx_con); + g_object_unref(gfx_con); } /* Uses Bresenham's algorithm (as provided by Wikipedia) */ Index: src/protocols/msn/slplink.c =================================================================== RCS file: /cvsroot/gaim/gaim/src/protocols/msn/slplink.c,v retrieving revision 1.32 diff -u -p -r1.32 slplink.c --- src/protocols/msn/slplink.c 4 Oct 2005 05:03:02 -0000 1.32 +++ src/protocols/msn/slplink.c 13 Feb 2006 02:51:58 -0000 @@ -684,7 +684,7 @@ gen_context(const char *file_name, const size = st.st_size; if(!file_name) { - u8 = gaim_utf8_try_convert(g_basename(file_path)); + u8 = gaim_utf8_try_convert(g_path_get_basename(file_path)); file_name = u8; }