Skip to content

Commit ff244dd

Browse files
committed
Remove deprecated/removed zenity arguments.
Zenity is used by the default force-quit, display-changes and session-save dialogs. Cinnamon implements the first two, and the last we don't support at this time, so this change won't have much impact. Fixes #666. \m/
1 parent 3d080ac commit ff244dd

File tree

5 files changed

+2
-15
lines changed

5 files changed

+2
-15
lines changed

src/compositor/plugins/default.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -910,7 +910,6 @@ confirm_display_change (MetaPlugin *plugin)
910910
NULL,
911911
"_Keep This Configuration",
912912
"_Restore Previous Configuration",
913-
"preferences-desktop-display",
914913
0,
915914
NULL, NULL);
916915

src/core/meta-close-dialog-default.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ meta_close_dialog_default_show (MetaCloseDialog *dialog)
163163
window_content, NULL,
164164
window->display->x11_display->screen_name,
165165
_("_Force Quit"), _("_Wait"),
166-
"face-sad-symbolic", window->xwindow,
166+
window->xwindow,
167167
NULL, NULL);
168168

169169
g_free (window_content);

src/core/util.c

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -594,13 +594,11 @@ append_argument (GPtrArray *args,
594594

595595
/**
596596
* meta_show_dialog: (skip)
597-
* @type: type of dialog
598597
* @message: message
599598
* @timeout: timeout
600599
* @display: display
601600
* @ok_text: text for Ok button
602601
* @cancel_text: text for Cancel button
603-
* @icon_name: icon name
604602
* @transient_for: window XID of parent
605603
* @columns: columns
606604
* @entries: entries
@@ -613,7 +611,6 @@ meta_show_dialog (const char *type,
613611
const char *display,
614612
const char *ok_text,
615613
const char *cancel_text,
616-
const char *icon_name,
617614
const int transient_for,
618615
GSList *columns,
619616
GSList *entries)
@@ -634,8 +631,6 @@ meta_show_dialog (const char *type,
634631
append_argument (args, display);
635632
}
636633

637-
append_argument (args, "--class");
638-
append_argument (args, "mutter-dialog");
639634
append_argument (args, "--title");
640635
append_argument (args, "");
641636
append_argument (args, "--text");
@@ -659,12 +654,6 @@ meta_show_dialog (const char *type,
659654
append_argument (args, cancel_text);
660655
}
661656

662-
if (icon_name)
663-
{
664-
append_argument (args, "--icon-name");
665-
append_argument (args, icon_name);
666-
}
667-
668657
tmp = columns;
669658
while (tmp)
670659
{

src/meta/util.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,6 @@ GPid meta_show_dialog (const char *type,
157157
const char *display,
158158
const char *ok_text,
159159
const char *cancel_text,
160-
const char *icon_name,
161160
const int transient_for,
162161
GSList *columns,
163162
GSList *entries);

src/x11/session.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1823,7 +1823,7 @@ warn_about_lame_clients_and_finish_interact (gboolean shutdown)
18231823
"you log in."),
18241824
"240",
18251825
meta_get_display()->x11_display->screen_name,
1826-
NULL, NULL, NULL,
1826+
NULL, NULL,
18271827
None,
18281828
columns,
18291829
lame_details);

0 commit comments

Comments
 (0)