Updating branch refs/heads/master to 04d492c4cc626a50cfefcc04751d43ce856dec1d (commit) from 83b7bfd1009a1a31044761eb2b9a365156f37cea (commit)
commit 04d492c4cc626a50cfefcc04751d43ce856dec1d Author: Sean Davis <smd.seanda...@gmail.com> Date: Thu Sep 27 09:18:33 2012 -0400 Fix for -1 is list terminator on mirror variable. dialogs/display-settings/main.c | 1 - dialogs/display-settings/xfce-randr.h | 2 +- 2 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dialogs/display-settings/main.c b/dialogs/display-settings/main.c index d7b9c59..79a948a 100644 --- a/dialogs/display-settings/main.c +++ b/dialogs/display-settings/main.c @@ -426,7 +426,6 @@ display_setting_positions_populate (GtkBuilder *builder) gtk_list_store_set (GTK_LIST_STORE (model), &iter, COLUMN_COMBO_NAME, _("Below"), COLUMN_COMBO_VALUE, XFCE_RANDR_PLACEMENT_DOWN, -1); - /* Reconnect the signal */ g_signal_connect (G_OBJECT (combobox), "changed", G_CALLBACK (display_setting_positions_changed), builder); diff --git a/dialogs/display-settings/xfce-randr.h b/dialogs/display-settings/xfce-randr.h index 4f40305..78a0e7e 100644 --- a/dialogs/display-settings/xfce-randr.h +++ b/dialogs/display-settings/xfce-randr.h @@ -34,11 +34,11 @@ #define XFCE_RANDR_POS_Y(randr) (randr->position[randr->active_output].y) #define XFCE_RANDR_ROTATIONS_MASK (RR_Rotate_0|RR_Rotate_90|RR_Rotate_180|RR_Rotate_270) #define XFCE_RANDR_REFLECTIONS_MASK (RR_Reflect_X|RR_Reflect_Y) -#define XFCE_RANDR_PLACEMENT_MIRROR -1 #define XFCE_RANDR_PLACEMENT_UP 0 #define XFCE_RANDR_PLACEMENT_RIGHT 1 #define XFCE_RANDR_PLACEMENT_DOWN 2 #define XFCE_RANDR_PLACEMENT_LEFT 3 +#define XFCE_RANDR_PLACEMENT_MIRROR 4 /* check for randr 1.3 or better */ #if RANDR_MAJOR > 1 || (RANDR_MAJOR == 1 && RANDR_MINOR >= 3) _______________________________________________ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits