diff options
| author | Federico Mena Quintero <federico@novell.com> | 2010-09-03 11:42:42 -0500 |
|---|---|---|
| committer | Federico Mena Quintero <federico@novell.com> | 2010-09-03 11:42:42 -0500 |
| commit | bd53b4be4f8211f3202a915537cc515714710f83 (patch) | |
| tree | 2068ac5f34843185ae05b1423f9f02a25873b1e9 | |
| parent | f1baf995d9670a7c7030ca36f47351f4d87f6bbd (diff) | |
| download | gnome-settings-daemon-randr-osd.tar.gz | |
Don't use the Stored/custom configuration type in the XF86Display cyclerandr-osd
We just cycle between the stock configurations. There is no way for the user
to know what is actually stored on disk, so we try to be dumb-but-predictable
rather than not-always-really-smart.
Signed-off-by: Federico Mena Quintero <federico@novell.com>
| -rw-r--r-- | plugins/xrandr/gsd-xrandr-custom.png | bin | 3301 -> 0 bytes | |||
| -rw-r--r-- | plugins/xrandr/gsd-xrandr-manager.c | 23 |
2 files changed, 1 insertions, 22 deletions
diff --git a/plugins/xrandr/gsd-xrandr-custom.png b/plugins/xrandr/gsd-xrandr-custom.png Binary files differdeleted file mode 100644 index f34fde74..00000000 --- a/plugins/xrandr/gsd-xrandr-custom.png +++ /dev/null diff --git a/plugins/xrandr/gsd-xrandr-manager.c b/plugins/xrandr/gsd-xrandr-manager.c index 4bee8151..e26edc10 100644 --- a/plugins/xrandr/gsd-xrandr-manager.c +++ b/plugins/xrandr/gsd-xrandr-manager.c @@ -97,8 +97,7 @@ typedef enum { STOCK_CONFIG_CLONE_MONITORS, STOCK_CONFIG_EXTENDED_RIGHT, STOCK_CONFIG_EXTENDED_ONTOP, - STOCK_CONFIG_EXTERNAL, - STOCK_CONFIG_CUSTOM + STOCK_CONFIG_EXTERNAL } StockConfigType; /* One of the stock configurations that we generate for the XFDisplay hotkey */ @@ -850,18 +849,6 @@ make_external_stock_config (GnomeRRScreen *screen) return stock_config_new (STOCK_CONFIG_EXTERNAL, rr_config); } -static StockConfig * -make_stored_stock_config (GnomeRRScreen *screen) -{ - GnomeRRConfig *rr_config; - - rr_config = gnome_rr_config_new_stored (screen, NULL); /* NULL-GError - if this can't read the stored config, no big deal */ - if (rr_config != NULL) - return stock_config_new (STOCK_CONFIG_CUSTOM, rr_config); - else - return NULL; -} - static GPtrArray * sanitize (GsdXrandrManager *manager, GPtrArray *array) { @@ -1095,7 +1082,6 @@ generate_stock_configs (GsdXrandrManager *mgr) g_ptr_array_add (array, make_clone_stock_config (screen)); g_ptr_array_add (array, make_extended_stock_config (screen)); g_ptr_array_add (array, make_external_stock_config (screen)); - g_ptr_array_add (array, make_stored_stock_config (screen)); if (should_use_debug_window (mgr)) debug_window_setup (mgr); @@ -1169,9 +1155,6 @@ get_label_for_stock_config (StockConfigType type) case STOCK_CONFIG_EXTERNAL: return _("E_xternal only"); - case STOCK_CONFIG_CUSTOM: - return _("_Custom setup..."); - default: g_assert_not_reached (); return NULL; @@ -1212,10 +1195,6 @@ get_filename_for_stock_config_icon (StockConfigType type) base = "gsd-xrandr-external.png"; break; - case STOCK_CONFIG_CUSTOM: - base = "gsd-xrandr-custom.png"; - break; - default: g_assert_not_reached (); return NULL; |
