summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormonsta <[email protected]>2016-11-21 21:17:55 +0300
committermonsta <[email protected]>2016-11-21 21:19:28 +0300
commitb06a89bf26788cbcbcd12757cf9f59226f16b7dc (patch)
tree10d022222f25f1c4ed0bbf79918e344c6af47ba1
parentd0ddaedffa7d417a699cafce73c1e418515c4a28 (diff)
downloadmate-panel-b06a89bf26788cbcbcd12757cf9f59226f16b7dc.tar.bz2
mate-panel-b06a89bf26788cbcbcd12757cf9f59226f16b7dc.tar.xz
rename .ui file of panel properties dialog to the original name
no need to mention GTK+3 anymore
-rw-r--r--mate-panel/Makefile.am2
-rw-r--r--mate-panel/panel-properties-dialog.c4
-rw-r--r--mate-panel/panel-properties-dialog.ui (renamed from mate-panel/panel-properties-dialog-gtk3.ui)0
-rw-r--r--po/POTFILES.in2
4 files changed, 4 insertions, 4 deletions
diff --git a/mate-panel/Makefile.am b/mate-panel/Makefile.am
index ec94421f..a7ea3944 100644
--- a/mate-panel/Makefile.am
+++ b/mate-panel/Makefile.am
@@ -224,7 +224,7 @@ BUILT_SOURCES = \
uidir = $(datadir)/mate-panel/ui
ui_DATA = \
- panel-properties-dialog-gtk3.ui \
+ panel-properties-dialog.ui \
panel-run-dialog.ui \
panel-test-applets.ui
diff --git a/mate-panel/panel-properties-dialog.c b/mate-panel/panel-properties-dialog.c
index d2c5c8d0..ef538187 100644
--- a/mate-panel/panel-properties-dialog.c
+++ b/mate-panel/panel-properties-dialog.c
@@ -938,14 +938,14 @@ panel_properties_dialog_present (PanelToplevel *toplevel)
error = NULL;
gtk_builder_add_from_file (gui,
- BUILDERDIR "/panel-properties-dialog-gtk3.ui",
+ BUILDERDIR "/panel-properties-dialog.ui",
&error);
if (error) {
char *secondary;
secondary = g_strdup_printf (_("Unable to load file '%s': %s."),
- BUILDERDIR"/panel-properties-dialog-gtk3.ui",
+ BUILDERDIR"/panel-properties-dialog.ui",
error->message);
panel_error_dialog (GTK_WINDOW (toplevel),
gtk_window_get_screen (GTK_WINDOW (toplevel)),
diff --git a/mate-panel/panel-properties-dialog-gtk3.ui b/mate-panel/panel-properties-dialog.ui
index 46cd00c3..46cd00c3 100644
--- a/mate-panel/panel-properties-dialog-gtk3.ui
+++ b/mate-panel/panel-properties-dialog.ui
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 2461cf89..dc79a790 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -58,7 +58,7 @@ mate-panel/panel-menu-button.c
mate-panel/panel-menu-items.c
mate-panel/panel-profile.c
mate-panel/panel-properties-dialog.c
-[type: gettext/glade]mate-panel/panel-properties-dialog-gtk3.ui
+[type: gettext/glade]mate-panel/panel-properties-dialog.ui
mate-panel/panel-recent.c
mate-panel/panel-run-dialog.c
[type: gettext/glade]mate-panel/panel-run-dialog.ui