summaryrefslogtreecommitdiff
path: root/stickynotes
diff options
context:
space:
mode:
authorAndre Klapper <a9016009@gmx.de>2010-04-23 00:46:25 +0200
committerAndre Klapper <a9016009@gmx.de>2010-04-23 16:48:59 +0200
commitd596fcf9846bb31823671ae83207ae796685e93d (patch)
treecf71205faa50cefa0cf1890eda70cf182c29ce5f /stickynotes
parentb4fdf2c7deee1aee18e34f7344cc2e59a9001e89 (diff)
Compile with -DGSEAL_ENABLE. Fixes bug 612473. Bumps gtk+ requirement to 2.18.
Diffstat (limited to 'stickynotes')
-rw-r--r--stickynotes/stickynotes_applet.c6
-rw-r--r--stickynotes/stickynotes_applet_callbacks.c4
2 files changed, 6 insertions, 4 deletions
diff --git a/stickynotes/stickynotes_applet.c b/stickynotes/stickynotes_applet.c
index 1c9a98c51..f3fe77670 100644
--- a/stickynotes/stickynotes_applet.c
+++ b/stickynotes/stickynotes_applet.c
@@ -599,6 +599,7 @@ void
stickynotes_applet_panel_icon_get_geometry (int *x, int *y, int *width, int *height)
{
GtkWidget *widget;
+ GtkAllocation allocation;
GtkRequisition requisition;
StickyNotesApplet *applet;
@@ -610,6 +611,7 @@ stickynotes_applet_panel_icon_get_geometry (int *x, int *y, int *width, int *hei
gdk_window_get_origin (gtk_widget_get_window (widget), x, y);
- *width = widget->allocation.x;
- *height = widget->allocation.y;
+ gtk_widget_get_allocation (widget, &allocation);
+ *width = allocation.x;
+ *height = allocation.y;
}
diff --git a/stickynotes/stickynotes_applet_callbacks.c b/stickynotes/stickynotes_applet_callbacks.c
index e6be02551..bffa3adcd 100644
--- a/stickynotes/stickynotes_applet_callbacks.c
+++ b/stickynotes/stickynotes_applet_callbacks.c
@@ -123,7 +123,7 @@ applet_key_cb (GtkWidget *widget,
/* Applet Callback : Cross (enter or leave) the applet. */
gboolean applet_cross_cb(GtkWidget *widget, GdkEventCrossing *event, StickyNotesApplet *applet)
{
- applet->prelighted = event->type == GDK_ENTER_NOTIFY || GTK_WIDGET_HAS_FOCUS(widget);
+ applet->prelighted = event->type == GDK_ENTER_NOTIFY || gtk_widget_has_focus(widget);
stickynotes_applet_update_icon(applet);
@@ -222,7 +222,7 @@ applet_change_bg_cb (PanelApplet *panel_applet,
break;
case PANEL_PIXMAP_BACKGROUND:
style = gtk_style_copy (
- GTK_WIDGET (applet->w_applet)->style);
+ gtk_widget_get_style (GTK_WIDGET (applet->w_applet)));
if (style->bg_pixmap[GTK_STATE_NORMAL])
g_object_unref (
style->bg_pixmap[GTK_STATE_NORMAL]);