From 7f9d5e7b60856417a9d8c8f1853e64799eeb3a71 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@fedoraproject.org>
Date: Wed, 21 Jan 2009 15:43:14 +0000
Subject: fix trash applet startup

---
 gnome-applets.spec |  9 ++++++++-
 trash-init.patch   | 33 +++++++++++++++++++++++++++++++++
 2 files changed, 41 insertions(+), 1 deletion(-)
 create mode 100644 trash-init.patch

diff --git a/gnome-applets.spec b/gnome-applets.spec
index 3f1e6ee..c5e9ac5 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -35,7 +35,7 @@
 Summary:        Small applications for the GNOME panel
 Name:		gnome-applets
 Version:	2.25.4
-Release: 	1%{?dist}
+Release: 	2%{?dist}
 Epoch:          1
 License:	GPLv2+ and GFDL
 Group:          User Interface/Desktops
@@ -59,6 +59,9 @@ Patch35:        modemlights-libgnome.patch
 # do the nullapplet dance for battstat
 Patch40:	gnome-applets-null-battstat.patch
 
+# upstream fix
+Patch41:	trash-init.patch
+
 BuildRequires:  glib2-devel >= %{glib2_version}
 BuildRequires:  gtk2-devel >= %{gtk2_version}
 BuildRequires:  libgnomeui-devel >= %{libgnomeui_version}
@@ -142,6 +145,7 @@ and more.
 
 %patch31 -p1 -b .fix-find
 %patch40 -p1 -b .battstat-null
+%patch41 -p1 -b .trash-init
 
 # We don't ship gnome-system-tools
 rm -rf modemlights
@@ -336,6 +340,9 @@ fi
 %{_datadir}/PolicyKit/policy/org.gnome.cpufreqselector.policy
 
 %changelog
+* Wed Jan 21 2009 Matthias Clasen <mclasen@redhat.com> - 1:2.25.4-2
+- Fix trash applet not starting up
+
 * Tue Jan 20 2009 Matthias Clasen <mclasen@redhat.com> - 1:2.25.4-1
 - Update to 2.25.4
 
diff --git a/trash-init.patch b/trash-init.patch
new file mode 100644
index 0000000..5aecce0
--- /dev/null
+++ b/trash-init.patch
@@ -0,0 +1,33 @@
+diff -up gnome-applets-2.25.4/trashapplet/src/trashapplet.c.trash-init gnome-applets-2.25.4/trashapplet/src/trashapplet.c
+--- gnome-applets-2.25.4/trashapplet/src/trashapplet.c.trash-init	2009-01-21 10:39:43.000000000 -0500
++++ gnome-applets-2.25.4/trashapplet/src/trashapplet.c	2009-01-21 10:41:09.000000000 -0500
+@@ -611,6 +611,10 @@ trash_applet_factory (PanelApplet *apple
+ 
+   if (!strcmp (iid, "OAFIID:GNOME_Panel_TrashApplet"))
+     {
++      g_set_application_name (_("Trash Applet"));
++
++      gtk_window_set_default_icon_name ("user-trash");
++
+       /* Set up the menu */
+       panel_applet_setup_menu_from_file (applet,
+                                          DATADIR,
+@@ -627,13 +631,8 @@ trash_applet_factory (PanelApplet *apple
+   return retval;
+ }
+ 
+-int
+-main (int argc, char *argv [])
+-{
+-  gtk_window_set_default_icon_name ("user-trash");
+-  g_set_application_name (_("Trash Applet"));
+-
+-  return panel_applet_factory_main
+-          ("OAFIID:GNOME_Panel_TrashApplet_Factory", TRASH_TYPE_APPLET,
+-           trash_applet_factory, NULL);
+-}
++PANEL_APPLET_BONOBO_FACTORY ("OAFIID:GNOME_Panel_TrashApplet_Factory",
++                             TRASH_TYPE_APPLET,
++                             "TrashApplet", "0",
++                             trash_applet_factory,
++                             NULL)
-- 
cgit