Skip to content

Commit d06b592

Browse files
committed
theme-parser: Remove unused define
1 parent 6f589de commit d06b592

File tree

1 file changed

+1
-19
lines changed

1 file changed

+1
-19
lines changed

src/ui/theme-parser.c

+1-19
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,6 @@
2727
#include <string.h>
2828
#include <stdlib.h>
2929

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-
3530
typedef enum
3631
{
3732
STATE_START,
@@ -72,10 +67,8 @@ typedef enum
7267
STATE_FRAME_STYLE,
7368
STATE_PIECE,
7469
STATE_BUTTON,
75-
#ifdef USE_UBUNTU_CODE
7670
STATE_SHADOW,
7771
STATE_PADDING,
78-
#endif
7972
/* style set */
8073
STATE_FRAME_STYLE_SET,
8174
STATE_FRAME,
@@ -182,7 +175,6 @@ static void parse_button_element (GMarkupParseContext *context,
182175
ParseInfo *info,
183176
GError **error);
184177

185-
#ifdef USE_UBUNTU_CODE
186178
static void parse_shadow_element (GMarkupParseContext *context,
187179
const gchar *element_name,
188180
const gchar **attribute_names,
@@ -196,7 +188,7 @@ static void parse_padding_element (GMarkupParseContext *context,
196188
const gchar **attribute_values,
197189
ParseInfo *info,
198190
GError **error);
199-
#endif
191+
200192
static void parse_menu_icon_element (GMarkupParseContext *context,
201193
const gchar *element_name,
202194
const gchar **attribute_names,
@@ -2963,7 +2955,6 @@ parse_style_element (GMarkupParseContext *context,
29632955

29642956
push_state (info, STATE_BUTTON);
29652957
}
2966-
#ifdef USE_UBUNTU_CODE
29672958
else if (ELEMENT_IS ("shadow"))
29682959
{
29692960
push_state (info, STATE_SHADOW);
@@ -2972,7 +2963,6 @@ parse_style_element (GMarkupParseContext *context,
29722963
{
29732964
push_state (info, STATE_PADDING);
29742965
}
2975-
#endif
29762966
else
29772967
{
29782968
set_error (error, context,
@@ -3294,7 +3284,6 @@ parse_button_element (GMarkupParseContext *context,
32943284
}
32953285
}
32963286

3297-
#ifdef USE_UBUNTU_CODE
32983287
static void
32993288
parse_shadow_element (GMarkupParseContext *context,
33003289
const gchar *element_name,
@@ -3326,7 +3315,6 @@ parse_padding_element (GMarkupParseContext *context,
33263315
_("Element <%s> is not allowed below <%s>"),
33273316
element_name, "padding");
33283317
}
3329-
#endif
33303318

33313319
static void
33323320
parse_menu_icon_element (GMarkupParseContext *context,
@@ -3479,7 +3467,6 @@ start_element_handler (GMarkupParseContext *context,
34793467
attribute_names, attribute_values,
34803468
info, error);
34813469
break;
3482-
#ifdef USE_UBUNTU_CODE
34833470
case STATE_SHADOW:
34843471
parse_shadow_element (context, element_name,
34853472
attribute_names, attribute_values,
@@ -3490,7 +3477,6 @@ start_element_handler (GMarkupParseContext *context,
34903477
attribute_names, attribute_values,
34913478
info, error);
34923479
break;
3493-
#endif
34943480
case STATE_MENU_ICON:
34953481
parse_menu_icon_element (context, element_name,
34963482
attribute_names, attribute_values,
@@ -3760,7 +3746,6 @@ end_element_handler (GMarkupParseContext *context,
37603746
}
37613747
pop_state (info);
37623748
break;
3763-
#ifdef USE_UBUNTU_CODE
37643749
case STATE_SHADOW:
37653750
g_assert (info->style);
37663751
pop_state (info);
@@ -3769,7 +3754,6 @@ end_element_handler (GMarkupParseContext *context,
37693754
g_assert (info->style);
37703755
pop_state (info);
37713756
break;
3772-
#endif
37733757
case STATE_MENU_ICON:
37743758
g_assert (info->theme);
37753759
if (info->op_list != NULL)
@@ -3994,14 +3978,12 @@ text_handler (GMarkupParseContext *context,
39943978
case STATE_BUTTON:
39953979
NO_TEXT ("button");
39963980
break;
3997-
#ifdef USE_UBUNTU_CODE
39983981
case STATE_SHADOW:
39993982
NO_TEXT ("shadow");
40003983
break;
40013984
case STATE_PADDING:
40023985
NO_TEXT ("padding");
40033986
break;
4004-
#endif
40053987
case STATE_MENU_ICON:
40063988
NO_TEXT ("menu_icon");
40073989
break;

0 commit comments

Comments
 (0)