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)