Line 0
Link Here
|
|
|
1 |
--- libgnomeui/gnome-app-helper.c.orig Sun Mar 20 20:46:17 2005 |
2 |
+++ libgnomeui/gnome-app-helper.c Sun Mar 20 20:49:57 2005 |
3 |
@@ -435,6 +435,8 @@ |
4 |
new_setting = gconf_value_get_bool(value); |
5 |
} |
6 |
|
7 |
+ GDK_THREADS_ENTER(); |
8 |
+ |
9 |
if (new_setting && (mi->image == NULL)) { |
10 |
GtkWidget *pixmap; |
11 |
GnomeUIPixmapType pixmap_type; |
12 |
@@ -457,6 +459,8 @@ |
13 |
} else if (!new_setting && (mi->image != NULL)) { |
14 |
gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (mi), NULL); |
15 |
} |
16 |
+ |
17 |
+ GDK_THREADS_LEAVE(); |
18 |
} |
19 |
|
20 |
/* Note that this function is also used for toolbars, don't assume |
21 |
@@ -1320,6 +1324,8 @@ |
22 |
if (entry->value->type != GCONF_VALUE_BOOL) |
23 |
return; |
24 |
|
25 |
+ GDK_THREADS_ENTER(); |
26 |
+ |
27 |
menu = GTK_WIDGET (user_data); |
28 |
|
29 |
if (gconf_value_get_bool (entry->value)) { |
30 |
@@ -1329,6 +1335,7 @@ |
31 |
|
32 |
if (tearoff) { |
33 |
/* Do nothing */ |
34 |
+ GDK_THREADS_LEAVE(); |
35 |
return; |
36 |
} |
37 |
|
38 |
@@ -1345,6 +1352,7 @@ |
39 |
|
40 |
if (!tearoff) { |
41 |
/* Do nothing */ |
42 |
+ GDK_THREADS_LEAVE(); |
43 |
return; |
44 |
} |
45 |
|
46 |
@@ -1352,6 +1360,8 @@ |
47 |
gtk_widget_destroy (tearoff); |
48 |
g_object_set_data (G_OBJECT (menu), "gnome-app-tearoff", NULL); |
49 |
} |
50 |
+ |
51 |
+ GDK_THREADS_LEAVE(); |
52 |
} |
53 |
|
54 |
|
55 |
@@ -2467,7 +2477,9 @@ |
56 |
} |
57 |
} |
58 |
|
59 |
+ GDK_THREADS_ENTER(); |
60 |
gtk_toolbar_set_style(toolbar, style); |
61 |
+ GDK_THREADS_LEAVE(); |
62 |
} |
63 |
|
64 |
static void |
65 |
@@ -2511,7 +2523,9 @@ |
66 |
style = GTK_TOOLBAR_BOTH; |
67 |
} |
68 |
|
69 |
+ GDK_THREADS_ENTER(); |
70 |
gtk_toolbar_set_style(toolbar, style); |
71 |
+ GDK_THREADS_LEAVE(); |
72 |
} |
73 |
|
74 |
static void |