This is an automated email from the git hooks/post-receive script. a n d r e p u s h e d a c o m m i t t o b r a n c h m a s t e r in repository xfce/xfdesktop.
commit 340c6411e5be5ac2cda1a415861142ef8fb77f31 Author: Andre Miranda <[email protected]> Date: Sun Apr 21 15:46:27 2019 -0300 Fix casting --- settings/main.c | 4 ++-- src/xfce-desktop.c | 2 +- src/xfce-workspace.c | 2 +- src/xfdesktop-clipboard-manager.c | 6 +++--- src/xfdesktop-file-icon-manager.c | 2 +- src/xfdesktop-file-utils.c | 2 +- src/xfdesktop-volume-icon.c | 2 +- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/settings/main.c b/settings/main.c index e2a84e7..6d357f9 100644 --- a/settings/main.c +++ b/settings/main.c @@ -333,7 +333,7 @@ cb_thumbnail_ready(XfdesktopThumbnailer *thumbnailer, COL_THUMBNAIL, thumb_file, -1); pdata = g_new0(PreviewData, 1); - pdata->model = g_object_ref(G_OBJECT(model)); + pdata->model = GTK_TREE_MODEL(g_object_ref(G_OBJECT(model))); pdata->iter = gtk_tree_iter_copy(&iter); pdata->pix = NULL; @@ -363,7 +363,7 @@ xfdesktop_settings_queue_preview(GtkTreeModel *model, /* Thumbnailing not possible, add it to the queue to be loaded manually */ PreviewData *pdata; pdata = g_new0(PreviewData, 1); - pdata->model = g_object_ref(G_OBJECT(model)); + pdata->model = GTK_TREE_MODEL(g_object_ref(G_OBJECT(model))); pdata->iter = gtk_tree_iter_copy(iter); XF_DEBUG("Thumbnailing failed, adding %s manually.", filename); diff --git a/src/xfce-desktop.c b/src/xfce-desktop.c index 3974149..1ca426c 100644 --- a/src/xfce-desktop.c +++ b/src/xfce-desktop.c @@ -1572,7 +1572,7 @@ xfce_desktop_new(GdkScreen *gscreen, gtk_window_set_screen(GTK_WINDOW(desktop), gscreen); desktop->priv->gscreen = gscreen; - desktop->priv->channel = g_object_ref(G_OBJECT(channel)); + desktop->priv->channel = XFCONF_CHANNEL(g_object_ref(G_OBJECT(channel))); desktop->priv->property_prefix = g_strdup(property_prefix); xfce_desktop_connect_settings(desktop); diff --git a/src/xfce-workspace.c b/src/xfce-workspace.c index 8b3b4f3..32cca9f 100644 --- a/src/xfce-workspace.c +++ b/src/xfce-workspace.c @@ -753,7 +753,7 @@ xfce_workspace_new(GdkScreen *gscreen, workspace->priv->gscreen = gscreen; workspace->priv->workspace_num = number; - workspace->priv->channel = g_object_ref(G_OBJECT(channel)); + workspace->priv->channel = XFCONF_CHANNEL(g_object_ref(G_OBJECT(channel))); workspace->priv->property_prefix = g_strdup(property_prefix); return workspace; diff --git a/src/xfdesktop-clipboard-manager.c b/src/xfdesktop-clipboard-manager.c index 1970f70..7ea21d9 100644 --- a/src/xfdesktop-clipboard-manager.c +++ b/src/xfdesktop-clipboard-manager.c @@ -553,7 +553,7 @@ xfdesktop_clipboard_manager_transfer_files (XfdesktopClipboardManager *manager, /* setup the new file list */ for (lp = files, manager->files = NULL; lp != NULL; lp = lp->next) { - file = g_object_ref (G_OBJECT (lp->data)); + file = XFDESKTOP_FILE_ICON(g_object_ref (G_OBJECT (lp->data))); manager->files = g_list_prepend (manager->files, file); g_object_weak_ref(G_OBJECT(file), (GWeakNotify)xfdesktop_clipboard_manager_file_destroyed, @@ -613,7 +613,7 @@ xfdesktop_clipboard_manager_get_for_display (GdkDisplay *display) /* allocate a new manager */ manager = g_object_new (XFDESKTOP_TYPE_CLIPBOARD_MANAGER, NULL); - manager->clipboard = g_object_ref (G_OBJECT (clipboard)); + manager->clipboard = GTK_CLIPBOARD (g_object_ref (G_OBJECT (clipboard))); g_object_set_qdata (G_OBJECT (clipboard), xfdesktop_clipboard_manager_quark, manager); /* listen for the "owner-change" signal on the clipboard */ @@ -721,7 +721,7 @@ xfdesktop_clipboard_manager_paste_files (XfdesktopClipboardManager *manager, /* prepare the paste request */ request = g_slice_new0 (XfdesktopClipboardPasteRequest); - request->manager = g_object_ref (G_OBJECT (manager)); + request->manager = XFDESKTOP_CLIPBOARD_MANAGER (g_object_ref (G_OBJECT (manager))); request->target_file = g_object_ref (target_file); request->widget = widget; diff --git a/src/xfdesktop-file-icon-manager.c b/src/xfdesktop-file-icon-manager.c index fbd44f1..9787cce 100644 --- a/src/xfdesktop-file-icon-manager.c +++ b/src/xfdesktop-file-icon-manager.c @@ -3847,7 +3847,7 @@ xfdesktop_file_icon_manager_new(GFile *folder, fmanager = g_object_new(XFDESKTOP_TYPE_FILE_ICON_MANAGER, "folder", folder, NULL); - fmanager->priv->channel = g_object_ref(G_OBJECT(channel)); + fmanager->priv->channel = XFCONF_CHANNEL(g_object_ref(G_OBJECT(channel))); xfconf_g_property_bind(channel, DESKTOP_ICONS_SHOW_FILESYSTEM, G_TYPE_BOOLEAN, G_OBJECT(fmanager), "show-filesystem"); diff --git a/src/xfdesktop-file-utils.c b/src/xfdesktop-file-utils.c index 544dbda..7c66236 100644 --- a/src/xfdesktop-file-utils.c +++ b/src/xfdesktop-file-utils.c @@ -363,7 +363,7 @@ xfdesktop_file_utils_get_fallback_icon(gint size) xfdesktop_fallback_icon_size = size; - return g_object_ref(G_OBJECT(xfdesktop_fallback_icon)); + return GDK_PIXBUF(g_object_ref(G_OBJECT(xfdesktop_fallback_icon))); } GdkPixbuf * diff --git a/src/xfdesktop-volume-icon.c b/src/xfdesktop-volume-icon.c index ee54b21..41594d1 100644 --- a/src/xfdesktop-volume-icon.c +++ b/src/xfdesktop-volume-icon.c @@ -1077,7 +1077,7 @@ xfdesktop_volume_icon_new(GVolume *volume, g_return_val_if_fail(G_IS_VOLUME(volume), NULL); volume_icon = g_object_new(XFDESKTOP_TYPE_VOLUME_ICON, NULL); - volume_icon->priv->volume = g_object_ref(G_OBJECT(volume)); + volume_icon->priv->volume = G_VOLUME(g_object_ref(G_OBJECT(volume))); volume_icon->priv->gscreen = screen; mount = g_volume_get_mount(volume); -- To stop receiving notification emails like this one, please contact the administrator of this repository. _______________________________________________ Xfce4-commits mailing list [email protected] https://mail.xfce.org/mailman/listinfo/xfce4-commits
