gnome-applets r11212 - in trunk/trashapplet: . src

[ryanl svn gnome org]

Author: ryanl
Date: Wed Jan 21 15:17:33 2009
New Revision: 11212
URL: http://svn.gnome.org/viewvc/gnome-applets?rev=11212&view=rev

Log:
2009-01-21  Ryan Lortie  <desrt desrt ca>

        * src/trashapplet.c: replace main with PANEL_APPLET_BONOBO_FACTORY
        macro



Modified:
   trunk/trashapplet/ChangeLog
   trunk/trashapplet/src/trashapplet.c

Modified: trunk/trashapplet/src/trashapplet.c
==============================================================================
--- trunk/trashapplet/src/trashapplet.c	(original)
+++ trunk/trashapplet/src/trashapplet.c	Wed Jan 21 15:17:33 2009
@@ -611,6 +611,10 @@
 
   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,22 +631,8 @@
   return retval;
 }
 
-int
-main (int argc, char *argv [])
-{
-  g_thread_init (NULL);
-
-  /* gettext stuff */
-  bindtextdomain (GETTEXT_PACKAGE, GNOMELOCALEDIR);     
-  bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");   
-  textdomain (GETTEXT_PACKAGE);
-
-  gtk_init (&argc, &argv);
-  bonobo_init (&argc, &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)