[gnome-panel] libpanel-applet: Remove unused name arg in FACTORY macros

[Vincent Untz <vuntz src gnome org>]

commit 133befebc70aa656542911c95f46a2c7f4ceacbc
Author: Vincent Untz <vuntz gnome org>
Date:   Thu Feb 24 12:21:41 2011 +0100

    libpanel-applet: Remove unused name arg in FACTORY macros
    
    This breaks API, so all applets need to be udpated. But it's just
    removing a name, so it's easy.

 applets/clock/clock.c              |    2 --
 applets/fish/fish.c                |    2 --
 applets/notification_area/main.c   |    2 --
 applets/wncklet/wncklet.c          |    2 --
 libpanel-applet/panel-applet.h     |    4 ++--
 libpanel-applet/test-dbus-applet.c |    1 -
 6 files changed, 2 insertions(+), 11 deletions(-)
---
diff --git a/applets/clock/clock.c b/applets/clock/clock.c
index 3229103..3208a2f 100644
--- a/applets/clock/clock.c
+++ b/applets/clock/clock.c
@@ -3565,13 +3565,11 @@ clock_factory (PanelApplet *applet,
 #ifdef CLOCK_INPROCESS
 PANEL_APPLET_IN_PROCESS_FACTORY ("ClockAppletFactory",
                                  PANEL_TYPE_APPLET,
-                                 "ClockApplet",
                                  clock_factory,
                                  NULL)
 #else
 PANEL_APPLET_OUT_PROCESS_FACTORY ("ClockAppletFactory",
                                   PANEL_TYPE_APPLET,
-                                  "ClockApplet",
                                   clock_factory,
                                   NULL)
 #endif
diff --git a/applets/fish/fish.c b/applets/fish/fish.c
index 8d05ae9..e2ae89c 100644
--- a/applets/fish/fish.c
+++ b/applets/fish/fish.c
@@ -2076,14 +2076,12 @@ fish_applet_get_type (void)
 #ifdef FISH_INPROCESS
 PANEL_APPLET_IN_PROCESS_FACTORY ("FishAppletFactory",
 				 fish_applet_get_type (),
-				 "That-stupid-fish",
 				 fishy_factory,
 				 NULL)
 
 #else
 PANEL_APPLET_OUT_PROCESS_FACTORY ("FishAppletFactory",
 				  fish_applet_get_type (),
-				  "That-stupid-fish",
 				  fishy_factory,
 				  NULL)
 #endif
diff --git a/applets/notification_area/main.c b/applets/notification_area/main.c
index b87d426..b515672 100644
--- a/applets/notification_area/main.c
+++ b/applets/notification_area/main.c
@@ -260,13 +260,11 @@ applet_factory (PanelApplet *applet,
 #ifdef NOTIFICATION_AREA_INPROCESS
 PANEL_APPLET_IN_PROCESS_FACTORY ("NotificationAreaAppletFactory",
 				 NA_TYPE_TRAY_APPLET,
-				 "NotificationArea",
 				 applet_factory,
 				 NULL)
 #else
 PANEL_APPLET_OUT_PROCESS_FACTORY ("NotificationAreaAppletFactory",
 				  NA_TYPE_TRAY_APPLET,
-				  "NotificationArea",
 				  applet_factory,
 				  NULL)
 #endif
diff --git a/applets/wncklet/wncklet.c b/applets/wncklet/wncklet.c
index 5d8abfd..5ac8d95 100644
--- a/applets/wncklet/wncklet.c
+++ b/applets/wncklet/wncklet.c
@@ -172,13 +172,11 @@ wncklet_factory (PanelApplet *applet,
 #ifdef WNCKLET_INPROCESS
 PANEL_APPLET_IN_PROCESS_FACTORY ("WnckletFactory",
 				 PANEL_TYPE_APPLET,
-				 "WindowNavigationApplets",
 				 wncklet_factory,
 				 NULL)
 #else
 PANEL_APPLET_OUT_PROCESS_FACTORY ("WnckletFactory",
 				  PANEL_TYPE_APPLET,
-				  "WindowNavigationApplets",
 				  wncklet_factory,
 				  NULL)
 #endif
diff --git a/libpanel-applet/panel-applet.h b/libpanel-applet/panel-applet.h
index fbe1975..1aa776e 100644
--- a/libpanel-applet/panel-applet.h
+++ b/libpanel-applet/panel-applet.h
@@ -145,7 +145,7 @@ int                panel_applet_factory_main          (const gchar		  *factory_i
 	} while (0)
 #endif /* !defined(ENABLE_NLS) */
 
-#define PANEL_APPLET_OUT_PROCESS_FACTORY(id, type, name, callback, data)	\
+#define PANEL_APPLET_OUT_PROCESS_FACTORY(id, type, callback, data)		\
 int main (int argc, char *argv [])						\
 {										\
 	GOptionContext *context;						\
@@ -177,7 +177,7 @@ int main (int argc, char *argv [])						\
 	return retval;								\
 }
 
-#define PANEL_APPLET_IN_PROCESS_FACTORY(id, type, descr, callback, data)	\
+#define PANEL_APPLET_IN_PROCESS_FACTORY(id, type, callback, data)		\
 gboolean _panel_applet_shlib_factory (void);					\
 G_MODULE_EXPORT gint                                                            \
 _panel_applet_shlib_factory (void)					        \
diff --git a/libpanel-applet/test-dbus-applet.c b/libpanel-applet/test-dbus-applet.c
index 8046b5d..e0a4991 100644
--- a/libpanel-applet/test-dbus-applet.c
+++ b/libpanel-applet/test-dbus-applet.c
@@ -186,7 +186,6 @@ test_applet_factory (TestApplet  *applet,
 
 PANEL_APPLET_OUT_PROCESS_FACTORY ("TestAppletFactory",
 				  test_applet_get_type (),
-				  "A Test Applet for the GNOME-3.0 Panel",
 				  (PanelAppletFactoryCallback) test_applet_factory,
 				  NULL)