isa/gnome-shell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use accessor functions instead of direct access

Browse Source 
With the transition to GTK+ 3.0, direct access to struct members
will no longer be possible.
This bumps the required minimum version of GTK+ to 2.20.

https://bugzilla.gnome.org/show_bug.cgi?id=618258
This commit is contained in:
Florian Müllner
2010-05-10 17:48:53 +02:00
parent 75b52d36f2
commit 8c5bb8655d
6 changed files with 89 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/shell-gtk-embed.c
View File

@ -60,7 +60,7 @@ shell_gtk_embed_on_window_realize (GtkWidget *widget,
* screen.
*/
clutter_x11_texture_pixmap_set_window (CLUTTER_X11_TEXTURE_PIXMAP (embed),
GDK_WINDOW_XWINDOW (widget->window),
GDK_WINDOW_XWINDOW (gtk_widget_get_window (widget)),
FALSE);
}
@ -100,7 +100,7 @@ shell_gtk_embed_set_window (ShellGtkEmbed *embed,
g_signal_connect (embed->priv->window, "realize",
G_CALLBACK (shell_gtk_embed_on_window_realize), embed);
if (GTK_WIDGET_REALIZED (window))
if (gtk_widget_get_realized (GTK_WIDGET (window)))
shell_gtk_embed_on_window_realize (GTK_WIDGET (embed->priv->window), embed);
}
@ -155,7 +155,8 @@ shell_gtk_embed_get_preferred_width (ClutterActor *actor,
{
ShellGtkEmbed *embed = SHELL_GTK_EMBED (actor);
if (embed->priv->window && GTK_WIDGET_VISIBLE (embed->priv->window))
if (embed->priv->window
&& gtk_widget_get_visible (GTK_WIDGET (embed->priv->window)))
{
GtkRequisition requisition;
gtk_widget_size_request (GTK_WIDGET (embed->priv->window), &requisition);
@ -174,7 +175,8 @@ shell_gtk_embed_get_preferred_height (ClutterActor *actor,
{
ShellGtkEmbed *embed = SHELL_GTK_EMBED (actor);
if (embed->priv->window && GTK_WIDGET_VISIBLE (embed->priv->window))
if (embed->priv->window
&& gtk_widget_get_visible (GTK_WIDGET (embed->priv->window)))
{
GtkRequisition requisition;
gtk_widget_size_request (GTK_WIDGET (embed->priv->window), &requisition);