]> Pileus Git - ~andy/gtk/blobdiff - gtk/gtkstatusicon.c
Updated Basque language
[~andy/gtk] / gtk / gtkstatusicon.c
old mode 100755 (executable)
new mode 100644 (file)
index a745a25..dab6ff6
@@ -3,6 +3,7 @@
  * Copyright (C) 2003 Sun Microsystems, Inc.
  * Copyright (C) 2005 Hans Breuer <hans@breuer.org>
  * Copyright (C) 2005 Novell, Inc.
+ * Copyright (C) 2006 Imendio AB
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  *     Mark McLoughlin <mark@skynet.ie>
  *     Hans Breuer <hans@breuer.org>
  *     Tor Lillqvist <tml@novell.com>
+ *     Mikael Hallendal <micke@imendio.com>
  */
 
-#include <config.h>
+#include "config.h"
 #include <string.h>
 
 #include "gtkstatusicon.h"
 
 #include "gtkintl.h"
 #include "gtkiconfactory.h"
+#include "gtkmain.h"
 #include "gtkmarshalers.h"
-#include "gtktooltips.h"
 #include "gtktrayicon.h"
 
 #include "gtkprivate.h"
 #include "gtkwidget.h"
+#include "gtktooltip.h"
 
-#include "gtkalias.h"
+#ifdef GDK_WINDOWING_X11
+#include "gdk/x11/gdkx.h"
+#endif
 
 #ifdef GDK_WINDOWING_WIN32
 #include "gtkicontheme.h"
 #define WM_GTK_TRAY_NOTIFICATION (WM_USER+1)
 #endif
 
+#ifdef GDK_WINDOWING_QUARTZ
+#include "gtkicontheme.h"
+#include "gtklabel.h"
+#endif 
+
+#include "gdkkeysyms.h"
+
+#include "gtkalias.h"
+
 #define BLINK_TIMEOUT 500
 
 enum
@@ -58,10 +72,18 @@ enum
   PROP_FILE,
   PROP_STOCK,
   PROP_ICON_NAME,
+  PROP_GICON,
   PROP_STORAGE_TYPE,
   PROP_SIZE,
+  PROP_SCREEN,
   PROP_VISIBLE,
-  PROP_BLINKING
+  PROP_ORIENTATION,
+  PROP_EMBEDDED,
+  PROP_BLINKING,
+  PROP_HAS_TOOLTIP,
+  PROP_TOOLTIP_TEXT,
+  PROP_TOOLTIP_MARKUP,
+  PROP_TITLE
 };
 
 enum 
@@ -69,20 +91,40 @@ enum
   ACTIVATE_SIGNAL,
   POPUP_MENU_SIGNAL,
   SIZE_CHANGED_SIGNAL,
+  BUTTON_PRESS_EVENT_SIGNAL,
+  BUTTON_RELEASE_EVENT_SIGNAL,
+  SCROLL_EVENT_SIGNAL,
+  QUERY_TOOLTIP_SIGNAL,
   LAST_SIGNAL
 };
 
+static guint status_icon_signals [LAST_SIGNAL] = { 0 };
+
+#ifdef GDK_WINDOWING_QUARTZ
+#include "gtkstatusicon-quartz.c"
+#endif
+
 struct _GtkStatusIconPrivate
 {
 #ifdef GDK_WINDOWING_X11
   GtkWidget    *tray_icon;
   GtkWidget    *image;
-  GtkTooltips  *tooltips;
 #endif
 
 #ifdef GDK_WINDOWING_WIN32
   GtkWidget     *dummy_widget;
   NOTIFYICONDATAW nid;
+  gint         last_click_x, last_click_y;
+  GtkOrientation orientation;
+  gchar         *tooltip_text;
+  gchar         *title;
+#endif
+       
+#ifdef GDK_WINDOWING_QUARTZ
+  GtkWidget     *dummy_widget;
+  GtkQuartzStatusIcon *status_item;
+  gchar         *tooltip_text;
+  gchar         *title;
 #endif
 
   gint          size;
@@ -97,6 +139,7 @@ struct _GtkStatusIconPrivate
       GdkPixbuf *pixbuf;
       gchar     *stock_id;
       gchar     *icon_name;
+      GIcon     *gicon;
     } image_data;
 
   GdkPixbuf    *blank_icon;
@@ -107,6 +150,9 @@ struct _GtkStatusIconPrivate
   guint         visible : 1;
 };
 
+static GObject* gtk_status_icon_constructor      (GType                  type,
+                                                  guint                  n_construct_properties,
+                                                  GObjectConstructParam *construct_params);
 static void     gtk_status_icon_finalize         (GObject        *object);
 static void     gtk_status_icon_set_property     (GObject        *object,
                                                  guint           prop_id,
@@ -120,26 +166,47 @@ static void     gtk_status_icon_get_property     (GObject        *object,
 #ifdef GDK_WINDOWING_X11
 static void     gtk_status_icon_size_allocate    (GtkStatusIcon  *status_icon,
                                                  GtkAllocation  *allocation);
+static void     gtk_status_icon_screen_changed   (GtkStatusIcon  *status_icon,
+                                                 GdkScreen      *old_screen);
+static void     gtk_status_icon_embedded_changed (GtkStatusIcon *status_icon);
+static void     gtk_status_icon_orientation_changed (GtkStatusIcon *status_icon);
+static gboolean gtk_status_icon_scroll           (GtkStatusIcon  *status_icon,
+                                                 GdkEventScroll *event);
+static gboolean gtk_status_icon_query_tooltip    (GtkStatusIcon *status_icon,
+                                                 gint           x,
+                                                 gint           y,
+                                                 gboolean       keyboard_tip,
+                                                 GtkTooltip    *tooltip);
+
+static gboolean gtk_status_icon_key_press        (GtkStatusIcon  *status_icon,
+                                                 GdkEventKey    *event);
+static void     gtk_status_icon_popup_menu       (GtkStatusIcon  *status_icon);
 #endif
 static gboolean gtk_status_icon_button_press     (GtkStatusIcon  *status_icon,
                                                  GdkEventButton *event);
+static gboolean gtk_status_icon_button_release   (GtkStatusIcon  *status_icon,
+                                                 GdkEventButton *event);
 static void     gtk_status_icon_disable_blinking (GtkStatusIcon  *status_icon);
 static void     gtk_status_icon_reset_image_data (GtkStatusIcon  *status_icon);
-                                          
-
-static guint status_icon_signals [LAST_SIGNAL] = { 0 };
+static void     gtk_status_icon_update_image    (GtkStatusIcon *status_icon);
 
-G_DEFINE_TYPE (GtkStatusIcon, gtk_status_icon, G_TYPE_OBJECT);
+G_DEFINE_TYPE (GtkStatusIcon, gtk_status_icon, G_TYPE_OBJECT)
 
 static void
 gtk_status_icon_class_init (GtkStatusIconClass *class)
 {
   GObjectClass *gobject_class = (GObjectClass *) class;
 
+  gobject_class->constructor  = gtk_status_icon_constructor;
   gobject_class->finalize     = gtk_status_icon_finalize;
   gobject_class->set_property = gtk_status_icon_set_property;
   gobject_class->get_property = gtk_status_icon_get_property;
 
+  class->button_press_event   = NULL;
+  class->button_release_event = NULL;
+  class->scroll_event         = NULL;
+  class->query_tooltip        = NULL;
+
   g_object_class_install_property (gobject_class,
                                   PROP_PIXBUF,
                                   g_param_spec_object ("pixbuf",
@@ -171,7 +238,23 @@ gtk_status_icon_class_init (GtkStatusIconClass *class)
                                                         P_("The name of the icon from the icon theme"),
                                                         NULL,
                                                         GTK_PARAM_READWRITE));
-  
+
+  /**
+   * GtkStatusIcon:gicon:
+   *
+   * The #GIcon displayed in the #GtkStatusIcon. For themed icons,
+   * the image will be updated automatically if the theme changes.
+   *
+   * Since: 2.14
+   */
+  g_object_class_install_property (gobject_class,
+                                   PROP_GICON,
+                                   g_param_spec_object ("gicon",
+                                                        P_("GIcon"),
+                                                        P_("The GIcon being displayed"),
+                                                        G_TYPE_ICON,
+                                                        GTK_PARAM_READWRITE));
+
   g_object_class_install_property (gobject_class,
                                   PROP_STORAGE_TYPE,
                                   g_param_spec_enum ("storage-type",
@@ -191,6 +274,14 @@ gtk_status_icon_class_init (GtkStatusIconClass *class)
                                                     0,
                                                     GTK_PARAM_READABLE));
 
+  g_object_class_install_property (gobject_class,
+                                  PROP_SCREEN,
+                                  g_param_spec_object ("screen",
+                                                       P_("Screen"),
+                                                       P_("The screen where this status icon will be displayed"),
+                                                       GDK_TYPE_SCREEN,
+                                                       GTK_PARAM_READWRITE));
+
   g_object_class_install_property (gobject_class,
                                   PROP_BLINKING,
                                   g_param_spec_boolean ("blinking",
@@ -208,6 +299,133 @@ gtk_status_icon_class_init (GtkStatusIconClass *class)
                                                         GTK_PARAM_READWRITE));
 
 
+  /**
+   * GtkStatusIcon:embedded: 
+   *
+   * %TRUE if the statusicon is embedded in a notification area.
+   *
+   * Since: 2.12
+   */
+  g_object_class_install_property (gobject_class,
+                                  PROP_EMBEDDED,
+                                  g_param_spec_boolean ("embedded",
+                                                        P_("Embedded"),
+                                                        P_("Whether or not the status icon is embedded"),
+                                                        FALSE,
+                                                        GTK_PARAM_READABLE));
+
+  /**
+   * GtkStatusIcon:orientation:
+   *
+   * The orientation of the tray in which the statusicon 
+   * is embedded. 
+   *
+   * Since: 2.12
+   */
+  g_object_class_install_property (gobject_class,
+                                  PROP_ORIENTATION,
+                                  g_param_spec_enum ("orientation",
+                                                     P_("Orientation"),
+                                                     P_("The orientation of the tray"),
+                                                     GTK_TYPE_ORIENTATION,
+                                                     GTK_ORIENTATION_HORIZONTAL,
+                                                     GTK_PARAM_READABLE));
+
+/**
+ * GtkStatusIcon:has-tooltip:
+ *
+ * Enables or disables the emission of #GtkStatusIcon::query-tooltip on
+ * @status_icon.  A value of %TRUE indicates that @status_icon can have a
+ * tooltip, in this case the status icon will be queried using
+ * #GtkStatusIcon::query-tooltip to determine whether it will provide a
+ * tooltip or not.
+ *
+ * Note that setting this property to %TRUE for the first time will change
+ * the event masks of the windows of this status icon to include leave-notify
+ * and motion-notify events. This will not be undone when the property is set
+ * to %FALSE again.
+ *
+ * Whether this property is respected is platform dependent.
+ * For plain text tooltips, use #GtkStatusIcon:tooltip-text in preference.
+ *
+ * Since: 2.16
+ */
+  g_object_class_install_property (gobject_class,
+                                  PROP_HAS_TOOLTIP,
+                                  g_param_spec_boolean ("has-tooltip",
+                                                        P_("Has tooltip"),
+                                                        P_("Whether this tray icon has a tooltip"),
+                                                        FALSE,
+                                                        GTK_PARAM_READWRITE));
+  /**
+   * GtkStatusIcon:tooltip-text:
+   *
+   * Sets the text of tooltip to be the given string.
+   *
+   * Also see gtk_tooltip_set_text().
+   *
+   * This is a convenience property which will take care of getting the
+   * tooltip shown if the given string is not %NULL.
+   * #GtkStatusIcon:has-tooltip will automatically be set to %TRUE and
+   * the default handler for the #GtkStatusIcon::query-tooltip signal
+   * will take care of displaying the tooltip.
+   *
+   * Note that some platforms have limitations on the length of tooltips
+   * that they allow on status icons, e.g. Windows only shows the first
+   * 64 characters.
+   *
+   * Since: 2.16
+   */
+  g_object_class_install_property (gobject_class,
+                                   PROP_TOOLTIP_TEXT,
+                                   g_param_spec_string ("tooltip-text",
+                                                        P_("Tooltip Text"),
+                                                        P_("The contents of the tooltip for this widget"),
+                                                        NULL,
+                                                        GTK_PARAM_READWRITE));
+  /**
+   * GtkStatusIcon:tooltip-markup:
+   *
+   * Sets the text of tooltip to be the given string, which is marked up
+   * with the <link linkend="PangoMarkupFormat">Pango text markup 
+   * language</link>. Also see gtk_tooltip_set_markup().
+   *
+   * This is a convenience property which will take care of getting the
+   * tooltip shown if the given string is not %NULL.
+   * #GtkStatusIcon:has-tooltip will automatically be set to %TRUE and
+   * the default handler for the #GtkStatusIcon::query-tooltip signal
+   * will take care of displaying the tooltip.
+   *
+   * On some platforms, embedded markup will be ignored.
+   *
+   * Since: 2.16
+   */
+  g_object_class_install_property (gobject_class,
+                                  PROP_TOOLTIP_MARKUP,
+                                  g_param_spec_string ("tooltip-markup",
+                                                       P_("Tooltip markup"),
+                                                       P_("The contents of the tooltip for this tray icon"),
+                                                       NULL,
+                                                       GTK_PARAM_READWRITE));
+
+
+  /**
+   * GtkStatusIcon:title:
+   *
+   * The title of this tray icon. This should be a short, human-readable,
+   * localized string describing the tray icon. It may be used by tools
+   * like screen readers to render the tray icon.
+   *
+   * Since: 2.18
+   */
+  g_object_class_install_property (gobject_class,
+                                   PROP_TITLE,
+                                   g_param_spec_string ("title",
+                                                        P_("Title"),
+                                                        P_("The title of this tray icon"),
+                                                        NULL,
+                                                        GTK_PARAM_READWRITE));
+
   /**
    * GtkStatusIcon::activate:
    * @status_icon: the object which received the signal
@@ -215,6 +433,9 @@ gtk_status_icon_class_init (GtkStatusIconClass *class)
    * Gets emitted when the user activates the status icon. 
    * If and how status icons can activated is platform-dependent.
    *
+   * Unlike most G_SIGNAL_ACTION signals, this signal is meant to 
+   * be used by applications and should be wrapped by language bindings.
+   *
    * Since: 2.10
    */
   status_icon_signals [ACTIVATE_SIGNAL] =
@@ -240,9 +461,12 @@ gtk_status_icon_class_init (GtkStatusIconClass *class)
    * of the status icon. Whether status icons can have context 
    * menus and how these are activated is platform-dependent.
    *
-   * The @button and @activate_timeout parameters should be 
+   * The @button and @activate_time parameters should be 
    * passed as the last to arguments to gtk_menu_popup().
    *
+   * Unlike most G_SIGNAL_ACTION signals, this signal is meant to 
+   * be used by applications and should be wrapped by language bindings.
+   *
    * Since: 2.10
    */
   status_icon_signals [POPUP_MENU_SIGNAL] =
@@ -266,42 +490,163 @@ gtk_status_icon_class_init (GtkStatusIconClass *class)
    * Gets emitted when the size available for the image
    * changes, e.g. because the notification area got resized.
    *
+   * Return value: %TRUE if the icon was updated for the new
+   * size. Otherwise, GTK+ will scale the icon as necessary.
+   *
    * Since: 2.10
    */
   status_icon_signals [SIZE_CHANGED_SIGNAL] =
     g_signal_new (I_("size-changed"),
                  G_TYPE_FROM_CLASS (gobject_class),
-                 G_SIGNAL_RUN_FIRST,
+                 G_SIGNAL_RUN_LAST,
                  G_STRUCT_OFFSET (GtkStatusIconClass, size_changed),
+                 g_signal_accumulator_true_handled,
                  NULL,
-                 NULL,
-                 g_cclosure_marshal_VOID__INT,
-                 G_TYPE_NONE,
+                 _gtk_marshal_BOOLEAN__INT,
+                 G_TYPE_BOOLEAN,
                  1,
                  G_TYPE_INT);
 
+  /**
+   * GtkStatusIcon::button-press-event:
+   * @status_icon: the object which received the signal
+   * @event: the #GdkEventButton which triggered this signal
+   *
+   * The ::button-press-event signal will be emitted when a button
+   * (typically from a mouse) is pressed.
+   *
+   * Whether this event is emitted is platform-dependent.  Use the ::activate
+   * and ::popup-menu signals in preference.
+   *
+   * Return value: %TRUE to stop other handlers from being invoked
+   * for the event. %FALSE to propagate the event further.
+   *
+   * Since: 2.14
+   */
+  status_icon_signals [BUTTON_PRESS_EVENT_SIGNAL] =
+    g_signal_new (I_("button_press_event"),
+                 G_TYPE_FROM_CLASS (gobject_class),
+                 G_SIGNAL_RUN_LAST,
+                 G_STRUCT_OFFSET (GtkStatusIconClass, button_press_event),
+                 g_signal_accumulator_true_handled, NULL,
+                 _gtk_marshal_BOOLEAN__BOXED,
+                 G_TYPE_BOOLEAN, 1,
+                 GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE);
+
+  /**
+   * GtkStatusIcon::button-release-event:
+   * @status_icon: the object which received the signal
+   * @event: the #GdkEventButton which triggered this signal
+   *
+   * The ::button-release-event signal will be emitted when a button
+   * (typically from a mouse) is released.
+   *
+   * Whether this event is emitted is platform-dependent.  Use the ::activate
+   * and ::popup-menu signals in preference.
+   *
+   * Return value: %TRUE to stop other handlers from being invoked
+   * for the event. %FALSE to propagate the event further.
+   *
+   * Since: 2.14
+   */
+  status_icon_signals [BUTTON_RELEASE_EVENT_SIGNAL] =
+    g_signal_new (I_("button_release_event"),
+                 G_TYPE_FROM_CLASS (gobject_class),
+                 G_SIGNAL_RUN_LAST,
+                 G_STRUCT_OFFSET (GtkStatusIconClass, button_release_event),
+                 g_signal_accumulator_true_handled, NULL,
+                 _gtk_marshal_BOOLEAN__BOXED,
+                 G_TYPE_BOOLEAN, 1,
+                 GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE);
+
+  /**
+   * GtkStatusIcon::scroll-event:
+   * @status_icon: the object which received the signal.
+   * @event: the #GdkEventScroll which triggered this signal
+   *
+   * The ::scroll-event signal is emitted when a button in the 4 to 7
+   * range is pressed. Wheel mice are usually configured to generate 
+   * button press events for buttons 4 and 5 when the wheel is turned.
+   *
+   * Whether this event is emitted is platform-dependent.
+   *
+   * Returns: %TRUE to stop other handlers from being invoked for the event. 
+   *   %FALSE to propagate the event further.
+   */
+  status_icon_signals[SCROLL_EVENT_SIGNAL] =
+    g_signal_new (I_("scroll_event"),
+                 G_TYPE_FROM_CLASS (gobject_class),
+                 G_SIGNAL_RUN_LAST,
+                 G_STRUCT_OFFSET (GtkStatusIconClass, scroll_event),
+                 g_signal_accumulator_true_handled, NULL,
+                 _gtk_marshal_BOOLEAN__BOXED,
+                 G_TYPE_BOOLEAN, 1,
+                 GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE);
+
+  /**
+   * GtkStatusIcon::query-tooltip:
+   * @status_icon: the object which received the signal
+   * @x: the x coordinate of the cursor position where the request has been
+   *     emitted, relative to @status_icon
+   * @y: the y coordinate of the cursor position where the request has been
+   *     emitted, relative to @status_icon
+   * @keyboard_mode: %TRUE if the tooltip was trigged using the keyboard
+   * @tooltip: a #GtkTooltip
+   *
+   * Emitted when the #GtkSettings:gtk-tooltip-timeout has expired with the
+   * cursor hovering above @status_icon; or emitted when @status_icon got
+   * focus in keyboard mode.
+   *
+   * Using the given coordinates, the signal handler should determine
+   * whether a tooltip should be shown for @status_icon. If this is
+   * the case %TRUE should be returned, %FALSE otherwise. Note that if
+   * @keyboard_mode is %TRUE, the values of @x and @y are undefined and
+   * should not be used.
+   *
+   * The signal handler is free to manipulate @tooltip with the therefore
+   * destined function calls.
+   *
+   * Whether this signal is emitted is platform-dependent.
+   * For plain text tooltips, use #GtkStatusIcon:tooltip-text in preference.
+   *
+   * Returns: %TRUE if @tooltip should be shown right now, %FALSE otherwise.
+   *
+   * Since: 2.16
+   */
+  status_icon_signals [QUERY_TOOLTIP_SIGNAL] =
+    g_signal_new (I_("query_tooltip"),
+                 G_TYPE_FROM_CLASS (gobject_class),
+                 G_SIGNAL_RUN_LAST,
+                 G_STRUCT_OFFSET (GtkStatusIconClass, query_tooltip),
+                 g_signal_accumulator_true_handled, NULL,
+                 _gtk_marshal_BOOLEAN__INT_INT_BOOLEAN_OBJECT,
+                 G_TYPE_BOOLEAN, 4,
+                 G_TYPE_INT,
+                 G_TYPE_INT,
+                 G_TYPE_BOOLEAN,
+                 GTK_TYPE_TOOLTIP);
+
   g_type_class_add_private (class, sizeof (GtkStatusIconPrivate));
 }
 
 #ifdef GDK_WINDOWING_WIN32
 
 static void
-build_button_event (GdkEventButton *e,
-                   GdkEventType    type,
-                   guint           button)
+build_button_event (GtkStatusIconPrivate *priv,
+                   GdkEventButton       *e,
+                   guint                 button)
 {
   POINT pos;
   GdkRectangle monitor0;
 
   /* We know that gdk/win32 puts the primary monitor at index 0 */
   gdk_screen_get_monitor_geometry (gdk_screen_get_default (), 0, &monitor0);
-  e->type = type;
-  e->window = gdk_get_default_root_window ();
+  e->window = g_object_ref (gdk_get_default_root_window ());
   e->send_event = TRUE;
   e->time = GetTickCount ();
   GetCursorPos (&pos);
-  e->x = pos.x + monitor0.x;
-  e->y = pos.y + monitor0.y;
+  priv->last_click_x = e->x = pos.x + monitor0.x;
+  priv->last_click_y = e->y = pos.y + monitor0.y;
   e->axes = NULL;
   e->state = 0;
   e->button = button;
@@ -310,25 +655,122 @@ build_button_event (GdkEventButton *e,
   e->y_root = e->y;
 }
 
+typedef struct
+{
+  GtkStatusIcon *status_icon;
+  GdkEventButton *event;
+} ButtonCallbackData;
+
+static gboolean
+button_callback (gpointer data)
+{
+  ButtonCallbackData *bc = (ButtonCallbackData *) data;
+
+  if (bc->event->type == GDK_BUTTON_PRESS)
+    gtk_status_icon_button_press (bc->status_icon, bc->event);
+  else
+    gtk_status_icon_button_release (bc->status_icon, bc->event);
+
+  gdk_event_free ((GdkEvent *) bc->event);
+  g_free (data);
+
+  return FALSE;
+}
+
+static UINT taskbar_created_msg = 0;
+static GSList *status_icons = NULL;
+
 static LRESULT CALLBACK
 wndproc (HWND   hwnd,
         UINT   message,
         WPARAM wparam,
         LPARAM lparam)
 {
+  if (message == taskbar_created_msg)
+    {
+      GSList *rover;
+
+      for (rover = status_icons; rover != NULL; rover = rover->next)
+       {
+         GtkStatusIcon *status_icon = GTK_STATUS_ICON (rover->data);
+         GtkStatusIconPrivate *priv = status_icon->priv;
+
+         priv->nid.hWnd = hwnd;
+         priv->nid.uID = GPOINTER_TO_UINT (status_icon);
+         priv->nid.uCallbackMessage = WM_GTK_TRAY_NOTIFICATION;
+         priv->nid.uFlags = NIF_MESSAGE;
+
+         if (!Shell_NotifyIconW (NIM_ADD, &priv->nid))
+           {
+             g_warning (G_STRLOC ": Shell_NotifyIcon(NIM_ADD) failed");
+             priv->nid.hWnd = NULL;
+             continue;
+           }
+
+         gtk_status_icon_update_image (status_icon);
+       }
+      return 0;
+    }
+
   if (message == WM_GTK_TRAY_NOTIFICATION)
     {
-      GdkEventButton e;
-      GtkStatusIcon *status_icon = GTK_STATUS_ICON (wparam);
+      ButtonCallbackData *bc;
+      guint button;
       
       switch (lparam)
        {
        case WM_LBUTTONDOWN:
+         button = 1;
+         goto buttondown0;
+
+       case WM_MBUTTONDOWN:
+         button = 2;
+         goto buttondown0;
+
        case WM_RBUTTONDOWN:
-         build_button_event (&e, GDK_BUTTON_PRESS,
-                             (lparam == WM_LBUTTONDOWN) ? 1 : 3);
-         gtk_status_icon_button_press (status_icon, &e);
+         button = 3;
+         goto buttondown0;
+
+       case WM_XBUTTONDOWN:
+         if (HIWORD (wparam) == XBUTTON1)
+           button = 4;
+         else
+           button = 5;
+
+       buttondown0:
+         bc = g_new (ButtonCallbackData, 1);
+         bc->event = (GdkEventButton *) gdk_event_new (GDK_BUTTON_PRESS);
+         bc->status_icon = GTK_STATUS_ICON (wparam);
+         build_button_event (bc->status_icon->priv, bc->event, button);
+         g_idle_add (button_callback, bc);
+         break;
+
+       case WM_LBUTTONUP:
+         button = 1;
+         goto buttonup0;
+
+       case WM_MBUTTONUP:
+         button = 2;
+         goto buttonup0;
+
+       case WM_RBUTTONUP:
+         button = 3;
+         goto buttonup0;
+
+       case WM_XBUTTONUP:
+         if (HIWORD (wparam) == XBUTTON1)
+           button = 4;
+         else
+           button = 5;
+
+       buttonup0:
+         bc = g_new (ButtonCallbackData, 1);
+         bc->event = (GdkEventButton *) gdk_event_new (GDK_BUTTON_RELEASE);
+         bc->status_icon = GTK_STATUS_ICON (wparam);
+         build_button_event (bc->status_icon->priv, bc->event, button);
+         g_idle_add (button_callback, bc);
          break;
+
        default :
          break;
        }
@@ -351,6 +793,8 @@ create_tray_observer (void)
   if (hwnd)
     return hwnd;
 
+  taskbar_created_msg = RegisterWindowMessage("TaskbarCreated");
+
   memset (&wclass, 0, sizeof(WNDCLASS));
   wclass.lpszClassName = "gtkstatusicon-observer";
   wclass.lpfnWndProc   = wndproc;
@@ -360,7 +804,7 @@ create_tray_observer (void)
   if (!klass)
     return NULL;
 
-  hwnd = CreateWindow (MAKEINTRESOURCE(klass),
+  hwnd = CreateWindow (MAKEINTRESOURCE (klass),
                        NULL, WS_POPUP,
                        0, 0, 1, 1, NULL, NULL,
                        hmodule, NULL);
@@ -378,105 +822,189 @@ create_tray_observer (void)
 static void
 gtk_status_icon_init (GtkStatusIcon *status_icon)
 {
-  status_icon->priv = G_TYPE_INSTANCE_GET_PRIVATE (status_icon, GTK_TYPE_STATUS_ICON,
-                                                  GtkStatusIconPrivate);
+  GtkStatusIconPrivate *priv;
+
+  priv = G_TYPE_INSTANCE_GET_PRIVATE (status_icon, GTK_TYPE_STATUS_ICON,
+                                     GtkStatusIconPrivate);
+  status_icon->priv = priv;
   
-  status_icon->priv->storage_type = GTK_IMAGE_EMPTY;
-  status_icon->priv->visible      = TRUE;
+  priv->storage_type = GTK_IMAGE_EMPTY;
+  priv->visible      = TRUE;
 
 #ifdef GDK_WINDOWING_X11
-  status_icon->priv->size         = 0;
-  status_icon->priv->image_width  = 0;
-  status_icon->priv->image_height = 0;
-
-  status_icon->priv->tray_icon = GTK_WIDGET (_gtk_tray_icon_new (NULL));
-
-  gtk_widget_add_events (GTK_WIDGET (status_icon->priv->tray_icon),
-                        GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK);
-
-  g_signal_connect_swapped (status_icon->priv->tray_icon, "button-press-event",
+  priv->size         = 0;
+  priv->image_width  = 0;
+  priv->image_height = 0;
+
+  priv->tray_icon = GTK_WIDGET (_gtk_tray_icon_new (NULL));
+
+  gtk_widget_add_events (GTK_WIDGET (priv->tray_icon),
+                        GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK |
+                        GDK_SCROLL_MASK);
+
+  g_signal_connect_swapped (priv->tray_icon, "key-press-event",
+                           G_CALLBACK (gtk_status_icon_key_press), status_icon);
+  g_signal_connect_swapped (priv->tray_icon, "popup-menu",
+                           G_CALLBACK (gtk_status_icon_popup_menu), status_icon);
+  g_signal_connect_swapped (priv->tray_icon, "notify::embedded",
+                           G_CALLBACK (gtk_status_icon_embedded_changed), status_icon);
+  g_signal_connect_swapped (priv->tray_icon, "notify::orientation",
+                           G_CALLBACK (gtk_status_icon_orientation_changed), status_icon);
+  g_signal_connect_swapped (priv->tray_icon, "button-press-event",
                            G_CALLBACK (gtk_status_icon_button_press), status_icon);
-  status_icon->priv->image = gtk_image_new ();
-  gtk_container_add (GTK_CONTAINER (status_icon->priv->tray_icon),
-                    status_icon->priv->image);
-
-  g_signal_connect_swapped (status_icon->priv->image, "size-allocate",
+  g_signal_connect_swapped (priv->tray_icon, "button-release-event",
+                           G_CALLBACK (gtk_status_icon_button_release), status_icon);
+  g_signal_connect_swapped (priv->tray_icon, "scroll-event",
+                           G_CALLBACK (gtk_status_icon_scroll), status_icon);
+  g_signal_connect_swapped (priv->tray_icon, "query-tooltip",
+                           G_CALLBACK (gtk_status_icon_query_tooltip), status_icon);
+  g_signal_connect_swapped (priv->tray_icon, "screen-changed",
+                           G_CALLBACK (gtk_status_icon_screen_changed), status_icon);
+  priv->image = gtk_image_new ();
+  gtk_widget_set_can_focus (priv->image, TRUE);
+  gtk_container_add (GTK_CONTAINER (priv->tray_icon), priv->image);
+  gtk_widget_show (priv->image);
+
+  g_signal_connect_swapped (priv->image, "size-allocate",
                            G_CALLBACK (gtk_status_icon_size_allocate), status_icon);
 
-  gtk_widget_show (status_icon->priv->image);
-  gtk_widget_show (status_icon->priv->tray_icon);
-
-  status_icon->priv->tooltips = gtk_tooltips_new ();
-  g_object_ref (status_icon->priv->tooltips);
-  gtk_object_sink (GTK_OBJECT (status_icon->priv->tooltips));
 #endif
 
 #ifdef GDK_WINDOWING_WIN32
 
-  /* Code to get position and orientation of Windows taskbar. Not needed
-   * currently, kept for reference.
-   */
-#if 0
+  /* Get position and orientation of Windows taskbar. */
   {
     APPBARDATA abd;
     
     abd.cbSize = sizeof (abd);
     SHAppBarMessage (ABM_GETTASKBARPOS, &abd);
     if (abd.rc.bottom - abd.rc.top > abd.rc.right - abd.rc.left)
-      orientation = GTK_ORIENTATION_VERTICAL;
+      priv->orientation = GTK_ORIENTATION_VERTICAL;
     else
-      orientation = GTK_ORIENTATION_HORIZONTAL;
+      priv->orientation = GTK_ORIENTATION_HORIZONTAL;
   }
-#endif
+
+  priv->last_click_x = priv->last_click_y = 0;
 
   /* Are the system tray icons always 16 pixels square? */
-  status_icon->priv->size         = 16;
-  status_icon->priv->image_width  = 16;
-  status_icon->priv->image_height = 16;
+  priv->size         = 16;
+  priv->image_width  = 16;
+  priv->image_height = 16;
 
-  status_icon->priv->dummy_widget = gtk_label_new ("");
+  priv->dummy_widget = gtk_label_new ("");
 
-  memset (&status_icon->priv->nid, 0, sizeof (status_icon->priv->nid));
+  memset (&priv->nid, 0, sizeof (priv->nid));
 
-  status_icon->priv->nid.hWnd = create_tray_observer ();
-  status_icon->priv->nid.uID = GPOINTER_TO_UINT (status_icon);
-  status_icon->priv->nid.uCallbackMessage = WM_GTK_TRAY_NOTIFICATION;
-  status_icon->priv->nid.uFlags = NIF_MESSAGE;
+  priv->nid.hWnd = create_tray_observer ();
+  priv->nid.uID = GPOINTER_TO_UINT (status_icon);
+  priv->nid.uCallbackMessage = WM_GTK_TRAY_NOTIFICATION;
+  priv->nid.uFlags = NIF_MESSAGE;
 
-  if (!Shell_NotifyIconW (NIM_ADD, &status_icon->priv->nid))
+  if (!Shell_NotifyIconW (NIM_ADD, &priv->nid))
     {
-      g_warning ("%s:%d:Shell_NotifyIcon(NIM_ADD) failed", __FILE__, __LINE__-2);
-      status_icon->priv->nid.hWnd = NULL;
+      g_warning (G_STRLOC ": Shell_NotifyIcon(NIM_ADD) failed");
+      priv->nid.hWnd = NULL;
     }
+
+  status_icons = g_slist_append (status_icons, status_icon);
+
+#endif
+       
+#ifdef GDK_WINDOWING_QUARTZ
+  priv->dummy_widget = gtk_label_new ("");
+
+  QUARTZ_POOL_ALLOC;
+
+  priv->status_item = [[GtkQuartzStatusIcon alloc] initWithStatusIcon:status_icon];
+
+  priv->image_width = priv->image_height = [priv->status_item getHeight];
+  priv->size = priv->image_height;
+
+  QUARTZ_POOL_RELEASE;
+
+#endif 
+}
+
+static GObject*
+gtk_status_icon_constructor (GType                  type,
+                             guint                  n_construct_properties,
+                             GObjectConstructParam *construct_params)
+{
+  GObject *object;
+#ifdef GDK_WINDOWING_X11
+  GtkStatusIcon *status_icon;
+  GtkStatusIconPrivate *priv;
+#endif
+
+  object = G_OBJECT_CLASS (gtk_status_icon_parent_class)->constructor (type,
+                                                                       n_construct_properties,
+                                                                       construct_params);
+
+#ifdef GDK_WINDOWING_X11
+  status_icon = GTK_STATUS_ICON (object);
+  priv = status_icon->priv;
+  
+  if (priv->visible)
+    gtk_widget_show (priv->tray_icon);
 #endif
+
+  return object;
 }
 
 static void
 gtk_status_icon_finalize (GObject *object)
 {
   GtkStatusIcon *status_icon = GTK_STATUS_ICON (object);
+  GtkStatusIconPrivate *priv = status_icon->priv;
 
   gtk_status_icon_disable_blinking (status_icon);
   
   gtk_status_icon_reset_image_data (status_icon);
 
-  if (status_icon->priv->blank_icon)
-    g_object_unref (status_icon->priv->blank_icon);
-  status_icon->priv->blank_icon = NULL;
+  if (priv->blank_icon)
+    g_object_unref (priv->blank_icon);
+  priv->blank_icon = NULL;
 
 #ifdef GDK_WINDOWING_X11
-  if (status_icon->priv->tooltips)
-    g_object_unref (status_icon->priv->tooltips);
-  status_icon->priv->tooltips = NULL;
-
-  gtk_widget_destroy (status_icon->priv->tray_icon);
+  g_signal_handlers_disconnect_by_func (priv->tray_icon,
+                                       gtk_status_icon_key_press, status_icon);
+  g_signal_handlers_disconnect_by_func (priv->tray_icon,
+                                       gtk_status_icon_popup_menu, status_icon);
+  g_signal_handlers_disconnect_by_func (priv->tray_icon,
+                                       gtk_status_icon_embedded_changed, status_icon);
+  g_signal_handlers_disconnect_by_func (priv->tray_icon,
+                                       gtk_status_icon_orientation_changed, status_icon);
+  g_signal_handlers_disconnect_by_func (priv->tray_icon,
+                                       gtk_status_icon_button_press, status_icon);
+  g_signal_handlers_disconnect_by_func (priv->tray_icon,
+                                       gtk_status_icon_button_release, status_icon);
+  g_signal_handlers_disconnect_by_func (priv->tray_icon,
+                                       gtk_status_icon_scroll, status_icon);
+  g_signal_handlers_disconnect_by_func (priv->tray_icon,
+                                       gtk_status_icon_query_tooltip, status_icon);
+  g_signal_handlers_disconnect_by_func (priv->tray_icon,
+                                       gtk_status_icon_screen_changed, status_icon);
+  gtk_widget_destroy (priv->image);
+  gtk_widget_destroy (priv->tray_icon);
 #endif
 
 #ifdef GDK_WINDOWING_WIN32
-  if (status_icon->priv->nid.hWnd != NULL && status_icon->priv->visible)
-    Shell_NotifyIconW (NIM_DELETE, &status_icon->priv->nid);
+  if (priv->nid.hWnd != NULL && priv->visible)
+    Shell_NotifyIconW (NIM_DELETE, &priv->nid);
+  if (priv->nid.hIcon)
+    DestroyIcon (priv->nid.hIcon);
+  g_free (priv->tooltip_text);
 
-  gtk_widget_destroy (status_icon->priv->dummy_widget);
+  gtk_widget_destroy (priv->dummy_widget);
+
+  status_icons = g_slist_remove (status_icons, status_icon);
+#endif
+       
+#ifdef GDK_WINDOWING_QUARTZ
+  QUARTZ_POOL_ALLOC;
+  [priv->status_item release];
+  QUARTZ_POOL_RELEASE;
+  g_free (priv->tooltip_text);
 #endif
 
   G_OBJECT_CLASS (gtk_status_icon_parent_class)->finalize (object);
@@ -504,12 +1032,30 @@ gtk_status_icon_set_property (GObject      *object,
     case PROP_ICON_NAME:
       gtk_status_icon_set_from_icon_name (status_icon, g_value_get_string (value));
       break;
+    case PROP_GICON:
+      gtk_status_icon_set_from_gicon (status_icon, g_value_get_object (value));
+      break;
+    case PROP_SCREEN:
+      gtk_status_icon_set_screen (status_icon, g_value_get_object (value));
+      break;
     case PROP_BLINKING:
       gtk_status_icon_set_blinking (status_icon, g_value_get_boolean (value));
       break;
     case PROP_VISIBLE:
       gtk_status_icon_set_visible (status_icon, g_value_get_boolean (value));
       break;
+    case PROP_HAS_TOOLTIP:
+      gtk_status_icon_set_has_tooltip (status_icon, g_value_get_boolean (value));
+      break;
+    case PROP_TOOLTIP_TEXT:
+      gtk_status_icon_set_tooltip_text (status_icon, g_value_get_string (value));
+      break;
+    case PROP_TOOLTIP_MARKUP:
+      gtk_status_icon_set_tooltip_markup (status_icon, g_value_get_string (value));
+      break;
+    case PROP_TITLE:
+      gtk_status_icon_set_title (status_icon, g_value_get_string (value));
+      break;
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
       break;
@@ -523,17 +1069,39 @@ gtk_status_icon_get_property (GObject    *object,
                              GParamSpec *pspec)
 {
   GtkStatusIcon *status_icon = GTK_STATUS_ICON (object);
+  GtkStatusIconPrivate *priv = status_icon->priv;
+
+  /* The "getter" functions whine if you try to get the wrong
+   * storage type. This function is instead robust against that,
+   * so that GUI builders don't have to jump through hoops
+   * to avoid g_warning
+   */
 
   switch (prop_id)
     {
     case PROP_PIXBUF:
-      g_value_set_object (value, gtk_status_icon_get_pixbuf (status_icon));
+      if (priv->storage_type != GTK_IMAGE_PIXBUF)
+       g_value_set_object (value, NULL);
+      else
+       g_value_set_object (value, gtk_status_icon_get_pixbuf (status_icon));
       break;
     case PROP_STOCK:
-      g_value_set_string (value, gtk_status_icon_get_stock (status_icon));
+      if (priv->storage_type != GTK_IMAGE_STOCK)
+       g_value_set_string (value, NULL);
+      else
+       g_value_set_string (value, gtk_status_icon_get_stock (status_icon));
       break;
     case PROP_ICON_NAME:
-      g_value_set_string (value, gtk_status_icon_get_icon_name (status_icon));
+      if (priv->storage_type != GTK_IMAGE_ICON_NAME)
+       g_value_set_string (value, NULL);
+      else
+       g_value_set_string (value, gtk_status_icon_get_icon_name (status_icon));
+      break;
+    case PROP_GICON:
+      if (priv->storage_type != GTK_IMAGE_GICON)
+        g_value_set_object (value, NULL);
+      else
+        g_value_set_object (value, gtk_status_icon_get_gicon (status_icon));
       break;
     case PROP_STORAGE_TYPE:
       g_value_set_enum (value, gtk_status_icon_get_storage_type (status_icon));
@@ -541,12 +1109,38 @@ gtk_status_icon_get_property (GObject    *object,
     case PROP_SIZE:
       g_value_set_int (value, gtk_status_icon_get_size (status_icon));
       break;
+    case PROP_SCREEN:
+      g_value_set_object (value, gtk_status_icon_get_screen (status_icon));
+      break;
     case PROP_BLINKING:
       g_value_set_boolean (value, gtk_status_icon_get_blinking (status_icon));
       break;
     case PROP_VISIBLE:
       g_value_set_boolean (value, gtk_status_icon_get_visible (status_icon));
       break;
+    case PROP_EMBEDDED:
+      g_value_set_boolean (value, gtk_status_icon_is_embedded (status_icon));
+      break;
+    case PROP_ORIENTATION:
+#ifdef GDK_WINDOWING_X11
+      g_value_set_enum (value, _gtk_tray_icon_get_orientation (GTK_TRAY_ICON (status_icon->priv->tray_icon)));
+#endif
+#ifdef GDK_WINDOWING_WIN32
+      g_value_set_enum (value, status_icon->priv->orientation);
+#endif
+      break;
+    case PROP_HAS_TOOLTIP:
+      g_value_set_boolean (value, gtk_status_icon_get_has_tooltip (status_icon));
+      break;
+    case PROP_TOOLTIP_TEXT:
+      g_value_set_string (value, gtk_status_icon_get_tooltip_text (status_icon));
+      break;
+    case PROP_TOOLTIP_MARKUP:
+      g_value_set_string (value, gtk_status_icon_get_tooltip_markup (status_icon));
+      break;
+    case PROP_TITLE:
+      g_value_set_string (value, gtk_status_icon_get_title (status_icon));
+      break;
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
       break;
@@ -651,6 +1245,25 @@ gtk_status_icon_new_from_icon_name (const gchar *icon_name)
                       NULL);
 }
 
+/**
+ * gtk_status_icon_new_from_gicon:
+ * @icon: a #GIcon
+ *
+ * Creates a status icon displaying a #GIcon. If the icon is a
+ * themed icon, it will be updated when the theme changes.
+ *
+ * Return value: a new #GtkStatusIcon
+ *
+ * Since: 2.14
+ **/
+GtkStatusIcon *
+gtk_status_icon_new_from_gicon (GIcon *icon)
+{
+  return g_object_new (GTK_TYPE_STATUS_ICON,
+                      "gicon", icon,
+                      NULL);
+}
+
 static void
 emit_activate_signal (GtkStatusIcon *status_icon)
 {
@@ -690,33 +1303,32 @@ emit_size_changed_signal (GtkStatusIcon *status_icon,
 static GdkPixbuf *
 gtk_status_icon_blank_icon (GtkStatusIcon *status_icon)
 {
-  if (status_icon->priv->blank_icon)
+  GtkStatusIconPrivate *priv = status_icon->priv;
+
+  if (priv->blank_icon)
     {
       gint width, height;
 
-      width  = gdk_pixbuf_get_width (status_icon->priv->blank_icon);
-      height = gdk_pixbuf_get_height (status_icon->priv->blank_icon);
+      width  = gdk_pixbuf_get_width (priv->blank_icon);
+      height = gdk_pixbuf_get_height (priv->blank_icon);
 
 
-      if (width == status_icon->priv->image_width && 
-         height == status_icon->priv->image_height)
-       {
-         return status_icon->priv->blank_icon;
-       }
+      if (width == priv->image_width && height == priv->image_height)
+       return priv->blank_icon;
       else
        {
-         g_object_unref (status_icon->priv->blank_icon);
-         status_icon->priv->blank_icon = NULL;
+         g_object_unref (priv->blank_icon);
+         priv->blank_icon = NULL;
        }
     }
 
-  status_icon->priv->blank_icon = gdk_pixbuf_new (GDK_COLORSPACE_RGB, TRUE, 8,
-                                                 status_icon->priv->image_width, 
-                                                 status_icon->priv->image_height);
-  if (status_icon->priv->blank_icon)
-    gdk_pixbuf_fill (status_icon->priv->blank_icon, 0);
+  priv->blank_icon = gdk_pixbuf_new (GDK_COLORSPACE_RGB, TRUE, 8,
+                                    priv->image_width, 
+                                    priv->image_height);
+  if (priv->blank_icon)
+    gdk_pixbuf_fill (priv->blank_icon, 0);
 
-  return status_icon->priv->blank_icon;
+  return priv->blank_icon;
 }
 
 #ifdef GDK_WINDOWING_X11
@@ -740,7 +1352,7 @@ find_icon_size (GtkWidget *widget,
   dist = G_MAXINT;
   size = GTK_ICON_SIZE_MENU;
 
-  for (s = GTK_ICON_SIZE_MENU; s < GTK_ICON_SIZE_DIALOG; s++)
+  for (s = GTK_ICON_SIZE_MENU; s <= GTK_ICON_SIZE_DIALOG; s++)
     {
       if (gtk_icon_size_lookup_for_settings (settings, s, &w, &h) &&
          w <= pixel_size && h <= pixel_size)
@@ -762,29 +1374,42 @@ find_icon_size (GtkWidget *widget,
 static void
 gtk_status_icon_update_image (GtkStatusIcon *status_icon)
 {
-  if (status_icon->priv->blink_off)
+  GtkStatusIconPrivate *priv = status_icon->priv;
+#ifdef GDK_WINDOWING_WIN32
+  HICON prev_hicon;
+#endif
+
+  if (priv->blink_off)
     {
 #ifdef GDK_WINDOWING_X11
-      gtk_image_set_from_pixbuf (GTK_IMAGE (status_icon->priv->image),
+      gtk_image_set_from_pixbuf (GTK_IMAGE (priv->image),
                                 gtk_status_icon_blank_icon (status_icon));
 #endif
 #ifdef GDK_WINDOWING_WIN32
-      status_icon->priv->nid.hIcon = gdk_win32_pixbuf_to_hicon_libgtk_only (gtk_status_icon_blank_icon (status_icon));
-      status_icon->priv->nid.uFlags |= NIF_ICON;
-      if (status_icon->priv->nid.hWnd != NULL && status_icon->priv->visible)
-       if (!Shell_NotifyIconW (NIM_MODIFY, &status_icon->priv->nid))
-         g_warning ("%s:%d:Shell_NotifyIcon(NIM_MODIFY) failed", __FILE__, __LINE__-1);
+      prev_hicon = priv->nid.hIcon;
+      priv->nid.hIcon = gdk_win32_pixbuf_to_hicon_libgtk_only (gtk_status_icon_blank_icon (status_icon));
+      priv->nid.uFlags |= NIF_ICON;
+      if (priv->nid.hWnd != NULL && priv->visible)
+       if (!Shell_NotifyIconW (NIM_MODIFY, &priv->nid))
+         g_warning (G_STRLOC ": Shell_NotifyIcon(NIM_MODIFY) failed");
+      if (prev_hicon)
+       DestroyIcon (prev_hicon);
+#endif
+#ifdef GDK_WINDOWING_QUARTZ
+      QUARTZ_POOL_ALLOC;
+      [priv->status_item setImage:gtk_status_icon_blank_icon (status_icon)];
+      QUARTZ_POOL_RELEASE;
 #endif
       return;
     }
 
-  switch (status_icon->priv->storage_type)
+  switch (priv->storage_type)
     {
     case GTK_IMAGE_PIXBUF:
       {
        GdkPixbuf *pixbuf;
 
-       pixbuf = status_icon->priv->image_data.pixbuf;
+       pixbuf = priv->image_data.pixbuf;
 
        if (pixbuf)
          {
@@ -793,45 +1418,53 @@ gtk_status_icon_update_image (GtkStatusIcon *status_icon)
            gint width;
            gint height;
 
-           size = status_icon->priv->size;
+           size = priv->size;
 
            width  = gdk_pixbuf_get_width  (pixbuf);
            height = gdk_pixbuf_get_height (pixbuf);
 
            if (width > size || height > size)
-             {
-               scaled = gdk_pixbuf_scale_simple (pixbuf,
-                                                 MIN (size, width),
-                                                 MIN (size, height),
-                                                 GDK_INTERP_BILINEAR);
-             }
+             scaled = gdk_pixbuf_scale_simple (pixbuf,
+                                               MIN (size, width),
+                                               MIN (size, height),
+                                               GDK_INTERP_BILINEAR);
            else
-             {
-               scaled = g_object_ref (pixbuf);
-             }
+             scaled = g_object_ref (pixbuf);
 
 #ifdef GDK_WINDOWING_X11
-           gtk_image_set_from_pixbuf (GTK_IMAGE (status_icon->priv->image), scaled);
+           gtk_image_set_from_pixbuf (GTK_IMAGE (priv->image), scaled);
 #endif
 #ifdef GDK_WINDOWING_WIN32
-           status_icon->priv->nid.hIcon = gdk_win32_pixbuf_to_hicon_libgtk_only (scaled);
-           status_icon->priv->nid.uFlags |= NIF_ICON;
-           if (status_icon->priv->nid.hWnd != NULL && status_icon->priv->visible)
-             if (!Shell_NotifyIconW (NIM_MODIFY, &status_icon->priv->nid))
-                 g_warning ("%s:%d:Shell_NotifyIcon(NIM_MODIFY) failed", __FILE__, __LINE__-1);
+           prev_hicon = priv->nid.hIcon;
+           priv->nid.hIcon = gdk_win32_pixbuf_to_hicon_libgtk_only (scaled);
+           priv->nid.uFlags |= NIF_ICON;
+           if (priv->nid.hWnd != NULL && priv->visible)
+             if (!Shell_NotifyIconW (NIM_MODIFY, &priv->nid))
+                 g_warning (G_STRLOC ": Shell_NotifyIcon(NIM_MODIFY) failed");
+           if (prev_hicon)
+             DestroyIcon (prev_hicon);
+#endif
+#ifdef GDK_WINDOWING_QUARTZ
+      QUARTZ_POOL_ALLOC;
+      [priv->status_item setImage:scaled];
+      QUARTZ_POOL_RELEASE;
 #endif
+                       
            g_object_unref (scaled);
          }
        else
          {
 #ifdef GDK_WINDOWING_X11
-           gtk_image_set_from_pixbuf (GTK_IMAGE (status_icon->priv->image), NULL);
+           gtk_image_set_from_pixbuf (GTK_IMAGE (priv->image), NULL);
 #endif
 #ifdef GDK_WINDOWING_WIN32
-           status_icon->priv->nid.uFlags &= ~NIF_ICON;
-           if (status_icon->priv->nid.hWnd != NULL && status_icon->priv->visible)
-             if (!Shell_NotifyIconW (NIM_MODIFY, &status_icon->priv->nid))
-               g_warning ("%s:%d:Shell_NotifyIcon(NIM_MODIFY) failed", __FILE__, __LINE__-1);
+           priv->nid.uFlags &= ~NIF_ICON;
+           if (priv->nid.hWnd != NULL && priv->visible)
+             if (!Shell_NotifyIconW (NIM_MODIFY, &priv->nid))
+               g_warning (G_STRLOC ": Shell_NotifyIcon(NIM_MODIFY) failed");
+#endif
+#ifdef GDK_WINDOWING_QUARTZ
+      [priv->status_item setImage:NULL];
 #endif
          }
       }
@@ -840,25 +1473,43 @@ gtk_status_icon_update_image (GtkStatusIcon *status_icon)
     case GTK_IMAGE_STOCK:
       {
 #ifdef GDK_WINDOWING_X11
-       GtkIconSize size = find_icon_size (status_icon->priv->image, status_icon->priv->size);
-       gtk_image_set_from_stock (GTK_IMAGE (status_icon->priv->image),
-                                 status_icon->priv->image_data.stock_id,
+       GtkIconSize size = find_icon_size (priv->image, priv->size);
+       gtk_image_set_from_stock (GTK_IMAGE (priv->image),
+                                 priv->image_data.stock_id,
                                  size);
 #endif
 #ifdef GDK_WINDOWING_WIN32
        {
          GdkPixbuf *pixbuf =
-           gtk_widget_render_icon (status_icon->priv->dummy_widget,
-                                   status_icon->priv->image_data.stock_id,
+           gtk_widget_render_icon (priv->dummy_widget,
+                                   priv->image_data.stock_id,
                                    GTK_ICON_SIZE_SMALL_TOOLBAR,
                                    NULL);
-         status_icon->priv->nid.hIcon = gdk_win32_pixbuf_to_hicon_libgtk_only (pixbuf);
-         status_icon->priv->nid.uFlags |= NIF_ICON;
-         if (status_icon->priv->nid.hWnd != NULL && status_icon->priv->visible)
-           if (!Shell_NotifyIconW (NIM_MODIFY, &status_icon->priv->nid))
-             g_warning ("%s:%d:Shell_NotifyIcon(NIM_MODIFY) failed", __FILE__, __LINE__-1);
+
+         prev_hicon = priv->nid.hIcon;
+         priv->nid.hIcon = gdk_win32_pixbuf_to_hicon_libgtk_only (pixbuf);
+         priv->nid.uFlags |= NIF_ICON;
+         if (priv->nid.hWnd != NULL && priv->visible)
+           if (!Shell_NotifyIconW (NIM_MODIFY, &priv->nid))
+             g_warning (G_STRLOC ": Shell_NotifyIcon(NIM_MODIFY) failed");
+         if (prev_hicon)
+           DestroyIcon (prev_hicon);
          g_object_unref (pixbuf);
        }
+#endif
+#ifdef GDK_WINDOWING_QUARTZ
+       {
+         GdkPixbuf *pixbuf;
+
+         pixbuf = gtk_widget_render_icon (priv->dummy_widget,
+                                          priv->image_data.stock_id,
+                                          GTK_ICON_SIZE_SMALL_TOOLBAR,
+                                          NULL);
+         QUARTZ_POOL_ALLOC;
+         [priv->status_item setImage:pixbuf];
+         QUARTZ_POOL_RELEASE;
+         g_object_unref (pixbuf);
+       }       
 #endif
       }
       break;
@@ -866,43 +1517,116 @@ gtk_status_icon_update_image (GtkStatusIcon *status_icon)
     case GTK_IMAGE_ICON_NAME:
       {
 #ifdef GDK_WINDOWING_X11
-       GtkIconSize size = find_icon_size (status_icon->priv->image, status_icon->priv->size);
-       gtk_image_set_from_icon_name (GTK_IMAGE (status_icon->priv->image),
-                                     status_icon->priv->image_data.icon_name,
+       GtkIconSize size = find_icon_size (priv->image, priv->size);
+       gtk_image_set_from_icon_name (GTK_IMAGE (priv->image),
+                                     priv->image_data.icon_name,
                                      size);
 #endif
 #ifdef GDK_WINDOWING_WIN32
        {
          GdkPixbuf *pixbuf =
            gtk_icon_theme_load_icon (gtk_icon_theme_get_default (),
-                                     status_icon->priv->image_data.icon_name,
-                                     status_icon->priv->size,
+                                     priv->image_data.icon_name,
+                                     priv->size,
                                      0, NULL);
          
-         status_icon->priv->nid.hIcon = gdk_win32_pixbuf_to_hicon_libgtk_only (pixbuf);
-         status_icon->priv->nid.uFlags |= NIF_ICON;
-         if (status_icon->priv->nid.hWnd != NULL && status_icon->priv->visible)
-           if (!Shell_NotifyIconW (NIM_MODIFY, &status_icon->priv->nid))
-             g_warning ("%s:%d:Shell_NotifyIcon(NIM_MODIFY) failed", __FILE__, __LINE__-1);
+         prev_hicon = priv->nid.hIcon;
+         priv->nid.hIcon = gdk_win32_pixbuf_to_hicon_libgtk_only (pixbuf);
+         priv->nid.uFlags |= NIF_ICON;
+         if (priv->nid.hWnd != NULL && priv->visible)
+           if (!Shell_NotifyIconW (NIM_MODIFY, &priv->nid))
+             g_warning (G_STRLOC ": Shell_NotifyIcon(NIM_MODIFY) failed");
+         if (prev_hicon)
+           DestroyIcon (prev_hicon);
+         g_object_unref (pixbuf);
+       }
+#endif
+#ifdef GDK_WINDOWING_QUARTZ
+       {
+         GdkPixbuf *pixbuf;
+
+         pixbuf = gtk_icon_theme_load_icon (gtk_icon_theme_get_default (),
+                                            priv->image_data.icon_name,
+                                            priv->size,
+                                            0, NULL);
+
+         QUARTZ_POOL_ALLOC;
+         [priv->status_item setImage:pixbuf];
+         QUARTZ_POOL_RELEASE;
          g_object_unref (pixbuf);
        }
 #endif
+       
       }
       break;
-      
-    case GTK_IMAGE_EMPTY:
+
+    case GTK_IMAGE_GICON:
+      {
 #ifdef GDK_WINDOWING_X11
-      gtk_image_set_from_pixbuf (GTK_IMAGE (status_icon->priv->image), NULL);
+        GtkIconSize size = find_icon_size (priv->image, priv->size);
+        gtk_image_set_from_gicon (GTK_IMAGE (priv->image),
+                                  priv->image_data.gicon,
+                                  size);
 #endif
 #ifdef GDK_WINDOWING_WIN32
-      status_icon->priv->nid.uFlags &= ~NIF_ICON;
-      if (status_icon->priv->nid.hWnd != NULL && status_icon->priv->visible)
-       if (!Shell_NotifyIconW (NIM_MODIFY, &status_icon->priv->nid))
-         g_warning ("%s:%d:Shell_NotifyIcon(NIM_MODIFY) failed", __FILE__, __LINE__-1);
+      {
+        GtkIconInfo *info =
+        gtk_icon_theme_lookup_by_gicon (gtk_icon_theme_get_default (),
+                                        priv->image_data.gicon,
+                                        priv->size,
+                                        0);
+        GdkPixbuf *pixbuf = gtk_icon_info_load_icon (info, NULL);
+
+        prev_hicon = priv->nid.hIcon;
+        priv->nid.hIcon = gdk_win32_pixbuf_to_hicon_libgtk_only (pixbuf);
+        priv->nid.uFlags |= NIF_ICON;
+        if (priv->nid.hWnd != NULL && priv->visible)
+          if (!Shell_NotifyIconW (NIM_MODIFY, &priv->nid))
+            g_warning (G_STRLOC ": Shell_NotifyIcon(NIM_MODIFY) failed");
+          if (prev_hicon)
+            DestroyIcon (prev_hicon);
+          g_object_unref (pixbuf);
+      }
+#endif
+#ifdef GDK_WINDOWING_QUARTZ
+      {
+        GtkIconInfo *info =
+        gtk_icon_theme_lookup_by_gicon (gtk_icon_theme_get_default (),
+                                        priv->image_data.gicon,
+                                        priv->size,
+                                        0);
+        GdkPixbuf *pixbuf = gtk_icon_info_load_icon (info, NULL);
+
+        QUARTZ_POOL_ALLOC;
+        [priv->status_item setImage:pixbuf];
+        QUARTZ_POOL_RELEASE;
+        g_object_unref (pixbuf);
+      }
 #endif
+
+      }
       break;
-    default:
-      g_assert_not_reached ();
+
+    case GTK_IMAGE_EMPTY:
+#ifdef GDK_WINDOWING_X11
+      gtk_image_set_from_pixbuf (GTK_IMAGE (priv->image), NULL);
+#endif
+#ifdef GDK_WINDOWING_WIN32
+      priv->nid.uFlags &= ~NIF_ICON;
+      if (priv->nid.hWnd != NULL && priv->visible)
+       if (!Shell_NotifyIconW (NIM_MODIFY, &priv->nid))
+         g_warning (G_STRLOC ": Shell_NotifyIcon(NIM_MODIFY) failed");
+#endif
+#ifdef GDK_WINDOWING_QUARTZ
+        {
+          QUARTZ_POOL_ALLOC;
+          [priv->status_item setImage:NULL];
+          QUARTZ_POOL_RELEASE;
+        }
+#endif
+      break;
+    default:
+      g_assert_not_reached ();
       break;
     }
 }
@@ -913,38 +1637,101 @@ static void
 gtk_status_icon_size_allocate (GtkStatusIcon *status_icon,
                               GtkAllocation *allocation)
 {
+  GtkStatusIconPrivate *priv = status_icon->priv;
   GtkOrientation orientation;
   gint size;
 
-  orientation = _gtk_tray_icon_get_orientation (GTK_TRAY_ICON (status_icon->priv->tray_icon));
+  orientation = _gtk_tray_icon_get_orientation (GTK_TRAY_ICON (priv->tray_icon));
 
   if (orientation == GTK_ORIENTATION_HORIZONTAL)
     size = allocation->height;
   else
     size = allocation->width;
 
-  status_icon->priv->image_width = allocation->width - GTK_MISC (status_icon->priv->image)->xpad * 2;
-  status_icon->priv->image_height = allocation->height - GTK_MISC (status_icon->priv->image)->ypad * 2;
+  priv->image_width = allocation->width - GTK_MISC (priv->image)->xpad * 2;
+  priv->image_height = allocation->height - GTK_MISC (priv->image)->ypad * 2;
 
-  if (status_icon->priv->size != size)
+  if (priv->size != size)
     {
-      status_icon->priv->size = size;
+      priv->size = size;
 
       g_object_notify (G_OBJECT (status_icon), "size");
 
       if (!emit_size_changed_signal (status_icon, size))
-       {
-         gtk_status_icon_update_image (status_icon);
-       }
+       gtk_status_icon_update_image (status_icon);
+    }
+}
+
+static void
+gtk_status_icon_screen_changed (GtkStatusIcon *status_icon,
+                               GdkScreen *old_screen)
+{
+  GtkStatusIconPrivate *priv = status_icon->priv;
+
+  if (gtk_widget_get_screen (priv->tray_icon) != old_screen)
+    {
+      g_object_notify (G_OBJECT (status_icon), "screen");
     }
 }
 
 #endif
 
+#ifdef GDK_WINDOWING_X11
+
+static void
+gtk_status_icon_embedded_changed (GtkStatusIcon *status_icon)
+{
+  g_object_notify (G_OBJECT (status_icon), "embedded");
+}
+
+static void
+gtk_status_icon_orientation_changed (GtkStatusIcon *status_icon)
+{
+  g_object_notify (G_OBJECT (status_icon), "orientation");
+}
+
+static gboolean
+gtk_status_icon_key_press (GtkStatusIcon  *status_icon,
+                          GdkEventKey    *event)
+{
+  guint state, keyval;
+
+  state = event->state & gtk_accelerator_get_default_mod_mask ();
+  keyval = event->keyval;
+  if (state == 0 &&
+      (keyval == GDK_Return ||
+       keyval == GDK_KP_Enter ||
+       keyval == GDK_ISO_Enter ||
+       keyval == GDK_space ||
+       keyval == GDK_KP_Space))
+    {
+      emit_activate_signal (status_icon);
+      return TRUE;
+    }
+
+  return FALSE;
+}
+
+static void
+gtk_status_icon_popup_menu (GtkStatusIcon  *status_icon)
+{
+  emit_popup_menu_signal (status_icon, 0, gtk_get_current_event_time ());
+}
+
+#endif
+
 static gboolean
 gtk_status_icon_button_press (GtkStatusIcon  *status_icon,
                              GdkEventButton *event)
 {
+  gboolean handled = FALSE;
+
+  g_signal_emit (status_icon,
+                status_icon_signals [BUTTON_PRESS_EVENT_SIGNAL], 0,
+                event, &handled);
+  if (handled)
+    return TRUE;
+
   if (event->button == 1 && event->type == GDK_BUTTON_PRESS)
     {
       emit_activate_signal (status_icon);
@@ -959,41 +1746,89 @@ gtk_status_icon_button_press (GtkStatusIcon  *status_icon,
   return FALSE;
 }
 
+static gboolean
+gtk_status_icon_button_release (GtkStatusIcon  *status_icon,
+                               GdkEventButton *event)
+{
+  gboolean handled = FALSE;
+  g_signal_emit (status_icon,
+                status_icon_signals [BUTTON_RELEASE_EVENT_SIGNAL], 0,
+                event, &handled);
+  return handled;
+}
+
+#ifdef GDK_WINDOWING_X11
+static gboolean
+gtk_status_icon_scroll (GtkStatusIcon  *status_icon,
+                       GdkEventScroll *event)
+{
+  gboolean handled = FALSE;
+  g_signal_emit (status_icon,
+                status_icon_signals [SCROLL_EVENT_SIGNAL], 0,
+                event, &handled);
+  return handled;
+}
+
+static gboolean
+gtk_status_icon_query_tooltip (GtkStatusIcon *status_icon,
+                              gint           x,
+                              gint           y,
+                              gboolean       keyboard_tip,
+                              GtkTooltip    *tooltip)
+{
+  gboolean handled = FALSE;
+  g_signal_emit (status_icon,
+                status_icon_signals [QUERY_TOOLTIP_SIGNAL], 0,
+                x, y, keyboard_tip, tooltip, &handled);
+  return handled;
+}
+#endif /* GDK_WINDOWING_X11 */
+
 static void
 gtk_status_icon_reset_image_data (GtkStatusIcon *status_icon)
 {
-  status_icon->priv->storage_type = GTK_IMAGE_EMPTY;
-  g_object_notify (G_OBJECT (status_icon), "storage-type");
+  GtkStatusIconPrivate *priv = status_icon->priv;
 
-  switch (status_icon->priv->storage_type)
+  switch (priv->storage_type)
   {
     case GTK_IMAGE_PIXBUF:
-      if (status_icon->priv->image_data.pixbuf)
-       g_object_unref (status_icon->priv->image_data.pixbuf);
-      status_icon->priv->image_data.pixbuf = NULL;
+      if (priv->image_data.pixbuf)
+       g_object_unref (priv->image_data.pixbuf);
+      priv->image_data.pixbuf = NULL;
       g_object_notify (G_OBJECT (status_icon), "pixbuf");
       break;
 
     case GTK_IMAGE_STOCK:
-      g_free (status_icon->priv->image_data.stock_id);
-      status_icon->priv->image_data.stock_id = NULL;
+      g_free (priv->image_data.stock_id);
+      priv->image_data.stock_id = NULL;
 
       g_object_notify (G_OBJECT (status_icon), "stock");
       break;
       
     case GTK_IMAGE_ICON_NAME:
-      g_free (status_icon->priv->image_data.icon_name);
-      status_icon->priv->image_data.icon_name = NULL;
+      g_free (priv->image_data.icon_name);
+      priv->image_data.icon_name = NULL;
 
       g_object_notify (G_OBJECT (status_icon), "icon-name");
       break;
-      
+
+    case GTK_IMAGE_GICON:
+      if (priv->image_data.gicon)
+        g_object_unref (priv->image_data.gicon);
+      priv->image_data.gicon = NULL;
+
+      g_object_notify (G_OBJECT (status_icon), "gicon");
+      break;
+
     case GTK_IMAGE_EMPTY:
       break;
     default:
       g_assert_not_reached ();
       break;
   }
+
+  priv->storage_type = GTK_IMAGE_EMPTY;
+  g_object_notify (G_OBJECT (status_icon), "storage-type");
 }
 
 static void
@@ -1001,29 +1836,35 @@ gtk_status_icon_set_image (GtkStatusIcon *status_icon,
                           GtkImageType   storage_type,
                           gpointer       data)
 {
+  GtkStatusIconPrivate *priv = status_icon->priv;
+
   g_object_freeze_notify (G_OBJECT (status_icon));
 
   gtk_status_icon_reset_image_data (status_icon);
 
-  status_icon->priv->storage_type = storage_type;
+  priv->storage_type = storage_type;
   g_object_notify (G_OBJECT (status_icon), "storage-type");
 
   switch (storage_type) 
     {
     case GTK_IMAGE_PIXBUF:
-      status_icon->priv->image_data.pixbuf = (GdkPixbuf *)data;
+      priv->image_data.pixbuf = (GdkPixbuf *)data;
       g_object_notify (G_OBJECT (status_icon), "pixbuf");
       break;
     case GTK_IMAGE_STOCK:
-      status_icon->priv->image_data.stock_id = g_strdup ((const gchar *)data);
+      priv->image_data.stock_id = g_strdup ((const gchar *)data);
       g_object_notify (G_OBJECT (status_icon), "stock");
       break;
     case GTK_IMAGE_ICON_NAME:
-      status_icon->priv->image_data.icon_name = g_strdup ((const gchar *)data);
+      priv->image_data.icon_name = g_strdup ((const gchar *)data);
       g_object_notify (G_OBJECT (status_icon), "icon-name");
       break;
+    case GTK_IMAGE_GICON:
+      priv->image_data.gicon = (GIcon *)data;
+      g_object_notify (G_OBJECT (status_icon), "gicon");
+      break;
     default:
-      g_warning ("Image type %d not handled by GtkStatusIcon", storage_type);
+      g_warning ("Image type %u not handled by GtkStatusIcon", storage_type);
     }
 
   g_object_thaw_notify (G_OBJECT (status_icon));
@@ -1034,9 +1875,9 @@ gtk_status_icon_set_image (GtkStatusIcon *status_icon,
 /**
  * gtk_status_icon_set_from_pixbuf:
  * @status_icon: a #GtkStatusIcon
- * @pixbuf: a #GdkPixbuf or %NULL
- * 
- * Makes @status_icon display @pixbuf. 
+ * @pixbuf: (allow-none): a #GdkPixbuf or %NULL
+ *
+ * Makes @status_icon display @pixbuf.
  * See gtk_status_icon_new_from_pixbuf() for details.
  *
  * Since: 2.10
@@ -1125,9 +1966,33 @@ gtk_status_icon_set_from_icon_name (GtkStatusIcon *status_icon,
                             (gpointer) icon_name);
 }
 
+/**
+ * gtk_status_icon_set_from_gicon:
+ * @status_icon: a #GtkStatusIcon
+ * @icon: a GIcon
+ *
+ * Makes @status_icon display the #GIcon.
+ * See gtk_status_icon_new_from_gicon() for details.
+ *
+ * Since: 2.14
+ **/
+void
+gtk_status_icon_set_from_gicon (GtkStatusIcon *status_icon,
+                                GIcon         *icon)
+{
+  g_return_if_fail (GTK_IS_STATUS_ICON (status_icon));
+  g_return_if_fail (icon != NULL);
+
+  if (icon)
+    g_object_ref (icon);
+
+  gtk_status_icon_set_image (status_icon, GTK_IMAGE_GICON,
+                             (gpointer) icon);
+}
+
 /**
  * gtk_status_icon_get_storage_type:
- * @status_icon: 
+ * @status_icon: a #GtkStatusIcon
  * 
  * Gets the type of representation being used by the #GtkStatusIcon
  * to store image data. If the #GtkStatusIcon has no image data,
@@ -1161,13 +2026,19 @@ gtk_status_icon_get_storage_type (GtkStatusIcon *status_icon)
 GdkPixbuf *
 gtk_status_icon_get_pixbuf (GtkStatusIcon *status_icon)
 {
+  GtkStatusIconPrivate *priv;
+
   g_return_val_if_fail (GTK_IS_STATUS_ICON (status_icon), NULL);
-  g_return_val_if_fail (status_icon->priv->storage_type == GTK_IMAGE_PIXBUF ||
-                       status_icon->priv->storage_type == GTK_IMAGE_EMPTY, NULL);
-  if (status_icon->priv->storage_type == GTK_IMAGE_EMPTY)
-    status_icon->priv->image_data.pixbuf = NULL;
 
-  return status_icon->priv->image_data.pixbuf;
+  priv = status_icon->priv;
+
+  g_return_val_if_fail (priv->storage_type == GTK_IMAGE_PIXBUF ||
+                       priv->storage_type == GTK_IMAGE_EMPTY, NULL);
+
+  if (priv->storage_type == GTK_IMAGE_EMPTY)
+    priv->image_data.pixbuf = NULL;
+
+  return priv->image_data.pixbuf;
 }
 
 /**
@@ -1188,14 +2059,19 @@ gtk_status_icon_get_pixbuf (GtkStatusIcon *status_icon)
 G_CONST_RETURN gchar *
 gtk_status_icon_get_stock (GtkStatusIcon *status_icon)
 {
+  GtkStatusIconPrivate *priv;
+
   g_return_val_if_fail (GTK_IS_STATUS_ICON (status_icon), NULL);
-  g_return_val_if_fail (status_icon->priv->storage_type == GTK_IMAGE_STOCK ||
-                       status_icon->priv->storage_type == GTK_IMAGE_EMPTY, NULL);
+
+  priv = status_icon->priv;
+
+  g_return_val_if_fail (priv->storage_type == GTK_IMAGE_STOCK ||
+                       priv->storage_type == GTK_IMAGE_EMPTY, NULL);
   
-  if (status_icon->priv->storage_type == GTK_IMAGE_EMPTY)
-    status_icon->priv->image_data.stock_id = NULL;
+  if (priv->storage_type == GTK_IMAGE_EMPTY)
+    priv->image_data.stock_id = NULL;
 
-  return status_icon->priv->image_data.stock_id;
+  return priv->image_data.stock_id;
 }
 
 /**
@@ -1215,14 +2091,53 @@ gtk_status_icon_get_stock (GtkStatusIcon *status_icon)
 G_CONST_RETURN gchar *
 gtk_status_icon_get_icon_name (GtkStatusIcon *status_icon)
 {
+  GtkStatusIconPrivate *priv;
+  
   g_return_val_if_fail (GTK_IS_STATUS_ICON (status_icon), NULL);
-  g_return_val_if_fail (status_icon->priv->storage_type == GTK_IMAGE_ICON_NAME ||
-                       status_icon->priv->storage_type == GTK_IMAGE_EMPTY, NULL);
 
-  if (status_icon->priv->storage_type == GTK_IMAGE_EMPTY)
-    status_icon->priv->image_data.icon_name = NULL;
+  priv = status_icon->priv;
 
-  return status_icon->priv->image_data.icon_name;
+  g_return_val_if_fail (priv->storage_type == GTK_IMAGE_ICON_NAME ||
+                       priv->storage_type == GTK_IMAGE_EMPTY, NULL);
+
+  if (priv->storage_type == GTK_IMAGE_EMPTY)
+    priv->image_data.icon_name = NULL;
+
+  return priv->image_data.icon_name;
+}
+
+/**
+ * gtk_status_icon_get_gicon:
+ * @status_icon: a #GtkStatusIcon
+ *
+ * Retrieves the #GIcon being displayed by the #GtkStatusIcon.
+ * The storage type of the status icon must be %GTK_IMAGE_EMPTY or
+ * %GTK_IMAGE_GICON (see gtk_status_icon_get_storage_type()).
+ * The caller of this function does not own a reference to the
+ * returned #GIcon.
+ *
+ * If this function fails, @icon is left unchanged;
+ *
+ * Returns: the displayed icon, or %NULL if the image is empty
+ *
+ * Since: 2.14
+ **/
+GIcon *
+gtk_status_icon_get_gicon (GtkStatusIcon *status_icon)
+{
+  GtkStatusIconPrivate *priv;
+
+  g_return_val_if_fail (GTK_IS_STATUS_ICON (status_icon), NULL);
+
+  priv = status_icon->priv;
+
+  g_return_val_if_fail (priv->storage_type == GTK_IMAGE_GICON ||
+                        priv->storage_type == GTK_IMAGE_EMPTY, NULL);
+
+  if (priv->storage_type == GTK_IMAGE_EMPTY)
+    priv->image_data.gicon = NULL;
+
+  return priv->image_data.gicon;
 }
 
 /**
@@ -1234,6 +2149,9 @@ gtk_status_icon_get_icon_name (GtkStatusIcon *status_icon)
  * if the size of the notification area changes. For other
  * storage types, the size-changed signal can be used to
  * react to size changes.
+ *
+ * Note that the returned size is only meaningful while the 
+ * status icon is embedded (see gtk_status_icon_is_embedded()).
  * 
  * Return value: the size that is available for the image
  *
@@ -1247,47 +2165,74 @@ gtk_status_icon_get_size (GtkStatusIcon *status_icon)
   return status_icon->priv->size;
 }
 
+/**
+ * gtk_status_icon_set_screen:
+ * @status_icon: a #GtkStatusIcon
+ * @screen: a #GdkScreen
+ *
+ * Sets the #GdkScreen where @status_icon is displayed; if
+ * the icon is already mapped, it will be unmapped, and
+ * then remapped on the new screen.
+ *
+ * Since: 2.12
+ */
+void
+gtk_status_icon_set_screen (GtkStatusIcon *status_icon,
+                            GdkScreen     *screen)
+{
+  g_return_if_fail (GDK_IS_SCREEN (screen));
+
+#ifdef GDK_WINDOWING_X11
+  gtk_window_set_screen (GTK_WINDOW (status_icon->priv->tray_icon), screen);
+#endif
+}
+
+/** 
+ * gtk_status_icon_get_screen:
+ * @status_icon: a #GtkStatusIcon
+ *
+ * Returns the #GdkScreen associated with @status_icon.
+ *
+ * Return value: a #GdkScreen.
+ *
+ * Since: 2.12
+ */
+GdkScreen *
+gtk_status_icon_get_screen (GtkStatusIcon *status_icon)
+{
+  g_return_val_if_fail (GTK_IS_STATUS_ICON (status_icon), NULL);
+
+#ifdef GDK_WINDOWING_X11   
+  return gtk_window_get_screen (GTK_WINDOW (status_icon->priv->tray_icon));
+#else
+  return gdk_screen_get_default ();
+#endif
+}
+
 /**
  * gtk_status_icon_set_tooltip:
  * @status_icon: a #GtkStatusIcon
- * @tooltip_text: the tooltip text, or %NULL
- * 
+ * @tooltip_text: (allow-none): the tooltip text, or %NULL
+ *
  * Sets the tooltip of the status icon.
- * 
+ *
  * Since: 2.10
- **/ 
+ *
+ * Deprecated: 2.16: Use gtk_status_icon_set_tooltip_text() instead.
+ */
 void
 gtk_status_icon_set_tooltip (GtkStatusIcon *status_icon,
                             const gchar   *tooltip_text)
 {
-  g_return_if_fail (GTK_IS_STATUS_ICON (status_icon));
-
-#ifdef GDK_WINDOWING_X11
-  gtk_tooltips_set_tip (status_icon->priv->tooltips,
-                       status_icon->priv->tray_icon,
-                       tooltip_text, NULL);
-#endif
-#ifdef GDK_WINDOWING_WIN32
-  if (tooltip_text == NULL)
-    status_icon->priv->nid.uFlags &= ~NIF_TIP;
-  else
-    {
-      WCHAR *wcs = g_utf8_to_utf16 (tooltip_text, -1, NULL, NULL, NULL);
-      status_icon->priv->nid.uFlags |= NIF_TIP;
-      wcsncpy (status_icon->priv->nid.szTip, wcs,
-              G_N_ELEMENTS (status_icon->priv->nid.szTip) - 1);
-      status_icon->priv->nid.szTip[G_N_ELEMENTS (status_icon->priv->nid.szTip) - 1] = 0;
-    }
-  if (status_icon->priv->nid.hWnd != NULL && status_icon->priv->visible)
-    if (!Shell_NotifyIconW (NIM_MODIFY, &status_icon->priv->nid))
-      g_warning ("%s:%d:Shell_NotifyIconW(NIM_MODIFY) failed", __FILE__, __LINE__-1);
-#endif
+  gtk_status_icon_set_tooltip_text (status_icon, tooltip_text);
 }
 
 static gboolean
 gtk_status_icon_blinker (GtkStatusIcon *status_icon)
 {
-  status_icon->priv->blink_off = !status_icon->priv->blink_off;
+  GtkStatusIconPrivate *priv = status_icon->priv;
+  
+  priv->blink_off = !priv->blink_off;
 
   gtk_status_icon_update_image (status_icon);
 
@@ -1297,12 +2242,14 @@ gtk_status_icon_blinker (GtkStatusIcon *status_icon)
 static void
 gtk_status_icon_enable_blinking (GtkStatusIcon *status_icon)
 {
-  if (!status_icon->priv->blinking_timeout)
+  GtkStatusIconPrivate *priv = status_icon->priv;
+  
+  if (!priv->blinking_timeout)
     {
       gtk_status_icon_blinker (status_icon);
 
-      status_icon->priv->blinking_timeout =
-       g_timeout_add (BLINK_TIMEOUT, 
+      priv->blinking_timeout =
+       gdk_threads_add_timeout (BLINK_TIMEOUT, 
                       (GSourceFunc) gtk_status_icon_blinker, 
                       status_icon);
     }
@@ -1311,11 +2258,13 @@ gtk_status_icon_enable_blinking (GtkStatusIcon *status_icon)
 static void
 gtk_status_icon_disable_blinking (GtkStatusIcon *status_icon)
 {
-  if (status_icon->priv->blinking_timeout)
+  GtkStatusIconPrivate *priv = status_icon->priv;
+  
+  if (priv->blinking_timeout)
     {
-      g_source_remove (status_icon->priv->blinking_timeout);
-      status_icon->priv->blinking_timeout = 0;
-      status_icon->priv->blink_off = FALSE;
+      g_source_remove (priv->blinking_timeout);
+      priv->blinking_timeout = 0;
+      priv->blink_off = FALSE;
 
       gtk_status_icon_update_image (status_icon);
     }
@@ -1334,28 +2283,40 @@ void
 gtk_status_icon_set_visible (GtkStatusIcon *status_icon,
                             gboolean       visible)
 {
+  GtkStatusIconPrivate *priv;
+
   g_return_if_fail (GTK_IS_STATUS_ICON (status_icon));
 
+  priv = status_icon->priv;
+
   visible = visible != FALSE;
 
-  if (status_icon->priv->visible != visible)
+  if (priv->visible != visible)
     {
-      status_icon->priv->visible = visible;
+      priv->visible = visible;
 
 #ifdef GDK_WINDOWING_X11
       if (visible)
-       gtk_widget_show (status_icon->priv->tray_icon);
-      else
-       gtk_widget_hide (status_icon->priv->tray_icon);
+       gtk_widget_show (priv->tray_icon);
+      else if (gtk_widget_get_realized (priv->tray_icon))
+        {
+         gtk_widget_hide (priv->tray_icon);
+         gtk_widget_unrealize (priv->tray_icon);
+        }
 #endif
 #ifdef GDK_WINDOWING_WIN32
-      if (status_icon->priv->nid.hWnd != NULL)
+      if (priv->nid.hWnd != NULL)
        {
          if (visible)
-           Shell_NotifyIconW (NIM_ADD, &status_icon->priv->nid);
+           Shell_NotifyIconW (NIM_ADD, &priv->nid);
          else
-           Shell_NotifyIconW (NIM_DELETE, &status_icon->priv->nid);
+           Shell_NotifyIconW (NIM_DELETE, &priv->nid);
        }
+#endif
+#ifdef GDK_WINDOWING_QUARTZ
+      QUARTZ_POOL_ALLOC;
+      [priv->status_item setVisible:visible];
+      QUARTZ_POOL_RELEASE;
 #endif
       g_object_notify (G_OBJECT (status_icon), "visible");
     }
@@ -1365,7 +2326,7 @@ gtk_status_icon_set_visible (GtkStatusIcon *status_icon,
  * gtk_status_icon_get_visible:
  * @status_icon: a #GtkStatusIcon
  * 
- * Returns wether the status icon is visible or not. 
+ * Returns whether the status icon is visible or not. 
  * Note that being visible does not guarantee that 
  * the user can actually see the icon, see also 
  * gtk_status_icon_is_embedded().
@@ -1398,13 +2359,17 @@ void
 gtk_status_icon_set_blinking (GtkStatusIcon *status_icon,
                              gboolean       blinking)
 {
+  GtkStatusIconPrivate *priv;
+
   g_return_if_fail (GTK_IS_STATUS_ICON (status_icon));
 
+  priv = status_icon->priv;
+
   blinking = blinking != FALSE;
 
-  if (status_icon->priv->blinking != blinking)
+  if (priv->blinking != blinking)
     {
-      status_icon->priv->blinking = blinking;
+      priv->blinking = blinking;
 
       if (blinking)
        gtk_status_icon_enable_blinking (status_icon);
@@ -1466,7 +2431,573 @@ gtk_status_icon_is_embedded (GtkStatusIcon *status_icon)
 #ifdef GDK_WINDOWING_WIN32
   return TRUE;
 #endif
+#ifdef GDK_WINDOWING_QUARTZ
+  return TRUE;
+#endif
+}
+
+/**
+ * gtk_status_icon_position_menu:
+ * @menu: the #GtkMenu
+ * @x: return location for the x position
+ * @y: return location for the y position
+ * @push_in: whether the first menu item should be offset (pushed in) to be
+ *           aligned with the menu popup position (only useful for GtkOptionMenu).
+ * @user_data: the status icon to position the menu on
+ *
+ * Menu positioning function to use with gtk_menu_popup()
+ * to position @menu aligned to the status icon @user_data.
+ * 
+ * Since: 2.10
+ **/
+void
+gtk_status_icon_position_menu (GtkMenu  *menu,
+                              gint     *x,
+                              gint     *y,
+                              gboolean *push_in,
+                              gpointer  user_data)
+{
+#ifdef GDK_WINDOWING_X11
+  GtkStatusIcon *status_icon;
+  GtkStatusIconPrivate *priv;
+  GtkTrayIcon *tray_icon;
+  GtkWidget *widget;
+  GdkScreen *screen;
+  GtkTextDirection direction;
+  GtkRequisition menu_req;
+  GdkRectangle monitor;
+  gint monitor_num, height, width, xoffset, yoffset;
+  
+  g_return_if_fail (GTK_IS_MENU (menu));
+  g_return_if_fail (GTK_IS_STATUS_ICON (user_data));
+
+  status_icon = GTK_STATUS_ICON (user_data);
+  priv = status_icon->priv;
+  tray_icon = GTK_TRAY_ICON (priv->tray_icon);
+  widget = priv->tray_icon;
+
+  direction = gtk_widget_get_direction (widget);
+
+  screen = gtk_widget_get_screen (widget);
+  gtk_menu_set_screen (menu, screen);
+
+  monitor_num = gdk_screen_get_monitor_at_window (screen, widget->window);
+  if (monitor_num < 0)
+    monitor_num = 0;
+  gtk_menu_set_monitor (menu, monitor_num);
+
+  gdk_screen_get_monitor_geometry (screen, monitor_num, &monitor);
+
+  gdk_window_get_origin (widget->window, x, y);
+  
+  gtk_widget_size_request (GTK_WIDGET (menu), &menu_req);
+
+  if (_gtk_tray_icon_get_orientation (tray_icon) == GTK_ORIENTATION_VERTICAL)
+    {
+      width = 0;
+      height = widget->allocation.height;
+      xoffset = widget->allocation.width;
+      yoffset = 0;
+    }
+  else
+    {
+      width = widget->allocation.width;
+      height = 0;
+      xoffset = 0;
+      yoffset = widget->allocation.height;
+    }
+
+  if (direction == GTK_TEXT_DIR_RTL)
+    {
+      if ((*x - (menu_req.width - width)) >= monitor.x)
+        *x -= menu_req.width - width;
+      else if ((*x + xoffset + menu_req.width) < (monitor.x + monitor.width))
+        *x += xoffset;
+      else if ((monitor.x + monitor.width - (*x + xoffset)) < *x)
+        *x -= menu_req.width - width;
+      else
+        *x += xoffset;
+    }
+  else
+    {
+      if ((*x + xoffset + menu_req.width) < (monitor.x + monitor.width))
+        *x += xoffset;
+      else if ((*x - (menu_req.width - width)) >= monitor.x)
+        *x -= menu_req.width - width;
+      else if ((monitor.x + monitor.width - (*x + xoffset)) > *x)
+        *x += xoffset;
+      else 
+        *x -= menu_req.width - width;
+    }
+
+  if ((*y + yoffset + menu_req.height) < (monitor.y + monitor.height))
+    *y += yoffset;
+  else if ((*y - (menu_req.height - height)) >= monitor.y)
+    *y -= menu_req.height - height;
+  else if (monitor.y + monitor.height - (*y + yoffset) > *y)
+    *y += yoffset;
+  else 
+    *y -= menu_req.height - height;
+
+  *push_in = FALSE;
+#endif /* GDK_WINDOWING_X11 */
+
+#ifdef GDK_WINDOWING_WIN32
+  GtkStatusIcon *status_icon;
+  GtkStatusIconPrivate *priv;
+  
+  g_return_if_fail (GTK_IS_MENU (menu));
+  g_return_if_fail (GTK_IS_STATUS_ICON (user_data));
+
+  status_icon = GTK_STATUS_ICON (user_data);
+  priv = status_icon->priv;
+
+  *x = priv->last_click_x;
+  *y = priv->last_click_y;
+  *push_in = TRUE;
+#endif
+}
+
+/**
+ * gtk_status_icon_get_geometry:
+ * @status_icon: a #GtkStatusIcon
+ * @screen: (out) (transfer none) (allow-none): return location for the screen, or %NULL if the
+ *          information is not needed
+ * @area: (out) (allow-none): return location for the area occupied by the status
+ *        icon, or %NULL
+ * @orientation: (out) (allow-none): return location for the orientation of the panel
+ *    in which the status icon is embedded, or %NULL. A panel
+ *    at the top or bottom of the screen is horizontal, a panel
+ *    at the left or right is vertical.
+ *
+ * Obtains information about the location of the status icon
+ * on screen. This information can be used to e.g. position 
+ * popups like notification bubbles. 
+ *
+ * See gtk_status_icon_position_menu() for a more convenient 
+ * alternative for positioning menus.
+ *
+ * Note that some platforms do not allow GTK+ to provide 
+ * this information, and even on platforms that do allow it,
+ * the information is not reliable unless the status icon
+ * is embedded in a notification area, see
+ * gtk_status_icon_is_embedded().
+ *
+ * Return value: %TRUE if the location information has 
+ *               been filled in
+ *
+ * Since: 2.10
+ */
+gboolean  
+gtk_status_icon_get_geometry (GtkStatusIcon    *status_icon,
+                             GdkScreen       **screen,
+                             GdkRectangle     *area,
+                             GtkOrientation   *orientation)
+{
+#ifdef GDK_WINDOWING_X11   
+  GtkWidget *widget;
+  GtkStatusIconPrivate *priv;
+  gint x, y;
+
+  g_return_val_if_fail (GTK_IS_STATUS_ICON (status_icon), FALSE);
+
+  priv = status_icon->priv;
+  widget = priv->tray_icon;
+
+  if (screen)
+    *screen = gtk_widget_get_screen (widget);
+
+  if (area)
+    {
+      gdk_window_get_origin (widget->window, &x, &y);
+      area->x = x;
+      area->y = y;
+      area->width = widget->allocation.width;
+      area->height = widget->allocation.height;
+    }
+
+  if (orientation)
+    *orientation = _gtk_tray_icon_get_orientation (GTK_TRAY_ICON (widget));
+
+  return TRUE;
+#else
+  return FALSE;
+#endif /* GDK_WINDOWING_X11 */
+}
+
+/**
+ * gtk_status_icon_set_has_tooltip:
+ * @status_icon: a #GtkStatusIcon
+ * @has_tooltip: whether or not @status_icon has a tooltip
+ *
+ * Sets the has-tooltip property on @status_icon to @has_tooltip.
+ * See #GtkStatusIcon:has-tooltip for more information.
+ *
+ * Since: 2.16
+ */
+void
+gtk_status_icon_set_has_tooltip (GtkStatusIcon *status_icon,
+                                gboolean       has_tooltip)
+{
+  GtkStatusIconPrivate *priv;
+
+  g_return_if_fail (GTK_IS_STATUS_ICON (status_icon));
+
+  priv = status_icon->priv;
+
+#ifdef GDK_WINDOWING_X11
+  gtk_widget_set_has_tooltip (priv->tray_icon, has_tooltip);
+#endif
+#ifdef GDK_WINDOWING_WIN32
+  if (!has_tooltip && priv->tooltip_text)
+    gtk_status_icon_set_tooltip_text (status_icon, NULL);
+#endif
+#ifdef GDK_WINDOWING_QUARTZ
+  if (!has_tooltip && priv->tooltip_text)
+    gtk_status_icon_set_tooltip_text (status_icon, NULL);
+#endif
+}
+
+/**
+ * gtk_status_icon_get_has_tooltip:
+ * @status_icon: a #GtkStatusIcon
+ *
+ * Returns the current value of the has-tooltip property.
+ * See #GtkStatusIcon:has-tooltip for more information.
+ *
+ * Return value: current value of has-tooltip on @status_icon.
+ *
+ * Since: 2.16
+ */
+gboolean
+gtk_status_icon_get_has_tooltip (GtkStatusIcon *status_icon)
+{
+  GtkStatusIconPrivate *priv;
+  gboolean has_tooltip = FALSE;
+
+  g_return_val_if_fail (GTK_IS_STATUS_ICON (status_icon), FALSE);
+
+  priv = status_icon->priv;
+
+#ifdef GDK_WINDOWING_X11
+  has_tooltip = gtk_widget_get_has_tooltip (priv->tray_icon);
+#endif
+#ifdef GDK_WINDOWING_WIN32
+  has_tooltip = (priv->tooltip_text != NULL);
+#endif
+#ifdef GDK_WINDOWING_QUARTZ
+  has_tooltip = (priv->tooltip_text != NULL);
+#endif
+
+  return has_tooltip;
+}
+
+/**
+ * gtk_status_icon_set_tooltip_text:
+ * @status_icon: a #GtkStatusIcon
+ * @text: the contents of the tooltip for @status_icon
+ *
+ * Sets @text as the contents of the tooltip.
+ *
+ * This function will take care of setting #GtkStatusIcon:has-tooltip to
+ * %TRUE and of the default handler for the #GtkStatusIcon::query-tooltip
+ * signal.
+ *
+ * See also the #GtkStatusIcon:tooltip-text property and
+ * gtk_tooltip_set_text().
+ *
+ * Since: 2.16
+ */
+void
+gtk_status_icon_set_tooltip_text (GtkStatusIcon *status_icon,
+                                 const gchar   *text)
+{
+  GtkStatusIconPrivate *priv;
+
+  g_return_if_fail (GTK_IS_STATUS_ICON (status_icon));
+
+  priv = status_icon->priv;
+
+#ifdef GDK_WINDOWING_X11
+
+  gtk_widget_set_tooltip_text (priv->tray_icon, text);
+
+#endif
+#ifdef GDK_WINDOWING_WIN32
+  if (text == NULL)
+    priv->nid.uFlags &= ~NIF_TIP;
+  else
+    {
+      WCHAR *wcs = g_utf8_to_utf16 (text, -1, NULL, NULL, NULL);
+
+      priv->nid.uFlags |= NIF_TIP;
+      wcsncpy (priv->nid.szTip, wcs, G_N_ELEMENTS (priv->nid.szTip) - 1);
+      priv->nid.szTip[G_N_ELEMENTS (priv->nid.szTip) - 1] = 0;
+      g_free (wcs);
+    }
+  if (priv->nid.hWnd != NULL && priv->visible)
+    if (!Shell_NotifyIconW (NIM_MODIFY, &priv->nid))
+      g_warning (G_STRLOC ": Shell_NotifyIconW(NIM_MODIFY) failed");
+
+  g_free (priv->tooltip_text);
+  priv->tooltip_text = g_strdup (text);
+#endif
+#ifdef GDK_WINDOWING_QUARTZ
+  QUARTZ_POOL_ALLOC;
+  [priv->status_item setToolTip:text];
+  QUARTZ_POOL_RELEASE;
+
+  g_free (priv->tooltip_text);
+  priv->tooltip_text = g_strdup (text);
+#endif
+}
+
+/**
+ * gtk_status_icon_get_tooltip_text:
+ * @status_icon: a #GtkStatusIcon
+ *
+ * Gets the contents of the tooltip for @status_icon.
+ *
+ * Return value: the tooltip text, or %NULL. You should free the
+ *   returned string with g_free() when done.
+ *
+ * Since: 2.16
+ */
+gchar *
+gtk_status_icon_get_tooltip_text (GtkStatusIcon *status_icon)
+{
+  GtkStatusIconPrivate *priv;
+  gchar *tooltip_text = NULL;
+
+  g_return_val_if_fail (GTK_IS_STATUS_ICON (status_icon), NULL);
+
+  priv = status_icon->priv;
+
+#ifdef GDK_WINDOWING_X11
+  tooltip_text = gtk_widget_get_tooltip_text (priv->tray_icon);
+#endif
+#ifdef GDK_WINDOWING_WIN32
+  if (priv->tooltip_text)
+    tooltip_text = g_strdup (priv->tooltip_text);
+#endif
+#ifdef GDK_WINDOWING_QUARTZ
+  if (priv->tooltip_text)
+    tooltip_text = g_strdup (priv->tooltip_text);
+#endif
+
+  return tooltip_text;
 }
 
+/**
+ * gtk_status_icon_set_tooltip_markup:
+ * @status_icon: a #GtkStatusIcon
+ * @markup: (allow-none): the contents of the tooltip for @status_icon, or %NULL
+ *
+ * Sets @markup as the contents of the tooltip, which is marked up with
+ *  the <link linkend="PangoMarkupFormat">Pango text markup language</link>.
+ *
+ * This function will take care of setting #GtkStatusIcon:has-tooltip to %TRUE
+ * and of the default handler for the #GtkStatusIcon::query-tooltip signal.
+ *
+ * See also the #GtkStatusIcon:tooltip-markup property and
+ * gtk_tooltip_set_markup().
+ *
+ * Since: 2.16
+ */
+void
+gtk_status_icon_set_tooltip_markup (GtkStatusIcon *status_icon,
+                                   const gchar   *markup)
+{
+  GtkStatusIconPrivate *priv;
+#ifndef GDK_WINDOWING_X11
+  gchar *text = NULL;
+#endif
+
+  g_return_if_fail (GTK_IS_STATUS_ICON (status_icon));
+
+  priv = status_icon->priv;
+
+#ifdef GDK_WINDOWING_X11
+  gtk_widget_set_tooltip_markup (priv->tray_icon, markup);
+#endif
+#ifdef GDK_WINDOWING_WIN32
+  if (markup)
+    pango_parse_markup (markup, -1, 0, NULL, &text, NULL, NULL);
+  gtk_status_icon_set_tooltip_text (status_icon, text);
+  g_free (text);
+#endif
+#ifdef GDK_WINDOWING_QUARTZ
+  if (markup)
+    pango_parse_markup (markup, -1, 0, NULL, &text, NULL, NULL);
+  gtk_status_icon_set_tooltip_text (status_icon, text);
+  g_free (text);
+#endif
+}
+
+/**
+ * gtk_status_icon_get_tooltip_markup:
+ * @status_icon: a #GtkStatusIcon
+ *
+ * Gets the contents of the tooltip for @status_icon.
+ *
+ * Return value: the tooltip text, or %NULL. You should free the
+ *   returned string with g_free() when done.
+ *
+ * Since: 2.16
+ */
+gchar *
+gtk_status_icon_get_tooltip_markup (GtkStatusIcon *status_icon)
+{
+  GtkStatusIconPrivate *priv;
+  gchar *markup = NULL;
+
+  g_return_val_if_fail (GTK_IS_STATUS_ICON (status_icon), NULL);
+
+  priv = status_icon->priv;
+
+#ifdef GDK_WINDOWING_X11
+  markup = gtk_widget_get_tooltip_markup (priv->tray_icon);
+#endif
+#ifdef GDK_WINDOWING_WIN32
+  if (priv->tooltip_text)
+    markup = g_markup_escape_text (priv->tooltip_text, -1);
+#endif
+#ifdef GDK_WINDOWING_QUARTZ
+  if (priv->tooltip_text)
+    markup = g_markup_escape_text (priv->tooltip_text, -1);
+#endif
+
+  return markup;
+}
+
+/**
+ * gtk_status_icon_get_x11_window_id:
+ * @status_icon: a #GtkStatusIcon
+ *
+ * This function is only useful on the X11/freedesktop.org platform.
+ * It returns a window ID for the widget in the underlying
+ * status icon implementation.  This is useful for the Galago 
+ * notification service, which can send a window ID in the protocol 
+ * in order for the server to position notification windows 
+ * pointing to a status icon reliably.
+ *
+ * This function is not intended for other use cases which are
+ * more likely to be met by one of the non-X11 specific methods, such
+ * as gtk_status_icon_position_menu().
+ *
+ * Return value: An 32 bit unsigned integer identifier for the 
+ * underlying X11 Window
+ *
+ * Since: 2.14
+ */
+guint32
+gtk_status_icon_get_x11_window_id (GtkStatusIcon *status_icon)
+{
+#ifdef GDK_WINDOWING_X11
+  gtk_widget_realize (GTK_WIDGET (status_icon->priv->tray_icon));
+  return GDK_WINDOW_XID (GTK_WIDGET (status_icon->priv->tray_icon)->window);
+#else
+  return 0;
+#endif
+}
+
+/**
+ * gtk_status_icon_set_title:
+ * @status_icon: a #GtkStatusIcon
+ * @title: the title 
+ *
+ * Sets the title of this tray icon.
+ * This should be a short, human-readable, localized string 
+ * describing the tray icon. It may be used by tools like screen
+ * readers to render the tray icon.
+ *
+ * Since: 2.18
+ */
+void
+gtk_status_icon_set_title (GtkStatusIcon *status_icon,
+                           const gchar   *title)
+{
+  GtkStatusIconPrivate *priv;
+
+  g_return_if_fail (GTK_IS_STATUS_ICON (status_icon));
+
+  priv = status_icon->priv;
+
+#ifdef GDK_WINDOWING_X11
+  gtk_window_set_title (GTK_WINDOW (priv->tray_icon), title);
+#endif
+#ifdef GDK_WINDOWING_QUARTZ
+  g_free (priv->title);
+  priv->title = g_strdup (title);
+#endif
+#ifdef GDK_WINDOWING_WIN32
+  g_free (priv->title);
+  priv->title = g_strdup (title);
+#endif
+
+  g_object_notify (G_OBJECT (status_icon), "title");
+}
+
+/**
+ * gtk_status_icon_get_title:
+ * @status_icon: a #GtkStatusIcon
+ *
+ * Gets the title of this tray icon. See gtk_status_icon_set_title().
+ *
+ * Returns: the title of the status icon
+ *
+ * Since: 2.18
+ */
+G_CONST_RETURN gchar *
+gtk_status_icon_get_title (GtkStatusIcon *status_icon)
+{
+  GtkStatusIconPrivate *priv;
+
+  g_return_val_if_fail (GTK_IS_STATUS_ICON (status_icon), NULL);
+
+  priv = status_icon->priv;
+
+#ifdef GDK_WINDOWING_X11
+  return gtk_window_get_title (GTK_WINDOW (priv->tray_icon));
+#endif
+#ifdef GDK_WINDOWING_QUARTZ
+  return priv->title;
+#endif
+#ifdef GDK_WINDOWING_WIN32
+  return priv->title;
+#endif
+}
+
+
+/**
+ * gtk_status_icon_set_name:
+ * @status_icon: a #GtkStatusIcon
+ * @name: the name
+ *
+ * Sets the name of this tray icon.
+ * This should be a string identifying this icon. It is may be
+ * used for sorting the icons in the tray and will not be shown to
+ * the user.
+ *
+ * Since: 2.20
+ */
+void
+gtk_status_icon_set_name (GtkStatusIcon *status_icon,
+                          const gchar   *name)
+{
+  GtkStatusIconPrivate *priv;
+
+  g_return_if_fail (GTK_IS_STATUS_ICON (status_icon));
+
+  priv = status_icon->priv;
+
+#ifdef GDK_WINDOWING_X11
+  gtk_window_set_wmclass (GTK_WINDOW (priv->tray_icon), name, name);
+#endif
+
+  g_object_notify (G_OBJECT (status_icon), "name");
+}
+
+
 #define __GTK_STATUS_ICON_C__
 #include "gtkaliasdef.c"