[gnome-applets] Some small fixes for compiling with -DGSEAL_ENABLE.
- From: Andre Klapper <aklapper src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-applets] Some small fixes for compiling with -DGSEAL_ENABLE.
- Date: Thu, 15 Apr 2010 07:04:18 +0000 (UTC)
commit cf3576284ba560d7c9c4f6876d11fb6e5dc644f6
Author: Andre Klapper <a9016009 gmx de>
Date: Thu Apr 15 09:02:27 2010 +0200
Some small fixes for compiling with -DGSEAL_ENABLE.
drivemount/drive-button.c | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
---
diff --git a/drivemount/drive-button.c b/drivemount/drive-button.c
index 65503e6..1a4b9b5 100644
--- a/drivemount/drive-button.c
+++ b/drivemount/drive-button.c
@@ -186,11 +186,11 @@ position_menu (GtkMenu *menu, gint *x, gint *y,
theight = GTK_WIDGET (menu)->requisition.height;
screen = gtk_widget_get_screen (GTK_WIDGET (menu));
- monitor_num = gdk_screen_get_monitor_at_window (screen, widget->window);
+ monitor_num = gdk_screen_get_monitor_at_window (screen, gtk_widget_get_window (widget));
if (monitor_num < 0) monitor_num = 0;
gdk_screen_get_monitor_geometry (screen, monitor_num, &monitor);
- if (!gdk_window_get_origin (widget->window, &tx, &ty)) {
+ if (!gdk_window_get_origin (gtk_widget_get_window (widget), &tx, &ty)) {
g_warning ("Menu not on screen");
return;
}
@@ -323,8 +323,8 @@ drive_button_update (gpointer user_data)
/* if no volume or mount, unset image */
if (!self->volume && !self->mount) {
- if (GTK_BIN (self)->child != NULL)
- gtk_image_set_from_pixbuf (GTK_IMAGE (GTK_BIN (self)->child), NULL);
+ if (gtk_bin_get_child (GTK_BIN (self)) != NULL)
+ gtk_image_set_from_pixbuf (GTK_IMAGE (gtk_bin_get_child (GTK_BIN (self))), NULL);
return FALSE;
}
@@ -358,7 +358,7 @@ drive_button_update (gpointer user_data)
/* base the icon size on the desired button size */
gtk_widget_size_request (GTK_WIDGET (self), &button_req);
- gtk_widget_size_request (GTK_BIN (self)->child, &image_req);
+ gtk_widget_size_request (gtk_bin_get_child (GTK_BIN (self)), &image_req);
width = self->icon_size - (button_req.width - image_req.width);
height = self->icon_size - (button_req.height - image_req.height);
@@ -384,7 +384,7 @@ drive_button_update (gpointer user_data)
pixbuf = scaled;
}
- gtk_image_set_from_pixbuf (GTK_IMAGE (GTK_BIN (self)->child), pixbuf);
+ gtk_image_set_from_pixbuf (GTK_IMAGE (gtk_bin_get_child (GTK_BIN (self))), pixbuf);
g_object_unref (pixbuf);
gtk_widget_size_request (GTK_WIDGET (self), &button_req);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]