[Xfce4-commits] [xfce/xfdesktop] 21/34: gdk_screen_make_display_name is deprecated
noreply at xfce.org
noreply at xfce.org
Sun Apr 16 07:06:55 CEST 2017
This is an automated email from the git hooks/post-receive script.
eric pushed a commit to branch master
in repository xfce/xfdesktop.
commit db9feb42ead981546b004c07624e95a5d9d813d1
Author: Eric Koegel <eric.koegel at gmail.com>
Date: Sat Mar 4 13:01:40 2017 +0300
gdk_screen_make_display_name is deprecated
There's no replacement so we'll just drop the calls to it.
---
src/xfdesktop-file-utils.c | 60 +++++++++++++---------------------------------
1 file changed, 17 insertions(+), 43 deletions(-)
diff --git a/src/xfdesktop-file-utils.c b/src/xfdesktop-file-utils.c
index 628e50a..573c336 100644
--- a/src/xfdesktop-file-utils.c
+++ b/src/xfdesktop-file-utils.c
@@ -708,13 +708,12 @@ xfdesktop_file_utils_rename_file(GFile *file,
fileman_proxy = xfdesktop_file_utils_peek_filemanager_proxy();
if(fileman_proxy) {
gchar *uri = g_file_get_uri(file);
- gchar *display_name = gdk_screen_make_display_name(screen);
gchar *startup_id = g_strdup_printf("_TIME%d", gtk_get_current_event_time());
xfdesktop_file_utils_set_window_cursor(parent, GDK_WATCH);
xfdesktop_file_manager_proxy_rename_file_async(fileman_proxy,
- uri, display_name, startup_id,
+ uri, NULL, startup_id,
(xfdesktop_file_manager_proxy_rename_file_reply)xfdesktop_file_utils_async_cb,
parent);
@@ -722,7 +721,6 @@ xfdesktop_file_utils_rename_file(GFile *file,
g_free(startup_id);
g_free(uri);
- g_free(display_name);
} else {
xfce_message_dialog(parent,
_("Rename Error"), "dialog-error",
@@ -753,7 +751,6 @@ xfdesktop_file_utils_bulk_rename(GFile *working_directory,
gchar *directory = g_file_get_path(working_directory);
guint nfiles = g_list_length(files);
gchar **filenames = g_new0(gchar *, nfiles+1);
- gchar *display_name = gdk_screen_make_display_name(screen);
gchar *startup_id = g_strdup_printf("_TIME%d", gtk_get_current_event_time());
GList *lp;
gint n;
@@ -767,7 +764,7 @@ xfdesktop_file_utils_bulk_rename(GFile *working_directory,
xfdesktop_thunar_proxy_bulk_rename_async(thunar_proxy,
directory, (const gchar **)filenames,
- FALSE, display_name, startup_id,
+ FALSE, NULL, startup_id,
(xfdesktop_thunar_proxy_bulk_rename_reply)xfdesktop_file_utils_async_cb,
parent);
@@ -776,7 +773,6 @@ xfdesktop_file_utils_bulk_rename(GFile *working_directory,
g_free(directory);
g_free(startup_id);
g_strfreev(filenames);
- g_free(display_name);
} else {
xfce_message_dialog(parent,
_("Rename Error"), "dialog-error",
@@ -805,7 +801,6 @@ xfdesktop_file_utils_unlink_files(GList *files,
if(fileman_proxy) {
guint nfiles = g_list_length(files);
gchar **uris = g_new0(gchar *, nfiles+1);
- gchar *display_name = gdk_screen_make_display_name(screen);
gchar *startup_id = g_strdup_printf("_TIME%d", gtk_get_current_event_time());
GList *lp;
gint n;
@@ -819,7 +814,7 @@ xfdesktop_file_utils_unlink_files(GList *files,
xfdesktop_file_manager_proxy_unlink_files_async(fileman_proxy,
NULL, (const gchar **)uris,
- display_name, startup_id,
+ NULL, startup_id,
(xfdesktop_file_manager_proxy_unlink_files_reply)xfdesktop_file_utils_async_cb,
parent);
@@ -827,7 +822,6 @@ xfdesktop_file_utils_unlink_files(GList *files,
g_free(startup_id);
g_strfreev(uris);
- g_free(display_name);
} else {
xfce_message_dialog(parent,
_("Delete Error"), "dialog-error",
@@ -856,7 +850,6 @@ xfdesktop_file_utils_trash_files(GList *files,
if(trash_proxy) {
guint nfiles = g_list_length(files);
gchar **uris = g_new0(gchar *, nfiles+1);
- gchar *display_name = gdk_screen_make_display_name(screen);
gchar *startup_id = g_strdup_printf("_TIME%d", gtk_get_current_event_time());
GList *lp;
gint n;
@@ -870,7 +863,7 @@ xfdesktop_file_utils_trash_files(GList *files,
xfdesktop_trash_proxy_move_to_trash_async(trash_proxy,
(const gchar **)uris,
- display_name, startup_id,
+ NULL, startup_id,
(xfdesktop_trash_proxy_move_to_trash_reply)xfdesktop_file_utils_async_cb,
parent);
@@ -878,7 +871,6 @@ xfdesktop_file_utils_trash_files(GList *files,
g_free(startup_id);
g_strfreev(uris);
- g_free(display_name);
} else {
xfce_message_dialog(parent,
_("Trash Error"), "dialog-error",
@@ -903,20 +895,18 @@ xfdesktop_file_utils_empty_trash(GdkScreen *screen,
trash_proxy = xfdesktop_file_utils_peek_trash_proxy();
if(trash_proxy) {
- gchar *display_name = gdk_screen_make_display_name(screen);
gchar *startup_id = g_strdup_printf("_TIME%d", gtk_get_current_event_time());
xfdesktop_file_utils_set_window_cursor(parent, GDK_WATCH);
xfdesktop_trash_proxy_empty_trash_async(trash_proxy,
- display_name, startup_id,
+ NULL, startup_id,
(xfdesktop_trash_proxy_empty_trash_reply)xfdesktop_file_utils_async_cb,
parent);
xfdesktop_file_utils_set_window_cursor(parent, GDK_LEFT_PTR);
g_free(startup_id);
- g_free(display_name);
} else {
xfce_message_dialog(parent,
_("Trash Error"), "dialog-error",
@@ -945,14 +935,13 @@ xfdesktop_file_utils_create_file(GFile *parent_folder,
fileman_proxy = xfdesktop_file_utils_peek_filemanager_proxy();
if(fileman_proxy) {
gchar *parent_directory = g_file_get_uri(parent_folder);
- gchar *display_name = gdk_screen_make_display_name(screen);
gchar *startup_id = g_strdup_printf("_TIME%d", gtk_get_current_event_time());
xfdesktop_file_utils_set_window_cursor(parent, GDK_WATCH);
xfdesktop_file_manager_proxy_create_file_async(fileman_proxy,
parent_directory,
- content_type, display_name,
+ content_type, NULL,
startup_id,
(xfdesktop_file_manager_proxy_create_file_reply)xfdesktop_file_utils_async_cb,
parent);
@@ -961,7 +950,6 @@ xfdesktop_file_utils_create_file(GFile *parent_folder,
g_free(startup_id);
g_free(parent_directory);
- g_free(display_name);
} else {
xfce_message_dialog(parent,
_("Create File Error"), "dialog-error",
@@ -992,7 +980,6 @@ xfdesktop_file_utils_create_file_from_template(GFile *parent_folder,
if(fileman_proxy) {
gchar *parent_directory = g_file_get_uri(parent_folder);
gchar *template_uri = g_file_get_uri(template_file);
- gchar *display_name = gdk_screen_make_display_name(screen);
gchar *startup_id = g_strdup_printf("_TIME%d", gtk_get_current_event_time());
xfdesktop_file_utils_set_window_cursor(parent, GDK_WATCH);
@@ -1000,7 +987,7 @@ xfdesktop_file_utils_create_file_from_template(GFile *parent_folder,
xfdesktop_file_manager_proxy_create_file_from_template_async(fileman_proxy,
parent_directory,
template_uri,
- display_name,
+ NULL,
startup_id,
(xfdesktop_file_manager_proxy_create_file_from_template_reply)xfdesktop_file_utils_async_cb,
parent);
@@ -1009,7 +996,6 @@ xfdesktop_file_utils_create_file_from_template(GFile *parent_folder,
g_free(startup_id);
g_free(parent_directory);
- g_free(display_name);
} else {
xfce_message_dialog(parent,
_("Create Document Error"), "dialog-error",
@@ -1037,13 +1023,12 @@ xfdesktop_file_utils_show_properties_dialog(GFile *file,
fileman_proxy = xfdesktop_file_utils_peek_filemanager_proxy();
if(fileman_proxy) {
gchar *uri = g_file_get_uri(file);
- gchar *display_name = gdk_screen_make_display_name(screen);
gchar *startup_id = g_strdup_printf("_TIME%d", gtk_get_current_event_time());
xfdesktop_file_utils_set_window_cursor(parent, GDK_WATCH);
xfdesktop_file_manager_proxy_display_file_properties_async(fileman_proxy,
- uri, display_name, startup_id,
+ uri, NULL, startup_id,
(xfdesktop_file_manager_proxy_display_file_properties_reply)xfdesktop_file_utils_async_cb,
parent);
@@ -1051,7 +1036,6 @@ xfdesktop_file_utils_show_properties_dialog(GFile *file,
g_free(startup_id);
g_free(uri);
- g_free(display_name);
} else {
xfce_message_dialog(parent,
_("File Properties Error"), "dialog-error",
@@ -1079,13 +1063,12 @@ xfdesktop_file_utils_launch(GFile *file,
fileman_proxy = xfdesktop_file_utils_peek_filemanager_proxy();
if(fileman_proxy) {
gchar *uri = g_file_get_uri(file);
- gchar *display_name = gdk_screen_make_display_name(screen);
gchar *startup_id = g_strdup_printf("_TIME%d", gtk_get_current_event_time());
xfdesktop_file_utils_set_window_cursor(parent, GDK_WATCH);
xfdesktop_file_manager_proxy_launch_async(fileman_proxy,
- uri, display_name, startup_id,
+ uri, NULL, startup_id,
(xfdesktop_file_manager_proxy_launch_reply)xfdesktop_file_utils_async_cb,
parent);
@@ -1093,7 +1076,6 @@ xfdesktop_file_utils_launch(GFile *file,
g_free(startup_id);
g_free(uri);
- g_free(display_name);
} else {
xfce_message_dialog(parent,
_("Launch Error"), "dialog-error",
@@ -1128,7 +1110,6 @@ xfdesktop_file_utils_execute(GFile *working_directory,
GError *error = NULL;
gchar *working_dir = working_directory != NULL ? g_file_get_uri(working_directory) : NULL;
gchar *uri = g_file_get_uri(file);
- gchar *display_name = gdk_screen_make_display_name(screen);
gchar *startup_id = g_strdup_printf("_TIME%d", gtk_get_current_event_time());
GList *lp;
guint n = g_list_length (files);
@@ -1166,7 +1147,7 @@ xfdesktop_file_utils_execute(GFile *working_directory,
if(!xfdesktop_file_manager_proxy_execute(fileman_proxy,
working_dir, uri,
(const gchar **)uris,
- display_name, startup_id,
+ NULL, startup_id,
&error))
{
gchar *filename = g_file_get_uri(file);
@@ -1188,7 +1169,6 @@ xfdesktop_file_utils_execute(GFile *working_directory,
}
g_free(startup_id);
- g_free(display_name);
g_strfreev(uris);
g_free(uri);
g_free(working_dir);
@@ -1232,14 +1212,13 @@ xfdesktop_file_utils_display_chooser_dialog(GFile *file,
fileman_proxy = xfdesktop_file_utils_peek_filemanager_proxy();
if(fileman_proxy) {
gchar *uri = g_file_get_uri(file);
- gchar *display_name = gdk_screen_make_display_name(screen);
gchar *startup_id = g_strdup_printf("_TIME%d", gtk_get_current_event_time());
xfdesktop_file_utils_set_window_cursor(parent, GDK_WATCH);
xfdesktop_file_manager_proxy_display_chooser_dialog_async(fileman_proxy,
uri, open,
- display_name,
+ NULL,
startup_id,
(xfdesktop_file_manager_proxy_display_chooser_dialog_reply)xfdesktop_file_utils_async_cb,
parent);
@@ -1248,7 +1227,6 @@ xfdesktop_file_utils_display_chooser_dialog(GFile *file,
g_free(startup_id);
g_free(uri);
- g_free(display_name);
} else {
xfce_message_dialog(parent,
_("Launch Error"), "dialog-error",
@@ -1280,7 +1258,6 @@ xfdesktop_file_utils_transfer_file(GdkDragAction action,
GError *error = NULL;
gchar *source_uris[2] = { g_file_get_uri(source_file), NULL };
gchar *target_uris[2] = { g_file_get_uri(target_file), NULL };
- gchar *display_name = gdk_screen_make_display_name(screen);
gchar *startup_id = g_strdup_printf("_TIME%d", gtk_get_current_event_time());
switch(action) {
@@ -1288,21 +1265,21 @@ xfdesktop_file_utils_transfer_file(GdkDragAction action,
xfdesktop_file_manager_proxy_move_into(fileman_proxy, NULL,
(const gchar **)source_uris,
(const gchar *)target_uris[0],
- display_name, startup_id,
+ NULL, startup_id,
&error);
break;
case GDK_ACTION_COPY:
xfdesktop_file_manager_proxy_copy_to(fileman_proxy, NULL,
(const gchar **)source_uris,
(const gchar **)target_uris,
- display_name, startup_id,
+ NULL, startup_id,
&error);
break;
case GDK_ACTION_LINK:
xfdesktop_file_manager_proxy_link_into(fileman_proxy, NULL,
(const gchar **)source_uris,
(const gchar *)target_uris[0],
- display_name, startup_id,
+ NULL, startup_id,
&error);
break;
default:
@@ -1321,7 +1298,6 @@ xfdesktop_file_utils_transfer_file(GdkDragAction action,
}
g_free(startup_id);
- g_free(display_name);
g_free(target_uris[0]);
g_free(source_uris[0]);
} else {
@@ -1356,7 +1332,6 @@ xfdesktop_file_utils_transfer_files(GdkDragAction action,
GError *error = NULL;
gchar **source_uris = xfdesktop_file_utils_file_list_to_uri_array(source_files);
gchar **target_uris = xfdesktop_file_utils_file_list_to_uri_array(target_files);
- gchar *display_name = gdk_screen_make_display_name(screen);
gchar *startup_id = g_strdup_printf("_TIME%d", gtk_get_current_event_time());
switch(action) {
@@ -1364,21 +1339,21 @@ xfdesktop_file_utils_transfer_files(GdkDragAction action,
xfdesktop_file_manager_proxy_move_into(fileman_proxy, NULL,
(const gchar **)source_uris,
(const gchar *)target_uris[0],
- display_name, startup_id,
+ NULL, startup_id,
&error);
break;
case GDK_ACTION_COPY:
xfdesktop_file_manager_proxy_copy_to(fileman_proxy, NULL,
(const gchar **)source_uris,
(const gchar **)target_uris,
- display_name, startup_id,
+ NULL, startup_id,
&error);
break;
case GDK_ACTION_LINK:
xfdesktop_file_manager_proxy_link_into(fileman_proxy, NULL,
(const gchar **)source_uris,
(const gchar *)target_uris[0],
- display_name, startup_id,
+ NULL, startup_id,
&error);
break;
default:
@@ -1401,7 +1376,6 @@ xfdesktop_file_utils_transfer_files(GdkDragAction action,
}
g_free(startup_id);
- g_free(display_name);
g_free(target_uris[0]);
g_free(source_uris[0]);
} else {
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the Xfce4-commits
mailing list