From 033a04ef9392b9d9bc5943ae592373c6dac96369 Mon Sep 17 00:00:00 2001 From: Benjamin Valentin Date: Fri, 16 Mar 2012 09:18:47 +0100 Subject: add .gitignore --- .gitignore | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..d1a0b48 --- /dev/null +++ b/.gitignore @@ -0,0 +1,49 @@ +aclocal.m4 +autom4te.cache +compile +config.guess +config.h* +config.log +config.status +config.sub +configure +depcomp +INSTALL +install-sh +intltool-* +libtool +ltmain.sh +Makefile +Makefile.in +Makefile.in.in +missing +mkinstalldirs +*.o +*.lo +*.a +*.la +*.gmo +po/POTFILES +po/stamp-it +stamp-h1 +.deps +.libs +gnome-settings-daemon/gnome-settings-client.h +gnome-settings-daemon/gnome-settings-daemon +gnome-settings-daemon/gnome-settings-manager-glue.h +data/*.pc +data/*.schemas +data/gnome-settings-daemon.desktop +data/gnome-settings-daemon.desktop.in +data/50-accessibility.xml +data/org.gnome.SettingsDaemon.service +*.gnome-settings-plugin +plugins/a11y-keyboard/test-a11y-preferences-dialog +plugins/background/test-background +plugins/media-keys/gsd-marshal.c +plugins/media-keys/gsd-marshal.h +plugins/media-keys/gsd-media-keys-manager-glue.h +plugins/media-keys/test-media-keys +plugins/media-keys/test-media-window +plugins/mouse/gsd-locate-pointer +plugins/xrandr/gsd-xrandr-manager-glue.h -- cgit v1.2.1 From 5da7f7c6ef1e59bba1f3aa7fa24fcaa44187704e Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Tue, 12 Oct 2010 15:53:30 +0200 Subject: Revert "Fix launching the display configuration tool" In 2.32, we still want to use mate-display-properties. This reverts commit 03112091d18ad0f9cc66b5f8835aadb1c47bc9ee. --- plugins/xrandr/msd-xrandr-manager.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/xrandr/msd-xrandr-manager.c b/plugins/xrandr/msd-xrandr-manager.c index dc00be1..e74b7d9 100644 --- a/plugins/xrandr/msd-xrandr-manager.c +++ b/plugins/xrandr/msd-xrandr-manager.c @@ -77,7 +77,7 @@ #define MSD_XRANDR_ICON_NAME "msd-xrandr" /* executable of the control center's display configuration capplet */ -#define MSD_XRANDR_DISPLAY_CAPPLET "mate-control-center display" +#define MSD_XRANDR_DISPLAY_CAPPLET "mate-display-properties" #define MSD_DBUS_PATH "/org/mate/SettingsDaemon" #define MSD_DBUS_NAME "org.mate.SettingsDaemon" -- cgit v1.2.1 From 60b0ab065772c3f109d7471c0d6d814d477f9803 Mon Sep 17 00:00:00 2001 From: Gary Lin Date: Fri, 29 Oct 2010 12:31:07 -0500 Subject: (randr) bnc#647304 - If the stored configuration fails at startup, use the fallback configurations Previously, if a stored configuration existed but it could not be applied due to nonmatching monitors, we would do nothing else - potentially leaving the user in whatever startup state was used by the X server. Now, in that condition we simply fall back to trying the system-global configuration or the boot-time configuration. Signed-off-by: Federico Mena Quintero --- plugins/xrandr/msd-xrandr-manager.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/plugins/xrandr/msd-xrandr-manager.c b/plugins/xrandr/msd-xrandr-manager.c index e74b7d9..75e41dd 100644 --- a/plugins/xrandr/msd-xrandr-manager.c +++ b/plugins/xrandr/msd-xrandr-manager.c @@ -2168,10 +2168,11 @@ apply_intended_configuration (MsdXrandrManager *manager, const char *intended_fi gboolean result; my_error = NULL; - result = apply_configuration_from_filename (manager, intended_filename, FALSE, timestamp, &my_error); + result = apply_configuration_from_filename (manager, intended_filename, TRUE, timestamp, &my_error); if (!result) { if (my_error) { - if (!g_error_matches (my_error, G_FILE_ERROR, G_FILE_ERROR_NOENT)) + if (!g_error_matches (my_error, G_FILE_ERROR, G_FILE_ERROR_NOENT) && + !g_error_matches (my_error, MATE_RR_ERROR, MATE_RR_ERROR_NO_MATCHING_CONFIG)) error_message (manager, _("Could not apply the stored configuration for monitors"), my_error, NULL); g_error_free (my_error); -- cgit v1.2.1 From a525db8f795d2101969a47f06c9fb6b60a497fb3 Mon Sep 17 00:00:00 2001 From: Martin Pitt Date: Tue, 5 Oct 2010 11:30:46 +0200 Subject: RANDR - Add mateconf key for disabling boot time configuration In a lot of situations it is undesirable to have g-s-d change the XRandR settings, because it overrides X.org customizations, leads to unnecessary mode switches, or increases boot time. Add a mateconf key "use_xorg_monitor_settings" to disable apply_default_boot_configuration(), in which case the XRandR configuration will not be touched unless there is a global or per-user configuration file. Bug: https://bugzilla.gnome.org/show_bug.cgi?id=631388 Bug-Ubuntu: https://launchpad.net/bugs/640807 --- data/apps_mate_settings_daemon_xrandr.schemas.in | 19 +++++++++++++++++++ plugins/xrandr/msd-xrandr-manager.c | 4 +++- 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/data/apps_mate_settings_daemon_xrandr.schemas.in b/data/apps_mate_settings_daemon_xrandr.schemas.in index 2314ac8..a8adbc9 100644 --- a/data/apps_mate_settings_daemon_xrandr.schemas.in +++ b/data/apps_mate_settings_daemon_xrandr.schemas.in @@ -14,6 +14,25 @@ + + /schemas/apps/mate_settings_daemon/xrandr/use_xorg_monitor_settings + /apps/mate_settings_daemon/xrandr/use_xorg_monitor_settings + mate + bool + false + + Do not touch monitor configuration + Usually, mate-settings-daemon configures internal and + external monitors according to the + turn_on_external_monitors_at_startup and + turn_on_laptop_monitor_at_startup settings and determines + an appropriate cloning/side-by-side mode. Setting this key + to True disables this, and the monitor settings are not + touched at all (unless there is an explicit user + configuration). + + + /schemas/apps/mate_settings_daemon/xrandr/turn_on_external_monitors_at_startup /apps/mate_settings_daemon/xrandr/turn_on_external_monitors_at_startup diff --git a/plugins/xrandr/msd-xrandr-manager.c b/plugins/xrandr/msd-xrandr-manager.c index 75e41dd..7d8d7f5 100644 --- a/plugins/xrandr/msd-xrandr-manager.c +++ b/plugins/xrandr/msd-xrandr-manager.c @@ -61,6 +61,7 @@ #define CONF_DIR "/apps/mate_settings_daemon/xrandr" #define CONF_KEY_SHOW_NOTIFICATION_ICON (CONF_DIR "/show_notification_icon") +#define CONF_KEY_USE_XORG_MONITOR_SETTINGS (CONF_DIR "/use_xorg_monitor_settings") #define CONF_KEY_TURN_ON_EXTERNAL_MONITORS_AT_STARTUP (CONF_DIR "/turn_on_external_monitors_at_startup") #define CONF_KEY_TURN_ON_LAPTOP_MONITOR_AT_STARTUP (CONF_DIR "/turn_on_laptop_monitor_at_startup") #define CONF_KEY_DEFAULT_CONFIGURATION_FILE (CONF_DIR "/default_configuration_file") @@ -2350,7 +2351,8 @@ msd_xrandr_manager_start (MsdXrandrManager *manager, show_timestamps_dialog (manager, "Startup"); if (!apply_stored_configuration_at_startup (manager, GDK_CURRENT_TIME)) /* we don't have a real timestamp at startup anyway */ if (!apply_default_configuration_from_file (manager, GDK_CURRENT_TIME)) - apply_default_boot_configuration (manager, GDK_CURRENT_TIME); + if (!mateconf_client_get_bool (manager->priv->client, CONF_KEY_USE_XORG_MONITOR_SETTINGS, NULL)) + apply_default_boot_configuration (manager, GDK_CURRENT_TIME); log_msg ("State of screen after initial configuration:\n"); log_screen (manager->priv->rw_screen); -- cgit v1.2.1 From 3b1fa7dde9b8fc7fe0b22c9385703a2d150cd643 Mon Sep 17 00:00:00 2001 From: Bastien Nocera Date: Fri, 5 Nov 2010 16:01:35 +0000 Subject: xrandr: Use Xorg monitor settings by default So as not to break the default behaviour. --- data/apps_mate_settings_daemon_xrandr.schemas.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/apps_mate_settings_daemon_xrandr.schemas.in b/data/apps_mate_settings_daemon_xrandr.schemas.in index a8adbc9..3428354 100644 --- a/data/apps_mate_settings_daemon_xrandr.schemas.in +++ b/data/apps_mate_settings_daemon_xrandr.schemas.in @@ -19,7 +19,7 @@ /apps/mate_settings_daemon/xrandr/use_xorg_monitor_settings mate bool - false + true Do not touch monitor configuration Usually, mate-settings-daemon configures internal and -- cgit v1.2.1 From 396265b9bf41b6331833a1938eb3e065e5928fe5 Mon Sep 17 00:00:00 2001 From: Rodrigo Moya Date: Tue, 19 Apr 2011 15:59:35 +0200 Subject: media-keys: React to stream-removed signal from GvcMixerControl --- plugins/media-keys/msd-media-keys-manager.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/plugins/media-keys/msd-media-keys-manager.c b/plugins/media-keys/msd-media-keys-manager.c index d7e1b04..e7310c6 100644 --- a/plugins/media-keys/msd-media-keys-manager.c +++ b/plugins/media-keys/msd-media-keys-manager.c @@ -862,6 +862,19 @@ on_control_default_sink_changed (GvcMixerControl *control, update_default_sink (manager); } +static void +on_control_stream_removed (GvcMixerControl *control, + guint id, + GsdMediaKeysManager *manager) +{ + if (manager->priv->stream != NULL) { + if (gvc_mixer_stream_get_id (manager->priv->stream) == id) { + g_object_unref (manager->priv->stream); + manager->priv->stream = NULL; + } + } +} + #endif /* HAVE_PULSE */ static gint @@ -1186,6 +1199,10 @@ msd_media_keys_manager_start (MsdMediaKeysManager *manager, "default-sink-changed", G_CALLBACK (on_control_default_sink_changed), manager); + g_signal_connect (manager->priv->volume, + "stream-removed", + G_CALLBACK (on_control_stream_removed), + manager); gvc_mixer_control_open (manager->priv->volume); -- cgit v1.2.1 From c96bc4ead7779af1617f505e1590ab8652242ad0 Mon Sep 17 00:00:00 2001 From: Rodrigo Moya Date: Fri, 5 Nov 2010 15:44:43 +0100 Subject: housekeeping: Don't access free'd memory if a volume is unmounted whilst the dialog is displayed --- plugins/housekeeping/msd-disk-space.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/plugins/housekeeping/msd-disk-space.c b/plugins/housekeeping/msd-disk-space.c index 6842ae5..e36be16 100644 --- a/plugins/housekeeping/msd-disk-space.c +++ b/plugins/housekeeping/msd-disk-space.c @@ -181,7 +181,7 @@ ldsm_notify_for_mount (LdsmMountInfo *mount, gboolean has_trash; gboolean has_disk_analyzer; gboolean retval = TRUE; - const gchar *path; + gchar *path; /* Don't show a dialog if one is already displayed */ if (dialog) @@ -190,7 +190,7 @@ ldsm_notify_for_mount (LdsmMountInfo *mount, name = g_unix_mount_guess_name (mount->mount); free_space = (gint64) mount->buf.f_frsize * (gint64) mount->buf.f_bavail; has_trash = ldsm_mount_has_trash (mount); - path = g_unix_mount_get_mount_path (mount->mount); + path = g_strdup (g_unix_mount_get_mount_path (mount->mount)); program = g_find_program_in_path (DISK_SPACE_ANALYZER); has_disk_analyzer = (program != NULL); @@ -218,7 +218,7 @@ ldsm_notify_for_mount (LdsmMountInfo *mount, break; case MSD_LDSM_DIALOG_RESPONSE_ANALYZE: retval = FALSE; - ldsm_analyze_path (g_unix_mount_get_mount_path (mount->mount)); + ldsm_analyze_path (path); break; case MSD_LDSM_DIALOG_RESPONSE_EMPTY_TRASH: retval = TRUE; @@ -232,6 +232,8 @@ ldsm_notify_for_mount (LdsmMountInfo *mount, g_assert_not_reached (); } + g_free (path); + return retval; } -- cgit v1.2.1