From e884a3954b9ee64290b51ce14b4ef6e86e6fc1f1 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Mon, 20 Jun 2005 03:09:35 +0000 Subject: [PATCH] Avoid a warning. (#308295, Murray Cumming). 2005-06-19 Matthias Clasen * gparam.h (GParamFlags): Avoid a warning. (#308295, Murray Cumming). --- gobject/ChangeLog | 5 +++++ gobject/gparam.h | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/gobject/ChangeLog b/gobject/ChangeLog index 0da34935a..38041b2da 100644 --- a/gobject/ChangeLog +++ b/gobject/ChangeLog @@ -1,3 +1,8 @@ +2005-06-19 Matthias Clasen + + * gparam.h (GParamFlags): Avoid a warning. (#308295, + Murray Cumming). + 2005-06-13 Matthias Clasen * gparam.h (GParamFlags): Re-add G_PARAM_PRIVATE as a diff --git a/gobject/gparam.h b/gobject/gparam.h index 349a6356b..38811ddb1 100644 --- a/gobject/gparam.h +++ b/gobject/gparam.h @@ -54,11 +54,11 @@ typedef enum G_PARAM_CONSTRUCT_ONLY = 1 << 3, G_PARAM_LAX_VALIDATION = 1 << 4, G_PARAM_STATIC_NAME = 1 << 5, - G_PARAM_STATIC_NICK = 1 << 6, - G_PARAM_STATIC_BLURB = 1 << 7, #ifndef G_DISABLE_DEPRECATED - G_PARAM_PRIVATE = G_PARAM_STATIC_NAME + G_PARAM_PRIVATE = G_PARAM_STATIC_NAME, #endif + G_PARAM_STATIC_NICK = 1 << 6, + G_PARAM_STATIC_BLURB = 1 << 7 } GParamFlags; #define G_PARAM_READWRITE (G_PARAM_READABLE | G_PARAM_WRITABLE) #define G_PARAM_MASK (0x000000ff)