Rename directory.

2007-09-12  William Jon McCann  <mccann@jhu.edu>

	* gui/simple-greeter/Makefile.am:
	* gui/simple-greeter/cutnpaste/*:
	Rename directory.
	* gui/simple-greeter/gdm-greeter-background.c:
	(gdm_greeter_background_set_property),
	(gdm_greeter_background_get_property),
	(gdm_greeter_background_constructor),
	(gdm_greeter_background_dispose),
	(gdm_greeter_background_real_map), (on_screen_size_changed),
	(gdm_greeter_background_real_realize),
	(gdm_greeter_background_real_unrealize),
	(gdm_greeter_background_class_init), (on_delete_event),
	(gdm_greeter_background_init), (gdm_greeter_background_finalize),
	(gdm_greeter_background_new):
	* gui/simple-greeter/gdm-greeter-background.h:
	* gui/simple-greeter/gdm-simple-greeter.c: (create_panel):
	Add a background widget.


svn path=/branches/mccann-gobject/; revision=5250

18 files changed, 513 insertions, 5 deletions

diff --git a/ChangeLog b/ChangeLog
index c988a742..bf5774bf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,23 @@
+2007-09-12  William Jon McCann  <mccann@jhu.edu>
+
+	* gui/simple-greeter/Makefile.am:
+	* gui/simple-greeter/cutnpaste/*:
+	Rename directory.
+	* gui/simple-greeter/gdm-greeter-background.c:
+	(gdm_greeter_background_set_property),
+	(gdm_greeter_background_get_property),
+	(gdm_greeter_background_constructor),
+	(gdm_greeter_background_dispose),
+	(gdm_greeter_background_real_map), (on_screen_size_changed),
+	(gdm_greeter_background_real_realize),
+	(gdm_greeter_background_real_unrealize),
+	(gdm_greeter_background_class_init), (on_delete_event),
+	(gdm_greeter_background_init), (gdm_greeter_background_finalize),
+	(gdm_greeter_background_new):
+	* gui/simple-greeter/gdm-greeter-background.h:
+	* gui/simple-greeter/gdm-simple-greeter.c: (create_panel):
+	Add a background widget.
+
 2007-09-11  William Jon McCann  <mccann@jhu.edu>
 
 	* common/gdm-address.c: (gdm_address_is_loopback):
diff --git a/gui/simple-greeter/Makefile.am b/gui/simple-greeter/Makefile.am
index 9051daa3..0881d963 100644
--- a/gui/simple-greeter/Makefile.am
+++ b/gui/simple-greeter/Makefile.am
@@ -1,13 +1,13 @@
 NULL =
 
-SUBDIRS = 			\
-	cutnpaste		\
+SUBDIRS = 				\
+	libnotificationarea		\
 	$(NULL)
 
 INCLUDES = \
 	-I$(top_srcdir)/common				\
 	-I$(top_srcdir)/libgreeter			\
-	-I$(top_srcdir)/gui/simple-greeter/cutnpaste	\
+	-I$(top_srcdir)/gui/simple-greeter/libnotificationarea	\
 	-DAUTHDIR=\""$(authdir)"\"		 	\
 	-DDATADIR=\""$(datadir)"\"		 	\
 	-DGDMCONFDIR=\"$(gdmconfdir)\"			\
@@ -35,7 +35,7 @@ test_greeter_panel_SOURCES = 	\
 	$(NULL)
 
 test_greeter_panel_LDADD =	\
-	$(top_builddir)/gui/simple-greeter/cutnpaste/libnotificationarea.la	\
+	$(top_builddir)/gui/simple-greeter/libnotificationarea/libnotificationarea.la	\
 	$(GUI_LIBS)		\
 	$(NULL)
 
@@ -48,13 +48,15 @@ gdm_simple_greeter_SOURCES =  	\
 	gdm-simple-greeter.h	\
 	gdm-greeter-panel.h	\
 	gdm-greeter-panel.c	\
+	gdm-greeter-background.h\
+	gdm-greeter-background.c\
 	$(NULL)
 
 gdm_simple_greeter_LDADD = 		\
 	$(EXTRA_GREETER_LIBS)   	\
 	-L$(top_builddir)/libgreeter	\
 	-lgreeter			\
-	$(top_builddir)/gui/simple-greeter/cutnpaste/libnotificationarea.la	\
+	$(top_builddir)/gui/simple-greeter/libnotificationarea/libnotificationarea.la	\
 	$(GLIB_LIBS)		\
 	$(DBUS_LIBS)		\
 	$(GOBJECT_LIBS)		\
diff --git a/gui/simple-greeter/gdm-greeter-background.c b/gui/simple-greeter/gdm-greeter-background.c
new file mode 100644
index 00000000..ddd35b21
--- /dev/null
+++ b/gui/simple-greeter/gdm-greeter-background.c
@@ -0,0 +1,227 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
+ *
+ * Copyright (C) 2007 William Jon McCann <mccann@jhu.edu>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *
+ */
+
+#include "config.h"
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <unistd.h>
+#include <string.h>
+
+#include <glib.h>
+#include <glib/gi18n.h>
+#include <glib-object.h>
+#include <gtk/gtk.h>
+
+#include <libbackground/preferences.h>
+
+#include "gdm-greeter-background.h"
+
+#define GDM_GREETER_BACKGROUND_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GDM_TYPE_GREETER_BACKGROUND, GdmGreeterBackgroundPrivate))
+
+struct GdmGreeterBackgroundPrivate
+{
+        char *filename;
+};
+
+enum {
+        PROP_0,
+};
+
+static void     gdm_greeter_background_class_init  (GdmGreeterBackgroundClass *klass);
+static void     gdm_greeter_background_init        (GdmGreeterBackground      *greeter_background);
+static void     gdm_greeter_background_finalize    (GObject              *object);
+
+G_DEFINE_TYPE (GdmGreeterBackground, gdm_greeter_background, GTK_TYPE_WINDOW)
+
+static void
+gdm_greeter_background_set_property (GObject        *object,
+                                     guint           prop_id,
+                                     const GValue   *value,
+                                     GParamSpec     *pspec)
+{
+        GdmGreeterBackground *self;
+
+        self = GDM_GREETER_BACKGROUND (object);
+
+        switch (prop_id) {
+        default:
+                G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+                break;
+        }
+}
+
+static void
+gdm_greeter_background_get_property (GObject        *object,
+                                     guint           prop_id,
+                                     GValue         *value,
+                                     GParamSpec     *pspec)
+{
+        GdmGreeterBackground *self;
+
+        self = GDM_GREETER_BACKGROUND (object);
+
+        switch (prop_id) {
+        default:
+                G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+                break;
+        }
+}
+
+static GObject *
+gdm_greeter_background_constructor (GType                  type,
+                                    guint                  n_construct_properties,
+                                    GObjectConstructParam *construct_properties)
+{
+        GdmGreeterBackground      *greeter_background;
+        GdmGreeterBackgroundClass *klass;
+
+        klass = GDM_GREETER_BACKGROUND_CLASS (g_type_class_peek (GDM_TYPE_GREETER_BACKGROUND));
+
+        greeter_background = GDM_GREETER_BACKGROUND (G_OBJECT_CLASS (gdm_greeter_background_parent_class)->constructor (type,
+                                                                                                                        n_construct_properties,
+                                                                                                                        construct_properties));
+
+        return G_OBJECT (greeter_background);
+}
+
+static void
+gdm_greeter_background_dispose (GObject *object)
+{
+        GdmGreeterBackground *greeter_background;
+
+        greeter_background = GDM_GREETER_BACKGROUND (object);
+
+        g_debug ("Disposing greeter_background");
+
+        G_OBJECT_CLASS (gdm_greeter_background_parent_class)->dispose (object);
+}
+
+static void
+gdm_greeter_background_real_map (GtkWidget *widget)
+{
+        if (GTK_WIDGET_CLASS (gdm_greeter_background_parent_class)->realize) {
+                GTK_WIDGET_CLASS (gdm_greeter_background_parent_class)->realize (widget);
+        }
+
+        gdk_window_lower (widget->window);
+}
+
+static void
+on_screen_size_changed (GdkScreen            *screen,
+                        GdmGreeterBackground *background)
+{
+        gtk_widget_queue_resize (GTK_WIDGET (background));
+}
+
+static void
+gdm_greeter_background_real_realize (GtkWidget *widget)
+{
+        if (GTK_WIDGET_CLASS (gdm_greeter_background_parent_class)->realize) {
+                GTK_WIDGET_CLASS (gdm_greeter_background_parent_class)->realize (widget);
+        }
+
+        g_signal_connect (gtk_window_get_screen (GTK_WINDOW (widget)),
+                          "size_changed",
+                          G_CALLBACK (on_screen_size_changed),
+                          widget);
+}
+
+static void
+gdm_greeter_background_real_unrealize (GtkWidget *widget)
+{
+        g_signal_handlers_disconnect_by_func (gtk_window_get_screen (GTK_WINDOW (widget)),
+                                              on_screen_size_changed,
+                                              widget);
+
+        if (GTK_WIDGET_CLASS (gdm_greeter_background_parent_class)->unrealize) {
+                GTK_WIDGET_CLASS (gdm_greeter_background_parent_class)->unrealize (widget);
+        }
+}
+
+static void
+gdm_greeter_background_class_init (GdmGreeterBackgroundClass *klass)
+{
+        GObjectClass   *object_class = G_OBJECT_CLASS (klass);
+        GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
+
+        object_class->get_property = gdm_greeter_background_get_property;
+        object_class->set_property = gdm_greeter_background_set_property;
+        object_class->constructor = gdm_greeter_background_constructor;
+        object_class->dispose = gdm_greeter_background_dispose;
+        object_class->finalize = gdm_greeter_background_finalize;
+
+        widget_class->map = gdm_greeter_background_real_map;
+        widget_class->realize = gdm_greeter_background_real_realize;
+        widget_class->unrealize = gdm_greeter_background_real_unrealize;
+
+        g_type_class_add_private (klass, sizeof (GdmGreeterBackgroundPrivate));
+}
+
+static gint
+on_delete_event (GdmGreeterBackground *background)
+{
+        /* Returning true tells GTK+ not to delete the window. */
+        return TRUE;
+}
+
+static void
+gdm_greeter_background_init (GdmGreeterBackground *background)
+{
+
+        background->priv = GDM_GREETER_BACKGROUND_GET_PRIVATE (background);
+
+        gtk_window_set_decorated (GTK_WINDOW (background), FALSE);
+
+        gtk_window_set_skip_taskbar_hint (GTK_WINDOW (background), TRUE);
+        gtk_window_set_skip_pager_hint (GTK_WINDOW (background), TRUE);
+        gtk_window_set_resizable (GTK_WINDOW (background), FALSE);
+        gtk_window_set_keep_above (GTK_WINDOW (background), TRUE);
+        gtk_window_set_type_hint (GTK_WINDOW (background), GDK_WINDOW_TYPE_HINT_DESKTOP);
+        gtk_window_fullscreen (GTK_WINDOW (background));
+
+        g_signal_connect (background, "delete_event", G_CALLBACK (on_delete_event), NULL);
+}
+
+static void
+gdm_greeter_background_finalize (GObject *object)
+{
+        GdmGreeterBackground *greeter_background;
+
+        g_return_if_fail (object != NULL);
+        g_return_if_fail (GDM_IS_GREETER_BACKGROUND (object));
+
+        greeter_background = GDM_GREETER_BACKGROUND (object);
+
+        g_return_if_fail (greeter_background->priv != NULL);
+
+        G_OBJECT_CLASS (gdm_greeter_background_parent_class)->finalize (object);
+}
+
+GtkWidget *
+gdm_greeter_background_new (void)
+{
+        GObject *object;
+
+        object = g_object_new (GDM_TYPE_GREETER_BACKGROUND,
+                               NULL);
+
+        return GTK_WIDGET (object);
+}
diff --git a/gui/simple-greeter/gdm-greeter-background.h b/gui/simple-greeter/gdm-greeter-background.h
new file mode 100644
index 00000000..d38b3cb4
--- /dev/null
+++ b/gui/simple-greeter/gdm-greeter-background.h
@@ -0,0 +1,55 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
+ *
+ * Copyright (C) 2007 William Jon McCann <mccann@jhu.edu>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *
+ */
+
+#ifndef __GDM_GREETER_BACKGROUND_H
+#define __GDM_GREETER_BACKGROUND_H
+
+#include <glib-object.h>
+#include <gtk/gtk.h>
+
+G_BEGIN_DECLS
+
+#define GDM_TYPE_GREETER_BACKGROUND         (gdm_greeter_background_get_type ())
+#define GDM_GREETER_BACKGROUND(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), GDM_TYPE_GREETER_BACKGROUND, GdmGreeterBackground))
+#define GDM_GREETER_BACKGROUND_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), GDM_TYPE_GREETER_BACKGROUND, GdmGreeterBackgroundClass))
+#define GDM_IS_GREETER_BACKGROUND(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), GDM_TYPE_GREETER_BACKGROUND))
+#define GDM_IS_GREETER_BACKGROUND_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), GDM_TYPE_GREETER_BACKGROUND))
+#define GDM_GREETER_BACKGROUND_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), GDM_TYPE_GREETER_BACKGROUND, GdmGreeterBackgroundClass))
+
+typedef struct GdmGreeterBackgroundPrivate GdmGreeterBackgroundPrivate;
+
+typedef struct
+{
+        GtkWindow               parent;
+        GdmGreeterBackgroundPrivate *priv;
+} GdmGreeterBackground;
+
+typedef struct
+{
+        GtkWindowClass   parent_class;
+} GdmGreeterBackgroundClass;
+
+GType                  gdm_greeter_background_get_type                       (void);
+
+GtkWidget            * gdm_greeter_background_new                            (void);
+
+G_END_DECLS
+
+#endif /* __GDM_GREETER_BACKGROUND_H */
diff --git a/gui/simple-greeter/gdm-simple-greeter.c b/gui/simple-greeter/gdm-simple-greeter.c
index 45f5455d..320c391c 100644
--- a/gui/simple-greeter/gdm-simple-greeter.c
+++ b/gui/simple-greeter/gdm-simple-greeter.c
@@ -75,6 +75,7 @@ struct GdmSimpleGreeterPrivate
 {
         GladeXML        *xml;
         GtkWidget       *panel;
+        GtkWidget       *background;
 };
 
 enum {
@@ -460,6 +461,8 @@ create_greeter (GdmSimpleGreeter *greeter)
 static void
 create_panel (GdmSimpleGreeter *greeter)
 {
+        greeter->priv->background = gdm_greeter_background_new ();
+        gtk_widget_show (greeter->priv->background);
         greeter->priv->panel = gdm_greeter_panel_new ();
         gtk_widget_show (greeter->priv->panel);
 }
diff --git a/gui/simple-greeter/cutnpaste/Makefile.am b/gui/simple-greeter/libnotificationarea/Makefile.am
index 7b5fde3c..7b5fde3c 100644
--- a/gui/simple-greeter/cutnpaste/Makefile.am
+++ b/gui/simple-greeter/libnotificationarea/Makefile.am
diff --git a/gui/simple-greeter/cutnpaste/fixedtip.c b/gui/simple-greeter/libnotificationarea/fixedtip.c
index 83bb77ed..83bb77ed 100644
--- a/gui/simple-greeter/cutnpaste/fixedtip.c
+++ b/gui/simple-greeter/libnotificationarea/fixedtip.c
diff --git a/gui/simple-greeter/cutnpaste/fixedtip.h b/gui/simple-greeter/libnotificationarea/fixedtip.h
index a29e85c9..a29e85c9 100644
--- a/gui/simple-greeter/cutnpaste/fixedtip.h
+++ b/gui/simple-greeter/libnotificationarea/fixedtip.h
diff --git a/gui/simple-greeter/libnotificationarea/na-marshal.c b/gui/simple-greeter/libnotificationarea/na-marshal.c
new file mode 100644
index 00000000..7cbaf722
--- /dev/null
+++ b/gui/simple-greeter/libnotificationarea/na-marshal.c
@@ -0,0 +1,165 @@
+#include "na-marshal.h"
+
+#include	<glib-object.h>
+
+
+#ifdef G_ENABLE_DEBUG
+#define g_marshal_value_peek_boolean(v)  g_value_get_boolean (v)
+#define g_marshal_value_peek_char(v)     g_value_get_char (v)
+#define g_marshal_value_peek_uchar(v)    g_value_get_uchar (v)
+#define g_marshal_value_peek_int(v)      g_value_get_int (v)
+#define g_marshal_value_peek_uint(v)     g_value_get_uint (v)
+#define g_marshal_value_peek_long(v)     g_value_get_long (v)
+#define g_marshal_value_peek_ulong(v)    g_value_get_ulong (v)
+#define g_marshal_value_peek_int64(v)    g_value_get_int64 (v)
+#define g_marshal_value_peek_uint64(v)   g_value_get_uint64 (v)
+#define g_marshal_value_peek_enum(v)     g_value_get_enum (v)
+#define g_marshal_value_peek_flags(v)    g_value_get_flags (v)
+#define g_marshal_value_peek_float(v)    g_value_get_float (v)
+#define g_marshal_value_peek_double(v)   g_value_get_double (v)
+#define g_marshal_value_peek_string(v)   (char*) g_value_get_string (v)
+#define g_marshal_value_peek_param(v)    g_value_get_param (v)
+#define g_marshal_value_peek_boxed(v)    g_value_get_boxed (v)
+#define g_marshal_value_peek_pointer(v)  g_value_get_pointer (v)
+#define g_marshal_value_peek_object(v)   g_value_get_object (v)
+#else /* !G_ENABLE_DEBUG */
+/* WARNING: This code accesses GValues directly, which is UNSUPPORTED API.
+ *          Do not access GValues directly in your code. Instead, use the
+ *          g_value_get_*() functions
+ */
+#define g_marshal_value_peek_boolean(v)  (v)->data[0].v_int
+#define g_marshal_value_peek_char(v)     (v)->data[0].v_int
+#define g_marshal_value_peek_uchar(v)    (v)->data[0].v_uint
+#define g_marshal_value_peek_int(v)      (v)->data[0].v_int
+#define g_marshal_value_peek_uint(v)     (v)->data[0].v_uint
+#define g_marshal_value_peek_long(v)     (v)->data[0].v_long
+#define g_marshal_value_peek_ulong(v)    (v)->data[0].v_ulong
+#define g_marshal_value_peek_int64(v)    (v)->data[0].v_int64
+#define g_marshal_value_peek_uint64(v)   (v)->data[0].v_uint64
+#define g_marshal_value_peek_enum(v)     (v)->data[0].v_long
+#define g_marshal_value_peek_flags(v)    (v)->data[0].v_ulong
+#define g_marshal_value_peek_float(v)    (v)->data[0].v_float
+#define g_marshal_value_peek_double(v)   (v)->data[0].v_double
+#define g_marshal_value_peek_string(v)   (v)->data[0].v_pointer
+#define g_marshal_value_peek_param(v)    (v)->data[0].v_pointer
+#define g_marshal_value_peek_boxed(v)    (v)->data[0].v_pointer
+#define g_marshal_value_peek_pointer(v)  (v)->data[0].v_pointer
+#define g_marshal_value_peek_object(v)   (v)->data[0].v_pointer
+#endif /* !G_ENABLE_DEBUG */
+
+
+/* VOID:OBJECT,OBJECT (na-marshal.list:1) */
+void
+_na_marshal_VOID__OBJECT_OBJECT (GClosure     *closure,
+                                 GValue       *return_value,
+                                 guint         n_param_values,
+                                 const GValue *param_values,
+                                 gpointer      invocation_hint,
+                                 gpointer      marshal_data)
+{
+  typedef void (*GMarshalFunc_VOID__OBJECT_OBJECT) (gpointer     data1,
+                                                    gpointer     arg_1,
+                                                    gpointer     arg_2,
+                                                    gpointer     data2);
+  register GMarshalFunc_VOID__OBJECT_OBJECT callback;
+  register GCClosure *cc = (GCClosure*) closure;
+  register gpointer data1, data2;
+
+  g_return_if_fail (n_param_values == 3);
+
+  if (G_CCLOSURE_SWAP_DATA (closure))
+    {
+      data1 = closure->data;
+      data2 = g_value_peek_pointer (param_values + 0);
+    }
+  else
+    {
+      data1 = g_value_peek_pointer (param_values + 0);
+      data2 = closure->data;
+    }
+  callback = (GMarshalFunc_VOID__OBJECT_OBJECT) (marshal_data ? marshal_data : cc->callback);
+
+  callback (data1,
+            g_marshal_value_peek_object (param_values + 1),
+            g_marshal_value_peek_object (param_values + 2),
+            data2);
+}
+
+/* VOID:OBJECT,STRING,LONG,LONG (na-marshal.list:2) */
+void
+_na_marshal_VOID__OBJECT_STRING_LONG_LONG (GClosure     *closure,
+                                           GValue       *return_value,
+                                           guint         n_param_values,
+                                           const GValue *param_values,
+                                           gpointer      invocation_hint,
+                                           gpointer      marshal_data)
+{
+  typedef void (*GMarshalFunc_VOID__OBJECT_STRING_LONG_LONG) (gpointer     data1,
+                                                              gpointer     arg_1,
+                                                              gpointer     arg_2,
+                                                              glong        arg_3,
+                                                              glong        arg_4,
+                                                              gpointer     data2);
+  register GMarshalFunc_VOID__OBJECT_STRING_LONG_LONG callback;
+  register GCClosure *cc = (GCClosure*) closure;
+  register gpointer data1, data2;
+
+  g_return_if_fail (n_param_values == 5);
+
+  if (G_CCLOSURE_SWAP_DATA (closure))
+    {
+      data1 = closure->data;
+      data2 = g_value_peek_pointer (param_values + 0);
+    }
+  else
+    {
+      data1 = g_value_peek_pointer (param_values + 0);
+      data2 = closure->data;
+    }
+  callback = (GMarshalFunc_VOID__OBJECT_STRING_LONG_LONG) (marshal_data ? marshal_data : cc->callback);
+
+  callback (data1,
+            g_marshal_value_peek_object (param_values + 1),
+            g_marshal_value_peek_string (param_values + 2),
+            g_marshal_value_peek_long (param_values + 3),
+            g_marshal_value_peek_long (param_values + 4),
+            data2);
+}
+
+/* VOID:OBJECT,LONG (na-marshal.list:3) */
+void
+_na_marshal_VOID__OBJECT_LONG (GClosure     *closure,
+                               GValue       *return_value,
+                               guint         n_param_values,
+                               const GValue *param_values,
+                               gpointer      invocation_hint,
+                               gpointer      marshal_data)
+{
+  typedef void (*GMarshalFunc_VOID__OBJECT_LONG) (gpointer     data1,
+                                                  gpointer     arg_1,
+                                                  glong        arg_2,
+                                                  gpointer     data2);
+  register GMarshalFunc_VOID__OBJECT_LONG callback;
+  register GCClosure *cc = (GCClosure*) closure;
+  register gpointer data1, data2;
+
+  g_return_if_fail (n_param_values == 3);
+
+  if (G_CCLOSURE_SWAP_DATA (closure))
+    {
+      data1 = closure->data;
+      data2 = g_value_peek_pointer (param_values + 0);
+    }
+  else
+    {
+      data1 = g_value_peek_pointer (param_values + 0);
+      data2 = closure->data;
+    }
+  callback = (GMarshalFunc_VOID__OBJECT_LONG) (marshal_data ? marshal_data : cc->callback);
+
+  callback (data1,
+            g_marshal_value_peek_object (param_values + 1),
+            g_marshal_value_peek_long (param_values + 2),
+            data2);
+}
+
diff --git a/gui/simple-greeter/libnotificationarea/na-marshal.h b/gui/simple-greeter/libnotificationarea/na-marshal.h
new file mode 100644
index 00000000..07918a11
--- /dev/null
+++ b/gui/simple-greeter/libnotificationarea/na-marshal.h
@@ -0,0 +1,36 @@
+
+#ifndef ___na_marshal_MARSHAL_H__
+#define ___na_marshal_MARSHAL_H__
+
+#include	<glib-object.h>
+
+G_BEGIN_DECLS
+
+/* VOID:OBJECT,OBJECT (na-marshal.list:1) */
+extern void _na_marshal_VOID__OBJECT_OBJECT (GClosure     *closure,
+                                             GValue       *return_value,
+                                             guint         n_param_values,
+                                             const GValue *param_values,
+                                             gpointer      invocation_hint,
+                                             gpointer      marshal_data);
+
+/* VOID:OBJECT,STRING,LONG,LONG (na-marshal.list:2) */
+extern void _na_marshal_VOID__OBJECT_STRING_LONG_LONG (GClosure     *closure,
+                                                       GValue       *return_value,
+                                                       guint         n_param_values,
+                                                       const GValue *param_values,
+                                                       gpointer      invocation_hint,
+                                                       gpointer      marshal_data);
+
+/* VOID:OBJECT,LONG (na-marshal.list:3) */
+extern void _na_marshal_VOID__OBJECT_LONG (GClosure     *closure,
+                                           GValue       *return_value,
+                                           guint         n_param_values,
+                                           const GValue *param_values,
+                                           gpointer      invocation_hint,
+                                           gpointer      marshal_data);
+
+G_END_DECLS
+
+#endif /* ___na_marshal_MARSHAL_H__ */
+
diff --git a/gui/simple-greeter/cutnpaste/na-marshal.list b/gui/simple-greeter/libnotificationarea/na-marshal.list
index e3fc3993..e3fc3993 100644
--- a/gui/simple-greeter/cutnpaste/na-marshal.list
+++ b/gui/simple-greeter/libnotificationarea/na-marshal.list
diff --git a/gui/simple-greeter/cutnpaste/na-tray-manager.c b/gui/simple-greeter/libnotificationarea/na-tray-manager.c
index 59fdca36..59fdca36 100644
--- a/gui/simple-greeter/cutnpaste/na-tray-manager.c
+++ b/gui/simple-greeter/libnotificationarea/na-tray-manager.c
diff --git a/gui/simple-greeter/cutnpaste/na-tray-manager.h b/gui/simple-greeter/libnotificationarea/na-tray-manager.h
index 4d4e7880..4d4e7880 100644
--- a/gui/simple-greeter/cutnpaste/na-tray-manager.h
+++ b/gui/simple-greeter/libnotificationarea/na-tray-manager.h
diff --git a/gui/simple-greeter/cutnpaste/na-tray.c b/gui/simple-greeter/libnotificationarea/na-tray.c
index 9bfc19f2..9bfc19f2 100644
--- a/gui/simple-greeter/cutnpaste/na-tray.c
+++ b/gui/simple-greeter/libnotificationarea/na-tray.c
diff --git a/gui/simple-greeter/cutnpaste/na-tray.h b/gui/simple-greeter/libnotificationarea/na-tray.h
index db6f058a..db6f058a 100644
--- a/gui/simple-greeter/cutnpaste/na-tray.h
+++ b/gui/simple-greeter/libnotificationarea/na-tray.h
diff --git a/gui/simple-greeter/cutnpaste/obox.c b/gui/simple-greeter/libnotificationarea/obox.c
index 96e4265c..96e4265c 100644
--- a/gui/simple-greeter/cutnpaste/obox.c
+++ b/gui/simple-greeter/libnotificationarea/obox.c
diff --git a/gui/simple-greeter/cutnpaste/obox.h b/gui/simple-greeter/libnotificationarea/obox.h
index 5995da46..5995da46 100644
--- a/gui/simple-greeter/cutnpaste/obox.h
+++ b/gui/simple-greeter/libnotificationarea/obox.h
diff --git a/gui/simple-greeter/cutnpaste/testtray.c b/gui/simple-greeter/libnotificationarea/testtray.c
index 42d37329..42d37329 100644
--- a/gui/simple-greeter/cutnpaste/testtray.c
+++ b/gui/simple-greeter/libnotificationarea/testtray.c