From 347e1f170005496ce1bf3e672f46419dca6b558e Mon Sep 17 00:00:00 2001 From: Pablo Barciela Date: Fri, 1 Jun 2018 15:17:43 +0200 Subject: avoid deprecated 'gtk_window_set_wmclass' --- libcaja-private/caja-file-operations.c | 2 -- libcaja-private/caja-progress-info.c | 4 ++-- src/caja-bookmarks-window.c | 1 - src/caja-desktop-window.c | 3 --- src/caja-property-browser.c | 2 +- src/file-manager/fm-properties-window.c | 1 - 6 files changed, 3 insertions(+), 10 deletions(-) diff --git a/libcaja-private/caja-file-operations.c b/libcaja-private/caja-file-operations.c index fd9fe9cb..41e4f129 100644 --- a/libcaja-private/caja-file-operations.c +++ b/libcaja-private/caja-file-operations.c @@ -2339,8 +2339,6 @@ prompt_empty_trash (GtkWindow *parent_window) gtk_window_set_screen (GTK_WINDOW (dialog), screen); } atk_object_set_role (gtk_widget_get_accessible (dialog), ATK_ROLE_ALERT); - gtk_window_set_wmclass (GTK_WINDOW (dialog), "empty_trash", - "Caja"); /* Make transient for the window group */ gtk_widget_realize (dialog); diff --git a/libcaja-private/caja-progress-info.c b/libcaja-private/caja-progress-info.c index d4d31ebe..739c692b 100644 --- a/libcaja-private/caja-progress-info.c +++ b/libcaja-private/caja-progress-info.c @@ -239,10 +239,10 @@ get_progress_window () gtk_window_set_title (GTK_WINDOW (progress_window), _("File Operations")); - gtk_window_set_wmclass (GTK_WINDOW (progress_window), - "file_progress", "Caja"); + gtk_window_set_position (GTK_WINDOW (progress_window), GTK_WIN_POS_CENTER); + gtk_window_set_icon_name (GTK_WINDOW (progress_window), "system-file-manager"); diff --git a/src/caja-bookmarks-window.c b/src/caja-bookmarks-window.c index e94ce944..b5ac38b8 100644 --- a/src/caja-bookmarks-window.c +++ b/src/caja-bookmarks-window.c @@ -286,7 +286,6 @@ create_bookmarks_window (CajaBookmarkList *list, CajaWindow *window_source) set_up_close_accelerator (window); - gtk_window_set_wmclass (GTK_WINDOW (window), "bookmarks", "Caja"); caja_bookmarks_window_restore_geometry (window); g_object_weak_ref (G_OBJECT (window_source), edit_bookmarks_dialog_reset_signals, diff --git a/src/caja-desktop-window.c b/src/caja-desktop-window.c index 16242dcd..edba0e33 100644 --- a/src/caja-desktop-window.c +++ b/src/caja-desktop-window.c @@ -152,9 +152,6 @@ caja_desktop_window_new (CajaApplication *application, /* will cause the desktop window to open at the wrong size in gtk 3.20 */ gtk_window_set_default_size (GTK_WINDOW (window), -1, -1); - /* Special sawmill setting*/ - gtk_window_set_wmclass (GTK_WINDOW (window), "desktop_window", "Caja"); - g_signal_connect (window, "delete_event", G_CALLBACK (caja_desktop_window_delete_event), NULL); /* Point window at the desktop folder. diff --git a/src/caja-property-browser.c b/src/caja-property-browser.c index 2e80fee8..c674a450 100644 --- a/src/caja-property-browser.c +++ b/src/caja-property-browser.c @@ -292,7 +292,7 @@ caja_property_browser_init (CajaPropertyBrowser *property_browser) /* set the title and standard close accelerator */ gtk_window_set_title (GTK_WINDOW (widget), _("Backgrounds and Emblems")); - gtk_window_set_wmclass (GTK_WINDOW (widget), "property_browser", "Caja"); + gtk_window_set_type_hint (GTK_WINDOW (widget), GDK_WINDOW_TYPE_HINT_DIALOG); GtkStyleContext *context; diff --git a/src/file-manager/fm-properties-window.c b/src/file-manager/fm-properties-window.c index d5f7b4eb..885d9f56 100644 --- a/src/file-manager/fm-properties-window.c +++ b/src/file-manager/fm-properties-window.c @@ -5087,7 +5087,6 @@ create_properties_window (StartupData *startup_data) window->details->target_files = caja_file_list_copy (startup_data->target_files); - gtk_window_set_wmclass (GTK_WINDOW (window), "file_properties", "Caja"); gtk_window_set_screen (GTK_WINDOW (window), gtk_widget_get_screen (startup_data->parent_widget)); -- cgit v1.2.1