Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
GNOME
gtk
Commits
6f0625ce
Commit
6f0625ce
authored
Jul 28, 2004
by
Matthias Clasen
Committed by
Matthias Clasen
Jul 28, 2004
Browse files
Warning fixes.
2004-07-28 Matthias Clasen <mclasen@redhat.com> * gtk/gtkuimanager.c: Warning fixes.
parent
f0576244
Changes
5
Hide whitespace changes
Inline
Side-by-side
ChangeLog
View file @
6f0625ce
2004
-
07
-
28
Matthias
Clasen
<
mclasen
@
redhat
.
com
>
*
gtk
/
gtkuimanager
.
c
:
Warning
fixes
.
*
gdk
/
linux
-
fb
/
gdkwindow
-
fb
.
c
(
gdk_window_set_background
):
Fix
prototype
mismatch
.
(#
148589
,
Nicolas
Deves
)
...
...
ChangeLog.pre-2-10
View file @
6f0625ce
2004
-
07
-
28
Matthias
Clasen
<
mclasen
@
redhat
.
com
>
*
gtk
/
gtkuimanager
.
c
:
Warning
fixes
.
*
gdk
/
linux
-
fb
/
gdkwindow
-
fb
.
c
(
gdk_window_set_background
):
Fix
prototype
mismatch
.
(#
148589
,
Nicolas
Deves
)
...
...
ChangeLog.pre-2-6
View file @
6f0625ce
2004
-
07
-
28
Matthias
Clasen
<
mclasen
@
redhat
.
com
>
*
gtk
/
gtkuimanager
.
c
:
Warning
fixes
.
*
gdk
/
linux
-
fb
/
gdkwindow
-
fb
.
c
(
gdk_window_set_background
):
Fix
prototype
mismatch
.
(#
148589
,
Nicolas
Deves
)
...
...
ChangeLog.pre-2-8
View file @
6f0625ce
2004
-
07
-
28
Matthias
Clasen
<
mclasen
@
redhat
.
com
>
*
gtk
/
gtkuimanager
.
c
:
Warning
fixes
.
*
gdk
/
linux
-
fb
/
gdkwindow
-
fb
.
c
(
gdk_window_set_background
):
Fix
prototype
mismatch
.
(#
148589
,
Nicolas
Deves
)
...
...
gtk/gtkuimanager.c
View file @
6f0625ce
...
...
@@ -2129,7 +2129,7 @@ update_node (GtkUIManager *self,
{
info
->
proxy
=
gtk_menu_bar_new
();
g_object_ref
(
info
->
proxy
);
gtk_object_sink
(
info
->
proxy
);
gtk_object_sink
(
GTK_OBJECT
(
info
->
proxy
)
)
;
gtk_widget_set_name
(
info
->
proxy
,
info
->
name
);
gtk_widget_show
(
info
->
proxy
);
g_signal_emit
(
self
,
ui_manager_signals
[
ADD_WIDGET
],
0
,
info
->
proxy
);
...
...
@@ -2140,7 +2140,7 @@ update_node (GtkUIManager *self,
{
info
->
proxy
=
gtk_menu_new
();
g_object_ref
(
info
->
proxy
);
gtk_object_sink
(
info
->
proxy
);
gtk_object_sink
(
GTK_OBJECT
(
info
->
proxy
)
)
;
}
gtk_widget_set_name
(
info
->
proxy
,
info
->
name
);
break
;
...
...
@@ -2178,7 +2178,7 @@ update_node (GtkUIManager *self,
info
->
proxy
=
gtk_action_create_menu_item
(
action
);
g_object_ref
(
info
->
proxy
);
gtk_object_sink
(
info
->
proxy
);
gtk_object_sink
(
GTK_OBJECT
(
info
->
proxy
)
)
;
menu
=
gtk_menu_new
();
gtk_widget_set_name
(
info
->
proxy
,
info
->
name
);
gtk_widget_set_name
(
menu
,
info
->
name
);
...
...
@@ -2224,7 +2224,7 @@ update_node (GtkUIManager *self,
{
info
->
proxy
=
gtk_toolbar_new
();
g_object_ref
(
info
->
proxy
);
gtk_object_sink
(
info
->
proxy
);
gtk_object_sink
(
GTK_OBJECT
(
info
->
proxy
)
)
;
gtk_widget_set_name
(
info
->
proxy
,
info
->
name
);
gtk_widget_show
(
info
->
proxy
);
g_signal_emit
(
self
,
ui_manager_signals
[
ADD_WIDGET
],
0
,
info
->
proxy
);
...
...
@@ -2259,7 +2259,7 @@ update_node (GtkUIManager *self,
{
info
->
proxy
=
gtk_separator_menu_item_new
();
g_object_ref
(
info
->
proxy
);
gtk_object_sink
(
info
->
proxy
);
gtk_object_sink
(
GTK_OBJECT
(
info
->
proxy
)
)
;
g_object_set_data
(
G_OBJECT
(
info
->
proxy
),
"gtk-separator-mode"
,
GINT_TO_POINTER
(
SEPARATOR_MODE_HIDDEN
));
...
...
@@ -2269,7 +2269,7 @@ update_node (GtkUIManager *self,
info
->
extra
=
gtk_separator_menu_item_new
();
g_object_ref
(
info
->
extra
);
gtk_object_sink
(
info
->
extra
);
gtk_object_sink
(
GTK_OBJECT
(
info
->
extra
)
)
;
g_object_set_data
(
G_OBJECT
(
info
->
extra
),
"gtk-separator-mode"
,
GINT_TO_POINTER
(
SEPARATOR_MODE_HIDDEN
));
...
...
@@ -2312,7 +2312,7 @@ update_node (GtkUIManager *self,
gtk_toolbar_insert
(
GTK_TOOLBAR
(
toolbar
),
item
,
pos
);
info
->
proxy
=
GTK_WIDGET
(
item
);
g_object_ref
(
info
->
proxy
);
gtk_object_sink
(
info
->
proxy
);
gtk_object_sink
(
GTK_OBJECT
(
info
->
proxy
)
)
;
g_object_set_data
(
G_OBJECT
(
info
->
proxy
),
"gtk-separator-mode"
,
GINT_TO_POINTER
(
SEPARATOR_MODE_HIDDEN
));
...
...
@@ -2322,7 +2322,7 @@ update_node (GtkUIManager *self,
gtk_toolbar_insert
(
GTK_TOOLBAR
(
toolbar
),
item
,
pos
+
1
);
info
->
extra
=
GTK_WIDGET
(
item
);
g_object_ref
(
info
->
extra
);
gtk_object_sink
(
info
->
extra
);
gtk_object_sink
(
GTK_OBJECT
(
info
->
extra
)
)
;
g_object_set_data
(
G_OBJECT
(
info
->
extra
),
"gtk-separator-mode"
,
GINT_TO_POINTER
(
SEPARATOR_MODE_HIDDEN
));
...
...
@@ -2354,7 +2354,7 @@ update_node (GtkUIManager *self,
{
info
->
proxy
=
gtk_action_create_menu_item
(
action
);
g_object_ref
(
info
->
proxy
);
gtk_object_sink
(
info
->
proxy
);
gtk_object_sink
(
GTK_OBJECT
(
info
->
proxy
)
)
;
gtk_widget_set_name
(
info
->
proxy
,
info
->
name
);
gtk_menu_shell_insert
(
GTK_MENU_SHELL
(
menushell
),
...
...
@@ -2405,7 +2405,7 @@ update_node (GtkUIManager *self,
{
info
->
proxy
=
gtk_action_create_tool_item
(
action
);
g_object_ref
(
info
->
proxy
);
gtk_object_sink
(
info
->
proxy
);
gtk_object_sink
(
GTK_OBJECT
(
info
->
proxy
)
)
;
gtk_widget_set_name
(
info
->
proxy
,
info
->
name
);
gtk_toolbar_insert
(
GTK_TOOLBAR
(
toolbar
),
...
...
@@ -2451,7 +2451,7 @@ update_node (GtkUIManager *self,
gtk_toolbar_insert
(
GTK_TOOLBAR
(
toolbar
),
item
,
pos
);
info
->
proxy
=
GTK_WIDGET
(
item
);
g_object_ref
(
info
->
proxy
);
gtk_object_sink
(
info
->
proxy
);
gtk_object_sink
(
GTK_OBJECT
(
info
->
proxy
)
)
;
gtk_widget_set_no_show_all
(
info
->
proxy
,
TRUE
);
g_object_set_data
(
G_OBJECT
(
info
->
proxy
),
"gtk-separator-mode"
,
...
...
@@ -2476,7 +2476,7 @@ update_node (GtkUIManager *self,
{
info
->
proxy
=
gtk_separator_menu_item_new
();
g_object_ref
(
info
->
proxy
);
gtk_object_sink
(
info
->
proxy
);
gtk_object_sink
(
GTK_OBJECT
(
info
->
proxy
)
)
;
gtk_widget_set_no_show_all
(
info
->
proxy
,
TRUE
);
g_object_set_data
(
G_OBJECT
(
info
->
proxy
),
"gtk-separator-mode"
,
...
...
@@ -2533,16 +2533,6 @@ update_node (GtkUIManager *self,
}
}
static
gboolean
do_updates_idle
(
GtkUIManager
*
self
)
{
GDK_THREADS_ENTER
();
do_updates
(
self
);
GDK_THREADS_LEAVE
();
return
FALSE
;
}
static
gboolean
do_updates
(
GtkUIManager
*
self
)
{
...
...
@@ -2565,6 +2555,16 @@ do_updates (GtkUIManager *self)
return
FALSE
;
}
static
gboolean
do_updates_idle
(
GtkUIManager
*
self
)
{
GDK_THREADS_ENTER
();
do_updates
(
self
);
GDK_THREADS_LEAVE
();
return
FALSE
;
}
static
void
queue_update
(
GtkUIManager
*
self
)
{
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment