diff options
| author | Stefano Karapetsas <[email protected]> | 2013-12-23 11:21:21 -0800 |
|---|---|---|
| committer | Stefano Karapetsas <[email protected]> | 2013-12-23 11:21:21 -0800 |
| commit | eecaa6cf912640153afee8356aabc39c918101c0 (patch) | |
| tree | b0d850afc3ba4865b761764fda84206e6d239f2a | |
| parent | 7c719d6bebe37bfff23e6c0b8241ebb94a086e0e (diff) | |
| parent | 52ae123edd9b132d04db6199541a797ecc414015 (diff) | |
| download | mate-control-center-eecaa6cf912640153afee8356aabc39c918101c0.tar.bz2 mate-control-center-eecaa6cf912640153afee8356aabc39c918101c0.tar.xz | |
Merge pull request #79 from infirit/1.6
Cherrypick usefull commits from master
22 files changed, 53 insertions, 104 deletions
diff --git a/capplets/accessibility/at-properties/Makefile.am b/capplets/accessibility/at-properties/Makefile.am index ecff71a1..178a3165 100644 --- a/capplets/accessibility/at-properties/Makefile.am +++ b/capplets/accessibility/at-properties/Makefile.am @@ -8,7 +8,7 @@ mate_at_properties_LDFLAGS = -export-dynamic @INTLTOOL_DESKTOP_RULE@ desktopdir = $(datadir)/applications -Desktop_in_files = at-properties.desktop.in +Desktop_in_files = mate-at-properties.desktop.in desktop_DATA = $(Desktop_in_files:.desktop.in=.desktop) pixmapdir = $(pkgdatadir)/pixmaps diff --git a/capplets/accessibility/at-properties/main.c b/capplets/accessibility/at-properties/main.c index 59160cda..8c62cc1f 100644 --- a/capplets/accessibility/at-properties/main.c +++ b/capplets/accessibility/at-properties/main.c @@ -211,7 +211,6 @@ setup_dialog (GtkBuilder *builder, GSettings *settings) { GtkWidget *widget; GObject *object; - GObject *peditor; object = gtk_builder_get_object (builder, "at_enable_toggle"); g_signal_connect (object, "toggled", diff --git a/capplets/accessibility/at-properties/at-properties.desktop.in.in b/capplets/accessibility/at-properties/mate-at-properties.desktop.in.in index ff4cd37d..ff4cd37d 100644 --- a/capplets/accessibility/at-properties/at-properties.desktop.in.in +++ b/capplets/accessibility/at-properties/mate-at-properties.desktop.in.in diff --git a/capplets/appearance/appearance-main.c b/capplets/appearance/appearance-main.c index 65e703ad..b16b76fe 100644 --- a/capplets/appearance/appearance-main.c +++ b/capplets/appearance/appearance-main.c @@ -38,7 +38,9 @@ init_appearance_data (int *argc, char ***argv, GOptionContext *context) GtkBuilder *ui; GError *err = NULL; +#if !GLIB_CHECK_VERSION (2, 32, 0) g_thread_init (NULL); +#endif gdk_threads_init (); gdk_threads_enter (); theme_thumbnail_factory_init (*argc, *argv); diff --git a/capplets/appearance/appearance-support.c b/capplets/appearance/appearance-support.c index 42b906cc..25cc003c 100644 --- a/capplets/appearance/appearance-support.c +++ b/capplets/appearance/appearance-support.c @@ -57,21 +57,34 @@ metacity_is_running() } static void -metacity_theme_apply(const gchar *theme) +metacity_theme_apply(const gchar *theme, const gchar *font) { /* set theme, we use gconf and gsettings binaries to avoid schemas and versions issues */ if (is_program_in_path ("gconftool-2")) { - gchar *gconf_cmd = g_strdup_printf("gconftool-2 --set --type string /apps/metacity/general/theme '%s'", theme); + gchar *gconf_cmd = NULL; + + gconf_cmd = g_strdup_printf("gconftool-2 --set --type string /apps/metacity/general/theme '%s'", theme); + g_spawn_command_line_async (gconf_cmd, NULL); + g_free (gconf_cmd); + + gconf_cmd = g_strdup_printf("gconftool-2 --set --type string /apps/metacity/general/titlebar_font '%s'", font); g_spawn_command_line_async (gconf_cmd, NULL); g_free (gconf_cmd); } if (is_program_in_path ("gsettings")) { - gchar *gsettings_cmd = g_strdup_printf("gsettings set org.gnome.desktop.wm.preferences theme '%s'", theme); + gchar *gsettings_cmd = NULL; + + gsettings_cmd = g_strdup_printf("gsettings set org.gnome.desktop.wm.preferences theme '%s'", theme); g_spawn_command_line_async (gsettings_cmd, NULL); g_free (gsettings_cmd); + + gsettings_cmd = g_strdup_printf("gsettings set org.gnome.desktop.wm.preferences titlebar-font '%s'", font); + g_spawn_command_line_async (gsettings_cmd, NULL); + g_free (gsettings_cmd); + } } @@ -79,11 +92,14 @@ static void marco_theme_changed(GSettings *settings, gchar *key, AppearanceData* data) { gchar *theme = NULL; + gchar *font = NULL; if (metacity_is_running ()) { - theme = g_settings_get_string (settings, key); - metacity_theme_apply (theme); + theme = g_settings_get_string (settings, MARCO_THEME_KEY); + font = g_settings_get_string (settings, WINDOW_TITLE_FONT_KEY); + metacity_theme_apply (theme, font); g_free (theme); + g_free (font); } } @@ -92,12 +108,14 @@ support_init(AppearanceData* data) { /* needed for wm_common_get_current_window_manager() */ wm_common_update_window (); - /* GSettings signal */ + /* GSettings signals */ g_signal_connect (data->marco_settings, "changed::" MARCO_THEME_KEY, G_CALLBACK (marco_theme_changed), data); + g_signal_connect (data->marco_settings, "changed::" WINDOW_TITLE_FONT_KEY, + G_CALLBACK (marco_theme_changed), data); /* apply theme at start */ if (metacity_is_running ()) - marco_theme_changed (data->marco_settings, MARCO_THEME_KEY, data); + marco_theme_changed (data->marco_settings, NULL, data); } void diff --git a/capplets/appearance/appearance-themes.c b/capplets/appearance/appearance-themes.c index 57c175cd..b2dfbb1b 100644 --- a/capplets/appearance/appearance-themes.c +++ b/capplets/appearance/appearance-themes.c @@ -209,7 +209,7 @@ theme_load_from_gsettings (AppearanceData *data) theme->gtk_theme_name = g_settings_get_string (data->interface_settings, GTK_THEME_KEY); if (theme->gtk_theme_name == NULL) - theme->gtk_theme_name = g_strdup ("Clearlooks"); + theme->gtk_theme_name = g_strdup ("Menta"); scheme = g_settings_get_string (data->interface_settings, COLOR_SCHEME_KEY); if (scheme == NULL || !strcmp (scheme, "")) { @@ -220,11 +220,11 @@ theme_load_from_gsettings (AppearanceData *data) theme->marco_theme_name = g_settings_get_string (data->marco_settings, MARCO_THEME_KEY); if (theme->marco_theme_name == NULL) - theme->marco_theme_name = g_strdup ("Clearlooks"); + theme->marco_theme_name = g_strdup ("Menta"); theme->icon_theme_name = g_settings_get_string (data->interface_settings, ICON_THEME_KEY); if (theme->icon_theme_name == NULL) - theme->icon_theme_name = g_strdup ("mate"); + theme->icon_theme_name = g_strdup ("menta"); /* We need this because mate-control-center does not depend on mate-notification-daemon, * and if we try to get notification theme without schema installed, gsettings crashes diff --git a/capplets/default-applications/Makefile.am b/capplets/default-applications/Makefile.am index 71a2d1db..81c38c10 100644 --- a/capplets/default-applications/Makefile.am +++ b/capplets/default-applications/Makefile.am @@ -1,5 +1,5 @@ # This is used in MATECC_CAPPLETS_CFLAGS -cappletname = default-applications +cappletname = mate-default-applications-properties bin_PROGRAMS = mate-default-applications-properties diff --git a/capplets/display/Makefile.am b/capplets/display/Makefile.am index 972f271d..4a304a97 100644 --- a/capplets/display/Makefile.am +++ b/capplets/display/Makefile.am @@ -48,7 +48,7 @@ iconssvgdir = $(datadir)/icons/hicolor/scalable/apps dist_iconssvg_DATA = icons/scalable/mate-preferences-desktop-display.svg desktopdir = $(datadir)/applications -Desktop_in_files = display-properties.desktop.in +Desktop_in_files = mate-display-properties.desktop.in desktop_DATA = $(Desktop_in_files:.desktop.in=.desktop) AM_CPPFLAGS = $(DISPLAY_CAPPLET_CFLAGS) \ diff --git a/capplets/display/display-properties.desktop.in.in b/capplets/display/mate-display-properties.desktop.in.in index 607e354e..607e354e 100644 --- a/capplets/display/display-properties.desktop.in.in +++ b/capplets/display/mate-display-properties.desktop.in.in diff --git a/capplets/display/xrandr-capplet.c b/capplets/display/xrandr-capplet.c index 433b25db..7b3d2057 100644 --- a/capplets/display/xrandr-capplet.c +++ b/capplets/display/xrandr-capplet.c @@ -229,7 +229,6 @@ add_key (GtkWidget *widget, GtkComboBox *box = GTK_COMBO_BOX (widget); GtkTreeModel *model = gtk_combo_box_get_model (box); GtkListStore *store = GTK_LIST_STORE (model); - gboolean retval; info.text = text; info.found = FALSE; @@ -248,11 +247,6 @@ add_key (GtkWidget *widget, 5, rotation, -1); - retval = TRUE; - } - else - { - retval = FALSE; } } diff --git a/capplets/keybindings/mate-keybinding-properties.c b/capplets/keybindings/mate-keybinding-properties.c index ab3eaa6e..da017f17 100644 --- a/capplets/keybindings/mate-keybinding-properties.c +++ b/capplets/keybindings/mate-keybinding-properties.c @@ -1935,7 +1935,9 @@ main (int argc, char *argv[]) GtkBuilder *builder; GSettings *marco_settings; +#if !GLIB_CHECK_VERSION (2, 32, 0) g_thread_init (NULL); +#endif gtk_init (&argc, &argv); bindtextdomain (GETTEXT_PACKAGE, MATELOCALEDIR); diff --git a/capplets/keyboard/Makefile.am b/capplets/keyboard/Makefile.am index 58cbb1ae..0b48fbbd 100644 --- a/capplets/keyboard/Makefile.am +++ b/capplets/keyboard/Makefile.am @@ -27,7 +27,7 @@ dist_ui_DATA = mate-keyboard-properties-a11y-notifications.ui \ mate-keyboard-properties-options-dialog.ui desktopdir = $(datadir)/applications -Desktop_in_files = keyboard.desktop.in +Desktop_in_files = mate-keyboard.desktop.in desktop_DATA = $(Desktop_in_files:.desktop.in=.desktop) AM_CPPFLAGS = \ diff --git a/capplets/keyboard/keyboard.desktop.in.in b/capplets/keyboard/mate-keyboard.desktop.in.in index 2c9cb013..2c9cb013 100644 --- a/capplets/keyboard/keyboard.desktop.in.in +++ b/capplets/keyboard/mate-keyboard.desktop.in.in diff --git a/capplets/network/mate-network-properties.c b/capplets/network/mate-network-properties.c index bb611336..d1eaa515 100644 --- a/capplets/network/mate-network-properties.c +++ b/capplets/network/mate-network-properties.c @@ -380,7 +380,6 @@ cb_ignore_hosts_gsettings_changed (GSettings *settings, gchar *key, gpointer use static void setup_dialog (GtkBuilder *builder) { - gint mode; GSList *mode_group; GtkListStore *store; diff --git a/capplets/windows/Makefile.am b/capplets/windows/Makefile.am index ff357371..1f50f073 100644 --- a/capplets/windows/Makefile.am +++ b/capplets/windows/Makefile.am @@ -15,7 +15,7 @@ uidir = $(pkgdatadir)/ui ui_DATA = mate-window-properties.ui desktopdir = $(datadir)/applications -Desktop_in_files = window-properties.desktop.in +Desktop_in_files = mate-window-properties.desktop.in desktop_DATA = $(Desktop_in_files:.desktop.in=.desktop) AM_CPPFLAGS = $(MATECC_CAPPLETS_CFLAGS) \ diff --git a/capplets/windows/window-properties.desktop.in.in b/capplets/windows/mate-window-properties.desktop.in.in index 0d72d6b8..0d72d6b8 100644 --- a/capplets/windows/window-properties.desktop.in.in +++ b/capplets/windows/mate-window-properties.desktop.in.in diff --git a/configure.ac b/configure.ac index ae400444..690d991b 100644 --- a/configure.ac +++ b/configure.ac @@ -311,7 +311,7 @@ capplets/about-me/Makefile capplets/about-me/mate-about-me.desktop.in capplets/about-me/icons/Makefile capplets/accessibility/Makefile -capplets/accessibility/at-properties/at-properties.desktop.in +capplets/accessibility/at-properties/mate-at-properties.desktop.in capplets/accessibility/at-properties/Makefile capplets/appearance/Makefile capplets/appearance/data/Makefile @@ -322,18 +322,18 @@ capplets/default-applications/Makefile capplets/default-applications/mate-default-applications-properties.desktop.in capplets/default-applications/mate-default-applications.pc capplets/display/Makefile -capplets/display/display-properties.desktop.in +capplets/display/mate-display-properties.desktop.in capplets/keybindings/Makefile capplets/keybindings/mate-keybindings.pc capplets/keybindings/mate-keybinding.desktop.in capplets/keyboard/Makefile -capplets/keyboard/keyboard.desktop.in +capplets/keyboard/mate-keyboard.desktop.in capplets/mouse/Makefile capplets/mouse/mate-settings-mouse.desktop.in capplets/network/Makefile capplets/network/mate-network-properties.desktop.in capplets/windows/Makefile -capplets/windows/window-properties.desktop.in +capplets/windows/mate-window-properties.desktop.in font-viewer/Makefile font-viewer/mate-font-viewer.desktop.in help/Makefile diff --git a/distro/archlinux/PKGBUILD b/distro/archlinux/PKGBUILD deleted file mode 100644 index 8cef313e..00000000 --- a/distro/archlinux/PKGBUILD +++ /dev/null @@ -1,43 +0,0 @@ -pkgname=mate-control-center -pkgver=1.1.0 -pkgrel=1 -pkgdesc="The Control Center for MATE" -arch=('i686' 'x86_64') -license=('GPL') -depends=('mate-window-manager' 'libxss' 'desktop-file-utils' - 'mate-settings-daemon' 'libmatekbd' 'libcanberra' - 'sound-theme-freedesktop' 'libunique' 'mate-menus' - 'librsvg') # 'evolution-data-server>=2.29.92' -makedepends=('mate-doc-utils' 'pkgconfig' 'intltool') -options=('!emptydirs' '!libtool') -url="http://matsusoft.com.ar/projects/mate/" -groups=('mate') -install=mate-control-center.install -source=() -sha256sums=() - -build() { - cd "${srcdir}/../../../" - ./autogen.sh \ - --prefix=/usr \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --disable-static \ - --disable-scrollkeeper \ - --disable-update-mimedb || return 1 - # --enable-aboutme <- this requires libebook (from evolution) - make || return 1 -} - -package() { - cd "${srcdir}/../../../" - - make MATECONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install || return 1 - - install -m755 -d "${pkgdir}/usr/share/mateconf/schemas" - mateconf-merge-schema "${pkgdir}/usr/share/mateconf/schemas/${pkgname}.schemas" --domain ${pkgname} ${pkgdir}/etc/mateconf/schemas/*.schemas || return 1 - rm -f ${pkgdir}/etc/mateconf/schemas/*.schemas - - # --disable-update-mimedb? - rm -f "${pkgdir}/usr/share/applications/mimeinfo.cache" -} diff --git a/distro/archlinux/mate-control-center.install b/distro/archlinux/mate-control-center.install deleted file mode 100644 index 4cd00c7d..00000000 --- a/distro/archlinux/mate-control-center.install +++ /dev/null @@ -1,26 +0,0 @@ -pkgname=mate-control-center - -post_install() { - usr/sbin/mateconfpkg --install ${pkgname} - update-desktop-database -q - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor - update-mime-database usr/share/mime -} - -pre_upgrade() { - pre_remove $1 -} - -post_upgrade() { - post_install $1 -} - -pre_remove() { - usr/sbin/mateconfpkg --uninstall ${pkgname} -} - -post_remove() { - update-desktop-database -q - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor - update-mime-database usr/share/mime -} diff --git a/font-viewer/font-thumbnailer.c b/font-viewer/font-thumbnailer.c index 45928e63..24525f64 100644 --- a/font-viewer/font-thumbnailer.c +++ b/font-viewer/font-thumbnailer.c @@ -256,8 +256,12 @@ main(int argc, char **argv) setlocale (LC_ALL, ""); +#if !GLIB_CHECK_VERSION (2, 36, 0) g_type_init (); +#endif +#if !GLIB_CHECK_VERSION (2, 32, 0) g_thread_init (NULL); +#endif context = g_option_context_new (NULL); g_option_context_add_main_entries (context, options, GETTEXT_PACKAGE); diff --git a/po/POTFILES.in b/po/POTFILES.in index 5a55258a..fc6d887f 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -13,7 +13,7 @@ capplets/about-me/mate-about-me-fingerprint.c capplets/about-me/mate-about-me-password.c [type: gettext/glade]capplets/about-me/mate-about-me-password.ui [type: gettext/glade]capplets/accessibility/at-properties/at-enable-dialog.ui -capplets/accessibility/at-properties/at-properties.desktop.in.in +capplets/accessibility/at-properties/mate-at-properties.desktop.in.in capplets/accessibility/at-properties/main.c capplets/appearance/appearance-desktop.c capplets/appearance/appearance-font.c @@ -38,7 +38,7 @@ capplets/default-applications/mate-default-applications-properties.desktop.in.in capplets/default-applications/mate-da-capplet.c [type: gettext/glade]capplets/default-applications/mate-default-applications-properties.ui [type: gettext/glade]capplets/display/display-capplet.ui -capplets/display/display-properties.desktop.in.in +capplets/display/mate-display-properties.desktop.in.in capplets/display/mate-display-properties-install-systemwide.c capplets/display/org.mate.randr.policy.in capplets/display/xrandr-capplet.c @@ -60,7 +60,7 @@ capplets/keyboard/mate-keyboard-properties-xkblt.c capplets/keyboard/mate-keyboard-properties-xkbmc.c capplets/keyboard/mate-keyboard-properties-xkbot.c capplets/keyboard/mate-keyboard-properties-xkbpv.c -capplets/keyboard/keyboard.desktop.in.in +capplets/keyboard/mate-keyboard.desktop.in.in capplets/mouse/mate-mouse-properties.c [type: gettext/glade]capplets/mouse/mate-mouse-properties.ui capplets/mouse/mate-settings-mouse.desktop.in.in @@ -69,7 +69,7 @@ capplets/network/mate-network-properties.desktop.in.in [type: gettext/glade]capplets/network/mate-network-properties.ui capplets/windows/mate-window-properties.c [type: gettext/glade]capplets/windows/mate-window-properties.ui -capplets/windows/window-properties.desktop.in.in +capplets/windows/mate-window-properties.desktop.in.in libwindow-settings/mate-wm-manager.c libwindow-settings/marco-window-manager.c shell/control-center.c diff --git a/po/POTFILES.skip b/po/POTFILES.skip index 454fa4e8..ce7cbd9b 100644 --- a/po/POTFILES.skip +++ b/po/POTFILES.skip @@ -1,20 +1,20 @@ capplets/about-me/mate-about-me.desktop.in capplets/about-me/fingerprint-strings.h -capplets/accessibility/at-properties/at-properties.desktop.in +capplets/accessibility/at-properties/mate-at-properties.desktop.in capplets/accessibility/keyboard/accessibility-keyboard.desktop.in capplets/appearance/data/mate-appearance-properties.desktop.in capplets/appearance/data/mate-theme-installer.desktop.in capplets/appearance/data/mate-theme-package.xml capplets/default-applications/mate-default-applications-properties.desktop.in capplets/default-applications/mate-at-session.desktop.in -capplets/display/display-properties.desktop.in +capplets/display/mate-display-properties.desktop.in capplets/keybindings/mate-keybinding.desktop.in -capplets/keyboard/keyboard.desktop.in +capplets/keyboard/mate-keyboard.desktop.in capplets/localization/localization.desktop.in capplets/mouse/mate-settings-mouse.desktop.in capplets/network/mate-network-properties.desktop.in capplets/sound/mate-settings-sound.desktop.in -capplets/windows/window-properties.desktop.in +capplets/windows/mate-window-properties.desktop.in font-viewer/mate-font-viewer.desktop.in schemas/desktop_mate_font_rendering.schemas.in shell/matecc.desktop.in |