Skip to content

Commit 8a96f64

Browse files
ericek111raveit65
authored andcommitted
appearance: fixed indentations
1 parent 31880fa commit 8a96f64

1 file changed

Lines changed: 60 additions & 58 deletions

File tree

capplets/appearance/appearance-ui.c

Lines changed: 60 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -25,90 +25,92 @@
2525
static void
2626
set_have_icons (AppearanceData *data, gboolean value)
2727
{
28-
static const char *menu_item_names[] = {
29-
"menu_item_1",
30-
"menu_item_2",
31-
"menu_item_3",
32-
"menu_item_4",
33-
"menu_item_5",
34-
"cut",
35-
"copy",
36-
"paste",
37-
NULL
38-
};
28+
static const char *menu_item_names[] = {
29+
"menu_item_1",
30+
"menu_item_2",
31+
"menu_item_3",
32+
"menu_item_4",
33+
"menu_item_5",
34+
"cut",
35+
"copy",
36+
"paste",
37+
NULL
38+
};
3939

40-
const char **name;
40+
const char **name;
4141

42-
for (name = menu_item_names; *name != NULL; name++) {
43-
GtkImageMenuItem *item = GTK_IMAGE_MENU_ITEM (appearance_capplet_get_widget (data, *name));
44-
GtkWidget *image;
42+
for (name = menu_item_names; *name != NULL; name++) {
43+
GtkImageMenuItem *item = GTK_IMAGE_MENU_ITEM (appearance_capplet_get_widget (data, *name));
44+
GtkWidget *image;
4545

46-
if (value) {
47-
image = g_object_get_data (G_OBJECT (item), "image");
48-
if (image) {
49-
gtk_image_menu_item_set_image (item, image);
50-
g_object_unref (image);
51-
}
52-
} else {
53-
image = gtk_image_menu_item_get_image (item);
54-
g_object_set_data (G_OBJECT (item), "image", image);
55-
g_object_ref (image);
56-
gtk_image_menu_item_set_image (item, NULL);
46+
if (value) {
47+
image = g_object_get_data (G_OBJECT (item), "image");
48+
if (image) {
49+
gtk_image_menu_item_set_image (item, image);
50+
g_object_unref (image);
51+
}
52+
}
53+
else
54+
{
55+
image = gtk_image_menu_item_get_image (item);
56+
g_object_set_data (G_OBJECT (item), "image", image);
57+
g_object_ref (image);
58+
gtk_image_menu_item_set_image (item, NULL);
59+
}
5760
}
58-
}
5961
}
6062

6163
static void
6264
menus_have_icons_cb (GSettings *settings,
63-
gchar *key,
64-
AppearanceData *data)
65+
gchar *key,
66+
AppearanceData *data)
6567
{
66-
set_have_icons (data, g_settings_get_boolean (settings, key));
68+
set_have_icons (data, g_settings_get_boolean (settings, key));
6769
}
6870

6971
/** GUI Callbacks **/
7072

7173
static gint
7274
button_press_block_cb (GtkWidget *toolbar,
73-
GdkEvent *event,
74-
gpointer data)
75+
GdkEvent *event,
76+
gpointer data)
7577
{
76-
return TRUE;
78+
return TRUE;
7779
}
7880

7981
/** Public Functions **/
8082

8183
void
8284
ui_init (AppearanceData *data)
8385
{
84-
GtkWidget* widget;
86+
GtkWidget* widget;
8587

86-
/* FIXME maybe just remove that stuff from .ui file */
87-
GtkWidget* container = appearance_capplet_get_widget(data, "vbox24");
88+
/* FIXME maybe just remove that stuff from .ui file */
89+
GtkWidget* container = appearance_capplet_get_widget(data, "vbox24");
8890

89-
// Remove menu accels and toolbar style toggles for new GTK versions
90-
gtk_container_remove((GtkContainer *) container,
91-
appearance_capplet_get_widget(data, "menu_accel_toggle"));
92-
gtk_container_remove((GtkContainer *) container,
93-
appearance_capplet_get_widget(data, "hbox11"));
91+
// Remove menu accels and toolbar style toggles for new GTK versions
92+
gtk_container_remove((GtkContainer *) container,
93+
appearance_capplet_get_widget(data, "menu_accel_toggle"));
94+
gtk_container_remove((GtkContainer *) container,
95+
appearance_capplet_get_widget(data, "hbox11"));
9496

95-
widget = appearance_capplet_get_widget(data, "menu_icons_toggle");
96-
g_settings_bind (data->interface_settings,
97-
MENU_ICONS_KEY,
98-
G_OBJECT (widget),
99-
"active",
100-
G_SETTINGS_BIND_DEFAULT);
101-
g_signal_connect (data->interface_settings, "changed::" MENU_ICONS_KEY,
102-
G_CALLBACK (menus_have_icons_cb), data);
97+
widget = appearance_capplet_get_widget(data, "menu_icons_toggle");
98+
g_settings_bind (data->interface_settings,
99+
MENU_ICONS_KEY,
100+
G_OBJECT (widget),
101+
"active",
102+
G_SETTINGS_BIND_DEFAULT);
103+
g_signal_connect (data->interface_settings, "changed::" MENU_ICONS_KEY,
104+
G_CALLBACK (menus_have_icons_cb), data);
103105

104-
set_have_icons (data,
105-
g_settings_get_boolean (data->interface_settings,
106-
MENU_ICONS_KEY));
106+
set_have_icons (data,
107+
g_settings_get_boolean (data->interface_settings,
108+
MENU_ICONS_KEY));
107109

108-
widget = appearance_capplet_get_widget(data, "button_icons_toggle");
109-
g_settings_bind (data->interface_settings,
110-
BUTTON_ICONS_KEY,
111-
G_OBJECT (widget),
112-
"active",
113-
G_SETTINGS_BIND_DEFAULT);
110+
widget = appearance_capplet_get_widget(data, "button_icons_toggle");
111+
g_settings_bind (data->interface_settings,
112+
BUTTON_ICONS_KEY,
113+
G_OBJECT (widget),
114+
"active",
115+
G_SETTINGS_BIND_DEFAULT);
114116
}

0 commit comments

Comments
 (0)