diff options
26 files changed, 119 insertions, 145 deletions
diff --git a/capplets/accessibility/at-properties/Makefile.am b/capplets/accessibility/at-properties/Makefile.am index 62b1ed5a..ea710733 100644 --- a/capplets/accessibility/at-properties/Makefile.am +++ b/capplets/accessibility/at-properties/Makefile.am @@ -27,8 +27,7 @@ include $(top_srcdir)/gla11y.mk AM_CPPFLAGS = $(AT_CAPPLET_CFLAGS) \ $(MATECC_CAPPLETS_CFLAGS) \ -DPIXMAPDIR=\""$(pixmapdir)"\" \ - -DMATECC_DATA_DIR="\"$(pkgdatadir)\"" \ - -DMATELOCALEDIR="\"$(datadir)/locale\"" + -DMATECC_DATA_DIR="\"$(pkgdatadir)\"" CLEANFILES = $(MATECC_CAPPLETS_CLEANFILES) $(desktop_DATA) $(BUILT_SOURCES) $(GLA11Y_OUTPUT) EXTRA_DIST = \ $(ui_files) \ diff --git a/capplets/appearance/Makefile.am b/capplets/appearance/Makefile.am index 7ae3edd1..5e62573a 100644 --- a/capplets/appearance/Makefile.am +++ b/capplets/appearance/Makefile.am @@ -54,7 +54,6 @@ AM_CPPFLAGS = \ $(MARCO_CFLAGS) \ $(MATECC_CAPPLETS_CFLAGS) \ $(FONT_CAPPLET_CFLAGS) \ - -DMATELOCALEDIR="\"$(datadir)/locale\"" \ -DMATECC_DATA_DIR="\"$(pkgdatadir)\"" \ -DMATECC_PIXMAP_DIR="\"$(pixmapdir)\"" \ -DWALLPAPER_DATADIR="\"$(wallpaperdir)\"" diff --git a/capplets/default-applications/Makefile.am b/capplets/default-applications/Makefile.am index 4adbc4fc..efeb778e 100644 --- a/capplets/default-applications/Makefile.am +++ b/capplets/default-applications/Makefile.am @@ -31,8 +31,7 @@ pkgconfig_DATA = mate-default-applications.pc AM_CPPFLAGS = \ $(MATECC_CAPPLETS_CFLAGS) \ $(DEFAULT_APPLICATIONS_CAPPLET_CFLAGS) \ - -DAPPLICATIONSDIR=\""$(datadir)/applications"\"\ - -DMATELOCALEDIR=\""$(datadir)/locale"\" + -DAPPLICATIONSDIR=\""$(datadir)/applications"\" mate-default-applications-properties-resources.h mate-default-applications-properties-resources.c: org.mate.mcc.da.gresource.xml Makefile $(shell $(GLIB_COMPILE_RESOURCES) --generate-dependencies --sourcedir $(srcdir) $(srcdir)/org.mate.mcc.da.gresource.xml) $(AM_V_GEN) XMLLINT=$(XMLLINT) $(GLIB_COMPILE_RESOURCES) --target $@ --sourcedir $(srcdir) --generate --c-name default_applications $< diff --git a/capplets/display/xrandr-capplet.c b/capplets/display/xrandr-capplet.c index 3dddb784..42b6b9b4 100644 --- a/capplets/display/xrandr-capplet.c +++ b/capplets/display/xrandr-capplet.c @@ -36,6 +36,8 @@ #include <glib/gi18n.h> #include <gio/gio.h> +#include "capplet-util.h" + typedef struct App App; typedef struct GrabInfo GrabInfo; @@ -2554,11 +2556,7 @@ main (int argc, char **argv) { App *app; - bindtextdomain (GETTEXT_PACKAGE, MATELOCALEDIR); - bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); - textdomain (GETTEXT_PACKAGE); - - gtk_init (&argc, &argv); + capplet_init (NULL, &argc, &argv); app = g_new0 (App, 1); diff --git a/capplets/keybindings/Makefile.am b/capplets/keybindings/Makefile.am index 2b86f75f..48d8435b 100644 --- a/capplets/keybindings/Makefile.am +++ b/capplets/keybindings/Makefile.am @@ -38,7 +38,6 @@ mate-keybinding-properties-resources.h mate-keybinding-properties-resources.c: o AM_CPPFLAGS = \ $(MATECC_CAPPLETS_CFLAGS) \ - -DMATELOCALEDIR="\"$(datadir)/locale\"" \ -DMATECC_DATA_DIR="\"$(pkgdatadir)\"" CLEANFILES = \ $(BUILT_SOURCES) \ diff --git a/capplets/keybindings/mate-keybinding-properties.c b/capplets/keybindings/mate-keybinding-properties.c index 9504af77..6b480ef5 100644 --- a/capplets/keybindings/mate-keybinding-properties.c +++ b/capplets/keybindings/mate-keybinding-properties.c @@ -1978,13 +1978,7 @@ main (int argc, char *argv[]) GtkBuilder *builder; GSettings *marco_settings; - gtk_init (&argc, &argv); - - bindtextdomain (GETTEXT_PACKAGE, MATELOCALEDIR); - bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); - textdomain (GETTEXT_PACKAGE); - - gtk_init (&argc, &argv); + capplet_init (NULL, &argc, &argv); activate_settings_daemon (); diff --git a/capplets/keyboard/Makefile.am b/capplets/keyboard/Makefile.am index a46996d8..7a9858ad 100644 --- a/capplets/keyboard/Makefile.am +++ b/capplets/keyboard/Makefile.am @@ -41,7 +41,6 @@ mate-keyboard-properties-resources.h mate-keyboard-properties-resources.c: org.m AM_CPPFLAGS = \ $(MATECC_CAPPLETS_CFLAGS) \ $(LIBMATEKBDUI_CFLAGS) \ - -DMATELOCALEDIR="\"$(datadir)/locale\"" \ -DMATECC_DATA_DIR="\"$(pkgdatadir)\"" CLEANFILES = $(MATECC_CAPPLETS_CLEANFILES) $(desktop_DATA) $(BUILT_SOURCES) EXTRA_DIST = \ diff --git a/capplets/mouse/Makefile.am b/capplets/mouse/Makefile.am index 3a306933..7a3bb4b1 100644 --- a/capplets/mouse/Makefile.am +++ b/capplets/mouse/Makefile.am @@ -27,7 +27,6 @@ mate-mouse-properties-resources.h mate-mouse-properties-resources.c: org.mate.mc AM_CPPFLAGS = \ $(MATECC_CAPPLETS_CFLAGS) \ - -DMATELOCALEDIR="\"$(datadir)/locale\"" \ -DMATECC_DATA_DIR="\"$(pkgdatadir)\"" CLEANFILES = $(MATECC_CAPPLETS_CLEANFILES) $(desktop_DATA) $(BUILT_SOURCES) $(GLA11Y_OUTPUT) EXTRA_DIST = \ diff --git a/capplets/network/Makefile.am b/capplets/network/Makefile.am index 65b7c6ec..17616ece 100644 --- a/capplets/network/Makefile.am +++ b/capplets/network/Makefile.am @@ -23,8 +23,7 @@ mate-network-properties-resources.h mate-network-properties-resources.c: org.mat $(AM_V_GEN) XMLLINT=$(XMLLINT) $(GLIB_COMPILE_RESOURCES) --target $@ --sourcedir $(srcdir) --generate --c-name network $< AM_CPPFLAGS = \ - $(MATECC_CAPPLETS_CFLAGS) \ - -DMATELOCALEDIR="\"$(datadir)/locale\"" + $(MATECC_CAPPLETS_CFLAGS) CLEANFILES = $(MATECC_CAPPLETS_CLEANFILES) $(desktop_DATA) $(BUILT_SOURCES) $(GLA11Y_OUTPUT) EXTRA_DIST = $(ui_files) $(desktop_in_files) org.mate.mcc.network.gresource.xml ui-a11y.suppr diff --git a/capplets/network/mate-network-properties.c b/capplets/network/mate-network-properties.c index c2243fb3..af17495b 100644 --- a/capplets/network/mate-network-properties.c +++ b/capplets/network/mate-network-properties.c @@ -459,11 +459,7 @@ main (int argc, char **argv) "delete_button_img", NULL}; GtkWidget *widget; - bindtextdomain (GETTEXT_PACKAGE, MATELOCALEDIR); - bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); - textdomain (GETTEXT_PACKAGE); - - gtk_init (&argc, &argv); + capplet_init (NULL, &argc, &argv); builder = gtk_builder_new (); if (gtk_builder_add_objects_from_resource (builder, "/org/mate/mcc/network/mate-network-properties.ui", diff --git a/capplets/time-admin/data/Makefile.am b/capplets/time-admin/data/Makefile.am index f7b82e08..c6d7f65b 100644 --- a/capplets/time-admin/data/Makefile.am +++ b/capplets/time-admin/data/Makefile.am @@ -23,27 +23,14 @@ map/timezone_12.75_dim.png map/timezone_-3.png map/timezone_-6_dim.png map/timezone_12.75.png map/timezone_3.png map/timezone_6_dim.png map/timezone_9.png \ map/timezone_12_dim.png map/timezone_-4.5_dim.png map/timezone_-6.png -icons16dir = $(datadir)/icons/hicolor/16x16/apps -dist_icons16_DATA = hicolor/16x16/apps/mate-times-admin.png -icons22dir = $(datadir)/icons/hicolor/22x22/apps -dist_icons22_DATA = hicolor/22x22/apps/mate-times-admin.png -icons24dir = $(datadir)/icons/hicolor/24x24/apps -dist_icons24_DATA = hicolor/24x24/apps/mate-times-admin.png -icons32dir = $(datadir)/icons/hicolor/32x32/apps -dist_icons32_DATA = hicolor/32x32/apps/mate-times-admin.png -icons48dir = $(datadir)/icons/hicolor/48x48/apps -dist_icons48_DATA = hicolor/48x48/apps/mate-times-admin.png - -icondir = $(datadir)/mate-time-admin/icon -dist_icon_DATA = icon/mate-times-admin.png - @INTLTOOL_DESKTOP_RULE@ desktopdir = $(datadir)/applications -desktop_in_files = mate-time-admin.desktop.in +desktop_in_files = mate-time-admin.desktop.in desktop_DATA = $(desktop_in_files:.desktop.in=.desktop) CLEANFILES = $(desktop_DATA) EXTRA_DIST = \ $(desktop_in_files) + -include $(top_srcdir)/git.mk diff --git a/capplets/time-admin/data/hicolor/16x16/apps/mate-times-admin.png b/capplets/time-admin/data/hicolor/16x16/apps/mate-times-admin.png Binary files differdeleted file mode 100644 index 66760fb4..00000000 --- a/capplets/time-admin/data/hicolor/16x16/apps/mate-times-admin.png +++ /dev/null diff --git a/capplets/time-admin/data/hicolor/22x22/apps/mate-times-admin.png b/capplets/time-admin/data/hicolor/22x22/apps/mate-times-admin.png Binary files differdeleted file mode 100644 index a661b627..00000000 --- a/capplets/time-admin/data/hicolor/22x22/apps/mate-times-admin.png +++ /dev/null diff --git a/capplets/time-admin/data/hicolor/24x24/apps/mate-times-admin.png b/capplets/time-admin/data/hicolor/24x24/apps/mate-times-admin.png Binary files differdeleted file mode 100644 index 474eb03f..00000000 --- a/capplets/time-admin/data/hicolor/24x24/apps/mate-times-admin.png +++ /dev/null diff --git a/capplets/time-admin/data/hicolor/32x32/apps/mate-times-admin.png b/capplets/time-admin/data/hicolor/32x32/apps/mate-times-admin.png Binary files differdeleted file mode 100644 index dd8b8a43..00000000 --- a/capplets/time-admin/data/hicolor/32x32/apps/mate-times-admin.png +++ /dev/null diff --git a/capplets/time-admin/data/hicolor/48x48/apps/mate-times-admin.png b/capplets/time-admin/data/hicolor/48x48/apps/mate-times-admin.png Binary files differdeleted file mode 100644 index 1f304624..00000000 --- a/capplets/time-admin/data/hicolor/48x48/apps/mate-times-admin.png +++ /dev/null diff --git a/capplets/time-admin/data/icon/mate-times-admin.png b/capplets/time-admin/data/icon/mate-times-admin.png Binary files differdeleted file mode 100644 index cf6d4e2f..00000000 --- a/capplets/time-admin/data/icon/mate-times-admin.png +++ /dev/null diff --git a/capplets/time-admin/data/mate-time-admin.desktop.in b/capplets/time-admin/data/mate-time-admin.desktop.in index 0bc57bb3..5f8de5a6 100644 --- a/capplets/time-admin/data/mate-time-admin.desktop.in +++ b/capplets/time-admin/data/mate-time-admin.desktop.in @@ -4,7 +4,7 @@ _Comment=Setting the time and date of the local system Terminal=false Type=Application Exec=mate-time-admin -Icon=mate-times-admin +Icon=preferences-system-time StartupNotify=true Categories=GTK;Settings;HardwareSettings; Keywords=mate-control-center;MATE;clock;date;time;preferences; diff --git a/capplets/time-admin/src/Makefile.am b/capplets/time-admin/src/Makefile.am index 6f62b22c..59332519 100644 --- a/capplets/time-admin/src/Makefile.am +++ b/capplets/time-admin/src/Makefile.am @@ -11,12 +11,11 @@ mate_time_admin_LDFLAGS = -export-dynamic AM_CPPFLAGS = \ $(MATECC_CAPPLETS_CFLAGS) \ - -DDATADIR="\"$(datadir)/mate-time-admin/icon/\"" \ -DMATELOCALEDIR="\"$(datadir)/locale\""\ -DTIMPZONEDIR="\"$(datadir)/mate-time-admin/map/\"" -CLEANFILES = $(MATECC_CAPPLETS_CLEANFILES) +CLEANFILES = $(MATECC_CAPPLETS_CLEANFILES) EXTRA_DIST = time-zones.h diff --git a/capplets/time-admin/src/main.c b/capplets/time-admin/src/main.c index 8ae4986c..fb9e87a2 100644 --- a/capplets/time-admin/src/main.c +++ b/capplets/time-admin/src/main.c @@ -17,14 +17,13 @@ #include <glib/gi18n.h> #include <polkit/polkit.h> +#include "capplet-util.h" #include "time-tool.h" #include "time-zone.h" #include "time-map.h" #define LOCKFILE "/tmp/time-admin.pid" #define TIME_ADMIN_PERMISSION "org.freedesktop.timedate1.set-time" -#define APPICON "mate-times-admin.png" -#define ICONFILE DATADIR APPICON static gboolean CheckClockHealth(gpointer data) { @@ -53,20 +52,7 @@ static void ChangeTimeValue(GtkSpinButton *spin_button, update_apply_timeout(ta); } } -static GdkPixbuf * GetAppIcon(void) -{ - GdkPixbuf *Pixbuf; - GError *Error = NULL; - Pixbuf = gdk_pixbuf_new_from_file(ICONFILE,&Error); - if(!Pixbuf) - { - MessageReport(("Get Icon Fail"),Error->message,ERROR); - g_error_free(Error); - } - - return Pixbuf; -} static gboolean on_window_quit (GtkWidget *widget, GdkEvent *event, gpointer user_data) @@ -108,7 +94,6 @@ static void on_permission_changed (GPermission *permission, static void InitMainWindow(TimeAdmin *ta) { GtkWidget *Window; - GdkPixbuf *AppIcon; GError *error = NULL; Window = gtk_window_new(GTK_WINDOW_TOPLEVEL); @@ -124,14 +109,8 @@ static void InitMainWindow(TimeAdmin *ta) "delete-event", G_CALLBACK(on_window_quit), ta); - - AppIcon = GetAppIcon(); - if(AppIcon) - { - gtk_window_set_icon(GTK_WINDOW(Window),AppIcon); - g_object_unref(AppIcon); - } - ta->Permission = polkit_permission_new_sync (TIME_ADMIN_PERMISSION, + gtk_window_set_icon_name (GTK_WINDOW(Window), "preferences-system-time"); + ta->Permission = polkit_permission_new_sync (TIME_ADMIN_PERMISSION, NULL, NULL, &error); @@ -442,16 +421,12 @@ EXIT: g_error_free(error); return FALSE; } + int main(int argc, char **argv) { TimeAdmin ta; - setlocale (LC_ALL, ""); - bindtextdomain (GETTEXT_PACKAGE, MATELOCALEDIR); - bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); - textdomain (GETTEXT_PACKAGE); - - gtk_init(&argc, &argv); + capplet_init (NULL, &argc, &argv); /* Create the main window */ InitMainWindow(&ta); diff --git a/capplets/time-admin/src/time-map.c b/capplets/time-admin/src/time-map.c index ad38ef52..0f64a178 100644 --- a/capplets/time-admin/src/time-map.c +++ b/capplets/time-admin/src/time-map.c @@ -1,19 +1,28 @@ -/* time-admin -* Copyright (C) 2018 zhuyaliang https://github.com/zhuyaliang/ -* -* This program is free software: you can redistribute it and/or modify -* it under the terms of the GNU General Public License as published by -* the Free Software Foundation, either version 3 of the License, or -* (at your option) any later version. - -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General Public License for more details. - -* You should have received a copy of the GNU General Public License -* along with this program. If not, see <https://www.gnu.org/licenses/>. -*/ +/* + * Copyright (C) 2019 MATE Developers + * Copyright (C) 2018, 2019 zhuyaliang https://github.com/zhuyaliang/ + * Copyright (C) 2010-2018 The GNOME Project + * Copyright (C) 2010 Intel, Inc + * + * Portions from Ubiquity, Copyright (C) 2009 Canonical Ltd. + * Written by Evan Dandrea <[email protected]> + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <https://www.gnu.org/licenses/>. + * + * Author: Thomas Wood <[email protected]> + * + */ #ifdef HAVE_CONFIG_H #include "config.h" diff --git a/capplets/time-admin/src/time-map.h b/capplets/time-admin/src/time-map.h index 979dceaf..bfc73e3f 100644 --- a/capplets/time-admin/src/time-map.h +++ b/capplets/time-admin/src/time-map.h @@ -1,19 +1,28 @@ -/* time-admin -* Copyright (C) 2018 zhuyaliang https://github.com/zhuyaliang/ -* -* This program is free software: you can redistribute it and/or modify -* it under the terms of the GNU General Public License as published by -* the Free Software Foundation, either version 3 of the License, or -* (at your option) any later version. - -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General Public License for more details. - -* You should have received a copy of the GNU General Public License -* along with this program. If not, see <https://www.gnu.org/licenses/>. -*/ +/* + * Copyright (C) 2019 MATE Developers + * Copyright (C) 2018, 2019 zhuyaliang https://github.com/zhuyaliang/ + * Copyright (C) 2010-2018 The GNOME Project + * Copyright (C) 2010 Intel, Inc + * + * Portions from Ubiquity, Copyright (C) 2009 Canonical Ltd. + * Written by Evan Dandrea <[email protected]> + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <https://www.gnu.org/licenses/>. + * + * Author: Thomas Wood <[email protected]> + * + */ #ifndef __TIME_MAP_H__ #define __TIME_MAP_H__ diff --git a/capplets/time-admin/src/time-zone.c b/capplets/time-admin/src/time-zone.c index b9bc4955..7cb90e62 100644 --- a/capplets/time-admin/src/time-zone.c +++ b/capplets/time-admin/src/time-zone.c @@ -1,19 +1,28 @@ -/* time-admin -* Copyright (C) 2018 zhuyaliang https://github.com/zhuyaliang/ -* -* This program is free software: you can redistribute it and/or modify -* it under the terms of the GNU General Public License as published by -* the Free Software Foundation, either version 3 of the License, or -* (at your option) any later version. - -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General Public License for more details. - -* You should have received a copy of the GNU General Public License -* along with this program. If not, see <https://www.gnu.org/licenses/>. -*/ +/* + * Copyright (C) 2019 MATE Developers + * Copyright (C) 2018, 2019 zhuyaliang https://github.com/zhuyaliang/ + * Copyright (C) 2010-2018 The GNOME Project + * Copyright (C) 2010 Intel, Inc + * + * Portions from Ubiquity, Copyright (C) 2009 Canonical Ltd. + * Written by Evan Dandrea <[email protected]> + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <https://www.gnu.org/licenses/>. + * + * Author: Thomas Wood <[email protected]> + * + */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -434,6 +443,7 @@ void SetupTimezoneDialog(TimeAdmin *ta) NULL, NULL); gtk_window_set_default_size (GTK_WINDOW (ta->dialog), 730, 520); + gtk_window_set_icon_name (GTK_WINDOW(ta->dialog), "preferences-system-time"); ta->TZclose = gtk_button_new_with_mnemonic (_("_Close")); diff --git a/capplets/time-admin/src/time-zone.h b/capplets/time-admin/src/time-zone.h index 70473b24..fe3a8eb2 100644 --- a/capplets/time-admin/src/time-zone.h +++ b/capplets/time-admin/src/time-zone.h @@ -1,19 +1,28 @@ -/* time-admin -* Copyright (C) 2018 zhuyaliang https://github.com/zhuyaliang/ -* -* This program is free software: you can redistribute it and/or modify -* it under the terms of the GNU General Public License as published by -* the Free Software Foundation, either version 3 of the License, or -* (at your option) any later version. - -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General Public License for more details. - -* You should have received a copy of the GNU General Public License -* along with this program. If not, see <https://www.gnu.org/licenses/>. -*/ +/* + * Copyright (C) 2019 MATE Developers + * Copyright (C) 2018, 2019 zhuyaliang https://github.com/zhuyaliang/ + * Copyright (C) 2010-2018 The GNOME Project + * Copyright (C) 2010 Intel, Inc + * + * Portions from Ubiquity, Copyright (C) 2009 Canonical Ltd. + * Written by Evan Dandrea <[email protected]> + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <https://www.gnu.org/licenses/>. + * + * Author: Thomas Wood <[email protected]> + * + */ #ifndef __TIME_ZONE_H__ #define __TIME_ZONE_H__ diff --git a/capplets/windows/Makefile.am b/capplets/windows/Makefile.am index cf1b9307..63f75fbb 100644 --- a/capplets/windows/Makefile.am +++ b/capplets/windows/Makefile.am @@ -18,7 +18,6 @@ desktop_DATA = $(Desktop_in_files:.desktop.in=.desktop) AM_CPPFLAGS = $(MATECC_CAPPLETS_CFLAGS) \ -DUIDIR=\""$(uidir)"\" \ - -DMATELOCALEDIR="\"$(datadir)/locale\"" \ -DPIXMAPDIR=\""$(pixmapdir)"\" CLEANFILES = $(MATECC_CAPPLETS_CLEANFILES) $(desktop_DATA) diff --git a/capplets/windows/mate-window-properties.c b/capplets/windows/mate-window-properties.c index ae059ae8..3d27b35e 100644 --- a/capplets/windows/mate-window-properties.c +++ b/capplets/windows/mate-window-properties.c @@ -329,11 +329,7 @@ main (int argc, char **argv) const char *current_wm; int i; - bindtextdomain (GETTEXT_PACKAGE, MATELOCALEDIR); - bind_textdomain_codeset(GETTEXT_PACKAGE, "UTF-8"); - textdomain (GETTEXT_PACKAGE); - - gtk_init (&argc, &argv); + capplet_init (NULL, &argc, &argv); screen = gdk_display_get_default_screen (gdk_display_get_default ()); current_wm = gdk_x11_screen_get_window_manager_name (screen); |
