[gnome-settings-daemon/randr-osd: 54/60] Merge branch 'master' into randr-osd
- From: Federico Mena Quintero <federico src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-settings-daemon/randr-osd: 54/60] Merge branch 'master' into randr-osd
- Date: Wed, 3 Mar 2010 23:48:46 +0000 (UTC)
commit ea4c879900b8ea87607ab2dd2c2b8ccaf815357b
Merge: 80c9e0a 40aec65
Author: Federico Mena Quintero <federico novell com>
Date: Tue Mar 2 14:38:22 2010 -0600
Merge branch 'master' into randr-osd
Conflicts:
plugins/xrandr/Makefile.am
plugins/xrandr/gsd-xrandr-manager.c
.gitignore | 21 +-
NEWS | 98 ++
configure.ac | 22 +-
...ps_gnome_settings_daemon_keybindings.schemas.in | 11 +
data/desktop_gnome_peripherals_touchpad.schemas.in | 11 +
gnome-settings-daemon/main.c | 13 +
plugins/keyboard/gsd-keyboard-xkb.c | 10 +-
plugins/media-keys/Makefile.am | 49 +-
plugins/media-keys/acme.h | 2 +
plugins/media-keys/gsd-media-keys-manager.c | 20 +
plugins/media-keys/touchpad-disabled-16.png | Bin 0 -> 610 bytes
plugins/media-keys/touchpad-disabled-22.png | Bin 0 -> 957 bytes
plugins/media-keys/touchpad-disabled-24.png | Bin 0 -> 985 bytes
plugins/media-keys/touchpad-disabled-32.png | Bin 0 -> 1610 bytes
plugins/media-keys/touchpad-disabled-48.png | Bin 0 -> 2208 bytes
plugins/media-keys/touchpad-disabled.svg | 1172 ++++++++++++++++++++
plugins/media-keys/touchpad-enabled-16.png | Bin 0 -> 626 bytes
plugins/media-keys/touchpad-enabled-22.png | Bin 0 -> 938 bytes
plugins/media-keys/touchpad-enabled-24.png | Bin 0 -> 949 bytes
plugins/media-keys/touchpad-enabled-32.png | Bin 0 -> 1494 bytes
plugins/media-keys/touchpad-enabled-48.png | Bin 0 -> 2041 bytes
plugins/media-keys/touchpad-enabled.svg | 936 ++++++++++++++++
plugins/mouse/gsd-mouse-manager.c | 81 ++-
plugins/xrandr/Makefile.am | 3 +-
plugins/xrandr/gsd-xrandr-manager.c | 86 +-
po/POTFILES.in | 1 +
po/bg.po | 205 +++--
po/bn.po | 451 ++++-----
po/ca.po | 364 ++++---
po/cs.po | 204 +++-
po/de.po | 272 +++--
po/en_GB.po | 269 +++--
po/es.po | 246 +++--
po/et.po | 79 ++-
po/fi.po | 221 +++--
po/fr.po | 219 +++--
po/gl.po | 400 ++++---
po/nb.po | 70 ++-
po/pl.po | 520 +++++++---
po/pt_BR.po | 211 +++--
po/ro.po | 234 +++--
po/ru.po | 210 +++--
po/sl.po | 235 +++--
po/sv.po | 221 +++--
po/ta.po | 224 +++--
po/zh_CN.po | 254 +++--
po/zh_HK.po | 206 +++-
po/zh_TW.po | 206 +++-
48 files changed, 6068 insertions(+), 1989 deletions(-)
---
diff --cc plugins/xrandr/Makefile.am
index c74cbbf,c5d660d..5d9848b
--- a/plugins/xrandr/Makefile.am
+++ b/plugins/xrandr/Makefile.am
@@@ -87,11 -59,9 +87,10 @@@ libxrandr_la_CFLAGS =
libxrandr_la_LDFLAGS = \
$(GSD_PLUGIN_LDFLAGS)
-libxrandr_la_LIBADD = \
- $(SETTINGS_PLUGIN_LIBS) \
+libxrandr_la_LIBADD = \
+ $(top_builddir)/plugins/common/libcommon.la \
+ $(SETTINGS_PLUGIN_LIBS) \
- $(LIBNOTIFY_LIBS) \
- $(RANDR_LIBS)
+ $(LIBNOTIFY_LIBS)
plugin_in_files = \
xrandr.gnome-settings-plugin.in
diff --cc plugins/xrandr/gsd-xrandr-manager.c
index 1576728,e78eb6b..03c008a
--- a/plugins/xrandr/gsd-xrandr-manager.c
+++ b/plugins/xrandr/gsd-xrandr-manager.c
@@@ -724,20 -675,21 +737,21 @@@ turn_on (GnomeRRScreen *screen
return FALSE;
}
-static GnomeRRConfig *
-make_laptop_setup (GnomeRRScreen *screen)
+static StockConfig *
+make_laptop_stock_config (GnomeRRScreen *screen)
{
/* Turn on the laptop, disable everything else */
- GnomeRRConfig *result = gnome_rr_config_new_current (screen);
+ GnomeRRConfig *rr_config = gnome_rr_config_new_current (screen);
int i;
- for (i = 0; result->outputs[i] != NULL; ++i) {
- GnomeOutputInfo *info = result->outputs[i];
+ for (i = 0; rr_config->outputs[i] != NULL; ++i) {
+ GnomeOutputInfo *info = rr_config->outputs[i];
- if (is_laptop (info)) {
+ if (is_laptop (screen, info)) {
if (!turn_on (screen, info, 0, 0)) {
- gnome_rr_config_free (rr_config);
- return NULL;
+ gnome_rr_config_free (result);
+ result = NULL;
+ break;
}
}
else {
@@@ -773,19 -726,17 +787,19 @@@ make_extended_stock_config (GnomeRRScre
int x;
x = 0;
- for (i = 0; result->outputs[i] != NULL; ++i) {
- GnomeOutputInfo *info = result->outputs[i];
+ for (i = 0; rr_config->outputs[i] != NULL; ++i) {
+ GnomeOutputInfo *info = rr_config->outputs[i];
+
+ /* FIXME: pick the primary output or the laptop as the leftmost one */
- if (is_laptop (info))
+ if (is_laptop (screen, info))
x = turn_on_and_get_rightmost_offset (screen, info, x);
}
- for (i = 0; result->outputs[i] != NULL; ++i) {
- GnomeOutputInfo *info = result->outputs[i];
+ for (i = 0; rr_config->outputs[i] != NULL; ++i) {
+ GnomeOutputInfo *info = rr_config->outputs[i];
- if (info->connected && !is_laptop (info))
+ if (info->connected && !is_laptop (screen, info))
x = turn_on_and_get_rightmost_offset (screen, info, x);
}
@@@ -801,13 -752,13 +815,13 @@@ make_external_stock_config (GnomeRRScre
* from (0, 0)
*/
- GnomeRRConfig *result = gnome_rr_config_new_current (screen);
+ GnomeRRConfig *rr_config = gnome_rr_config_new_current (screen);
int i;
- for (i = 0; result->outputs[i] != NULL; ++i) {
- GnomeOutputInfo *info = result->outputs[i];
+ for (i = 0; rr_config->outputs[i] != NULL; ++i) {
+ GnomeOutputInfo *info = rr_config->outputs[i];
- if (is_laptop (info)) {
+ if (is_laptop (screen, info)) {
info->on = FALSE;
}
else {
@@@ -1274,11 -999,7 +1288,7 @@@ handle_stock_config_hotkey (GsdXrandrMa
g_debug ("applying");
- error = NULL;
- if (!gnome_rr_config_apply_with_time (priv->stock_configs[mgr->priv->current_stock_config]->rr_config, screen, timestamp, &error)) {
- error_message (mgr, _("Could not switch the monitor configuration"), error, NULL);
- g_error_free (error);
- }
- apply_configuration_and_display_error (mgr, priv->fn_f7_configs[mgr->priv->current_fn_f7_config], timestamp);
++ apply_configuration_and_display_error (mgr, priv->stock_configs[mgr->priv->current_stock_config]->rr_config, timestamp);
}
else {
g_debug ("no configurations generated");
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
