27
27
#include <string.h>
28
28
#include <stdlib.h>
29
29
30
- /* This is a hack for Ubuntu's metacity themes
31
- * Its safe for unable or not.
32
- * I am using this define to know what code was added */
33
- #define USE_UBUNTU_CODE 1
34
-
35
30
typedef enum
36
31
{
37
32
STATE_START ,
@@ -72,10 +67,8 @@ typedef enum
72
67
STATE_FRAME_STYLE ,
73
68
STATE_PIECE ,
74
69
STATE_BUTTON ,
75
- #ifdef USE_UBUNTU_CODE
76
70
STATE_SHADOW ,
77
71
STATE_PADDING ,
78
- #endif
79
72
/* style set */
80
73
STATE_FRAME_STYLE_SET ,
81
74
STATE_FRAME ,
@@ -182,7 +175,6 @@ static void parse_button_element (GMarkupParseContext *context,
182
175
ParseInfo * info ,
183
176
GError * * error );
184
177
185
- #ifdef USE_UBUNTU_CODE
186
178
static void parse_shadow_element (GMarkupParseContext * context ,
187
179
const gchar * element_name ,
188
180
const gchar * * attribute_names ,
@@ -196,7 +188,7 @@ static void parse_padding_element (GMarkupParseContext *context,
196
188
const gchar * * attribute_values ,
197
189
ParseInfo * info ,
198
190
GError * * error );
199
- #endif
191
+
200
192
static void parse_menu_icon_element (GMarkupParseContext * context ,
201
193
const gchar * element_name ,
202
194
const gchar * * attribute_names ,
@@ -2963,7 +2955,6 @@ parse_style_element (GMarkupParseContext *context,
2963
2955
2964
2956
push_state (info , STATE_BUTTON );
2965
2957
}
2966
- #ifdef USE_UBUNTU_CODE
2967
2958
else if (ELEMENT_IS ("shadow" ))
2968
2959
{
2969
2960
push_state (info , STATE_SHADOW );
@@ -2972,7 +2963,6 @@ parse_style_element (GMarkupParseContext *context,
2972
2963
{
2973
2964
push_state (info , STATE_PADDING );
2974
2965
}
2975
- #endif
2976
2966
else
2977
2967
{
2978
2968
set_error (error , context ,
@@ -3294,7 +3284,6 @@ parse_button_element (GMarkupParseContext *context,
3294
3284
}
3295
3285
}
3296
3286
3297
- #ifdef USE_UBUNTU_CODE
3298
3287
static void
3299
3288
parse_shadow_element (GMarkupParseContext * context ,
3300
3289
const gchar * element_name ,
@@ -3326,7 +3315,6 @@ parse_padding_element (GMarkupParseContext *context,
3326
3315
_ ("Element <%s> is not allowed below <%s>" ),
3327
3316
element_name , "padding" );
3328
3317
}
3329
- #endif
3330
3318
3331
3319
static void
3332
3320
parse_menu_icon_element (GMarkupParseContext * context ,
@@ -3479,7 +3467,6 @@ start_element_handler (GMarkupParseContext *context,
3479
3467
attribute_names , attribute_values ,
3480
3468
info , error );
3481
3469
break ;
3482
- #ifdef USE_UBUNTU_CODE
3483
3470
case STATE_SHADOW :
3484
3471
parse_shadow_element (context , element_name ,
3485
3472
attribute_names , attribute_values ,
@@ -3490,7 +3477,6 @@ start_element_handler (GMarkupParseContext *context,
3490
3477
attribute_names , attribute_values ,
3491
3478
info , error );
3492
3479
break ;
3493
- #endif
3494
3480
case STATE_MENU_ICON :
3495
3481
parse_menu_icon_element (context , element_name ,
3496
3482
attribute_names , attribute_values ,
@@ -3760,7 +3746,6 @@ end_element_handler (GMarkupParseContext *context,
3760
3746
}
3761
3747
pop_state (info );
3762
3748
break ;
3763
- #ifdef USE_UBUNTU_CODE
3764
3749
case STATE_SHADOW :
3765
3750
g_assert (info -> style );
3766
3751
pop_state (info );
@@ -3769,7 +3754,6 @@ end_element_handler (GMarkupParseContext *context,
3769
3754
g_assert (info -> style );
3770
3755
pop_state (info );
3771
3756
break ;
3772
- #endif
3773
3757
case STATE_MENU_ICON :
3774
3758
g_assert (info -> theme );
3775
3759
if (info -> op_list != NULL )
@@ -3994,14 +3978,12 @@ text_handler (GMarkupParseContext *context,
3994
3978
case STATE_BUTTON :
3995
3979
NO_TEXT ("button" );
3996
3980
break ;
3997
- #ifdef USE_UBUNTU_CODE
3998
3981
case STATE_SHADOW :
3999
3982
NO_TEXT ("shadow" );
4000
3983
break ;
4001
3984
case STATE_PADDING :
4002
3985
NO_TEXT ("padding" );
4003
3986
break ;
4004
- #endif
4005
3987
case STATE_MENU_ICON :
4006
3988
NO_TEXT ("menu_icon" );
4007
3989
break ;
0 commit comments