From 73da23c2f09eb8df5f8b6ba8b05cfb1550cd36e9 Mon Sep 17 00:00:00 2001 From: leigh123linux Date: Sep 28 2013 00:22:04 +0000 Subject: Merge branch 'f20' into f19 --- diff --git a/appmenu.patch b/appmenu.patch new file mode 100644 index 0000000..ffcf0d7 --- /dev/null +++ b/appmenu.patch @@ -0,0 +1,165 @@ +--- a/plugins/xsettings/csd-xsettings-manager.c ++++ b/plugins/xsettings/csd-xsettings-manager.c +@@ -241,11 +241,6 @@ struct CinnamonSettingsXSettingsManagerP + + CsdXSettingsGtk *gtk; + +- guint shell_name_watch_id; +- guint unity_name_watch_id; +- gboolean have_shell; +- gboolean have_unity; +- + guint notify_idle_id; + }; + +@@ -704,70 +699,6 @@ stop_fontconfig_monitor (CinnamonSetting + } + + static void +-notify_have_shell (CinnamonSettingsXSettingsManager *manager) +-{ +- int i; +- +- cinnamon_settings_profile_start (NULL); +- for (i = 0; manager->priv->managers [i]; i++) { +- /* Shell is showing appmenu if either GNOME Shell or Unity is running. */ +- xsettings_manager_set_int (manager->priv->managers [i], "Gtk/ShellShowsAppMenu", +- manager->priv->have_shell || manager->priv->have_unity); +- /* Shell is showing menubar *only* if Unity runs */ +- xsettings_manager_set_int (manager->priv->managers [i], "Gtk/ShellShowsMenubar", +- manager->priv->have_unity); +- } +- queue_notify (manager); +- cinnamon_settings_profile_end (NULL); +-} +- +-static void +-on_shell_appeared (GDBusConnection *connection, +- const gchar *name, +- const gchar *name_owner, +- gpointer user_data) +-{ +- CinnamonSettingsXSettingsManager *manager = user_data; +- +- manager->priv->have_shell = TRUE; +- notify_have_shell (manager); +-} +- +-static void +-on_shell_disappeared (GDBusConnection *connection, +- const gchar *name, +- gpointer user_data) +-{ +- CinnamonSettingsXSettingsManager *manager = user_data; +- +- manager->priv->have_shell = FALSE; +- notify_have_shell (manager); +-} +- +-static void +-on_unity_appeared (GDBusConnection *connection, +- const gchar *name, +- const gchar *name_owner, +- gpointer user_data) +-{ +- CinnamonSettingsXSettingsManager *manager = user_data; +- +- manager->priv->have_unity = TRUE; +- notify_have_shell (manager); +-} +- +-static void +-on_unity_disappeared (GDBusConnection *connection, +- const gchar *name, +- gpointer user_data) +-{ +- CinnamonSettingsXSettingsManager *manager = user_data; +- +- manager->priv->have_unity = FALSE; +- notify_have_shell (manager); +-} +- +-static void + process_value (CinnamonSettingsXSettingsManager *manager, + TranslationEntry *trans, + GVariant *value) +@@ -884,34 +815,6 @@ setup_xsettings_managers (CinnamonSettin + return TRUE; + } + +-static void +-start_shell_monitor (CinnamonSettingsXSettingsManager *manager) +-{ +- notify_have_shell (manager); +- manager->priv->have_shell = TRUE; +- manager->priv->shell_name_watch_id = g_bus_watch_name (G_BUS_TYPE_SESSION, +- "org.Cinnamon", +- 0, +- on_shell_appeared, +- on_shell_disappeared, +- manager, +- NULL); +-} +- +-static void +-start_unity_monitor (CinnamonSettingsXSettingsManager *manager) +-{ +- notify_have_shell (manager); +- manager->priv->have_unity = TRUE; +- manager->priv->shell_name_watch_id = g_bus_watch_name (G_BUS_TYPE_SESSION, +- "com.canonical.AppMenu.Registrar", +- 0, +- on_unity_appeared, +- on_unity_disappeared, +- manager, +- NULL); +-} +- + gboolean + cinnamon_xsettings_manager_start (CinnamonSettingsXSettingsManager *manager, + GError **error) +@@ -979,22 +882,24 @@ cinnamon_xsettings_manager_start (Cinnam + + start_fontconfig_monitor (manager); + +- start_shell_monitor (manager); +- start_unity_monitor (manager); +- +- for (i = 0; manager->priv->managers [i]; i++) ++ overrides = g_settings_get_value (manager->priv->plugin_settings, XSETTINGS_OVERRIDE_KEY); ++ for (i = 0; manager->priv->managers [i]; i++) { + xsettings_manager_set_string (manager->priv->managers [i], + "Net/FallbackIconTheme", + "gnome"); + +- overrides = g_settings_get_value (manager->priv->plugin_settings, XSETTINGS_OVERRIDE_KEY); +- for (i = 0; manager->priv->managers [i]; i++) { + xsettings_manager_set_overrides (manager->priv->managers [i], overrides); ++ ++ xsettings_manager_set_int (manager->priv->managers [i], "Gtk/ShellShowsAppMenu", ++ FALSE); ++ ++ xsettings_manager_set_int (manager->priv->managers [i], "Gtk/ShellShowsMenubar", ++ FALSE); + } ++ + queue_notify (manager); + g_variant_unref (overrides); + +- + cinnamon_settings_profile_end (NULL); + + return TRUE; +@@ -1023,12 +928,6 @@ cinnamon_xsettings_manager_stop (Cinnamo + + stop_fontconfig_monitor (manager); + +- if (manager->priv->shell_name_watch_id > 0) +- g_bus_unwatch_name (manager->priv->shell_name_watch_id); +- +- if (manager->priv->unity_name_watch_id > 0) +- g_bus_unwatch_name (manager->priv->unity_name_watch_id); +- + if (p->settings != NULL) { + g_hash_table_destroy (p->settings); + p->settings = NULL; diff --git a/cinnamon-settings-daemon.spec b/cinnamon-settings-daemon.spec index 1a71f30..94ca248 100644 --- a/cinnamon-settings-daemon.spec +++ b/cinnamon-settings-daemon.spec @@ -2,7 +2,7 @@ Name: cinnamon-settings-daemon Version: 1.0.0 -Release: 0.14.git%{_internal_version}%{?dist} +Release: 0.15.git%{_internal_version}%{?dist} Summary: The daemon sharing settings from CINNAMON to GTK+/KDE applications Group: System Environment/Daemons @@ -13,6 +13,7 @@ URL: http://cinnamon.linuxmint.com Source0: http://leigh123linux.fedorapeople.org/pub/cinnamon-settings-daemon/source/cinnamon-settings-daemon-%{version}.git%{_internal_version}.tar.gz Patch0: keyboard.patch +Patch1: appmenu.patch Requires: cinnamon-control-center-filesystem Obsoletes: cinnamon-settings-daemon-updates @@ -69,6 +70,7 @@ developing applications that use %{name}. sed -i -e 's@{ACLOCAL_FLAGS}@{ACLOCAL_FLAGS} -I m4@g' Makefile.am echo "AC_CONFIG_MACRO_DIR([m4])" >> configure.ac %patch0 -p1 +%patch1 -p1 NOCONFIGURE=1 ./autogen.sh %build @@ -224,6 +226,9 @@ fi %{_libexecdir}/csd-test-xsettings %changelog +* Sat Sep 28 2013 Leigh Scott - 1.0.0-0.15.gitcb4d724 +- patch to fix appmenu issue + * Wed Sep 18 2013 Leigh Scott - 1.0.0-0.14.gitcb4d724 - update to latest git