[gnome-panel/wip/segeiger/reference-documentation: 6/8] libpanel-applet/panel-applet.h: Rename id to factory_id for factory macros

[Sebastian Geiger <segeiger src gnome org>]

commit c290ae963d16d2fbb4e2118745281317f8c6cf92
Author: Sebastian Geiger <sbastig gmx net>
Date:   Mon Aug 24 00:27:08 2015 +0200

    libpanel-applet/panel-applet.h: Rename id to factory_id for factory macros

 .../panel-applet/tmpl/applet-factory.sgml          |    4 ++--
 libpanel-applet/panel-applet.h                     |   12 ++++++------
 2 files changed, 8 insertions(+), 8 deletions(-)
---
diff --git a/doc/reference/panel-applet/tmpl/applet-factory.sgml 
b/doc/reference/panel-applet/tmpl/applet-factory.sgml
index 56fb358..7dfd626 100644
--- a/doc/reference/panel-applet/tmpl/applet-factory.sgml
+++ b/doc/reference/panel-applet/tmpl/applet-factory.sgml
@@ -36,7 +36,7 @@ Panel Applet Factory
 
 </para>
 
- id: 
+ factory_id:
 @type: 
 @callback: 
 @data: 
@@ -47,7 +47,7 @@ Panel Applet Factory
 
 </para>
 
- id: 
+ factory_id:
 @type: 
 @callback: 
 @data: 
diff --git a/libpanel-applet/panel-applet.h b/libpanel-applet/panel-applet.h
index d09971e..35a53f9 100644
--- a/libpanel-applet/panel-applet.h
+++ b/libpanel-applet/panel-applet.h
@@ -200,7 +200,7 @@ int                panel_applet_factory_setup_in_process (const gchar
 
 /**
  * PANEL_APPLET_OUT_PROCESS_FACTORY:
- * @id: identifier of an applet factory.
+ * @factory_id: identifier of an applet factory.
  * @type: GType of the applet this factory creates.
  * @callback: (scope call): callback to be called when a new applet is created.
  * @data: (closure): callback data.
@@ -220,7 +220,7 @@ int                panel_applet_factory_setup_in_process (const gchar
  * It can only be used once, and is incompatible with the use of
  * %PANEL_APPLET_IN_PROCESS_FACTORY and panel_applet_factory_main().
  **/
-#define PANEL_APPLET_OUT_PROCESS_FACTORY(id, type, callback, data)             \
+#define PANEL_APPLET_OUT_PROCESS_FACTORY(factory_id, type, callback, data)             \
 int main (int argc, char *argv [])                                             \
 {                                                                              \
        GOptionContext *context;                                                \
@@ -246,7 +246,7 @@ int main (int argc, char *argv [])                                          \
                                                                                \
        gtk_init (&argc, &argv);                                                \
                                                                                 \
-        retval = panel_applet_factory_main (id, type, callback, data);          \
+        retval = panel_applet_factory_main (factory_id, type, callback, data);          \
        g_option_context_free (context);                                        \
                                                                                \
        return retval;                                                          \
@@ -254,7 +254,7 @@ int main (int argc, char *argv [])                                          \
 
 /**
  * PANEL_APPLET_IN_PROCESS_FACTORY:
- * @id: identifier of an applet factory.
+ * @factory_id: identifier of an applet factory.
  * @type: GType of the applet this factory creates.
  * @callback: (scope call): callback to be called when a new applet is created.
  * @data: (closure): callback data.
@@ -273,13 +273,13 @@ int main (int argc, char *argv [])                                                \
  * It can only be used once, and is incompatible with the use of
  * %PANEL_APPLET_OUT_PROCESS_FACTORY and panel_applet_factory_main().
  **/
-#define PANEL_APPLET_IN_PROCESS_FACTORY(id, type, callback, data)              \
+#define PANEL_APPLET_IN_PROCESS_FACTORY(factory_id, type, callback, data)              \
 gboolean _panel_applet_shlib_factory (void);                                   \
 G_MODULE_EXPORT gint                                                            \
 _panel_applet_shlib_factory (void)                                             \
 {                                                                              \
        _PANEL_APPLET_SETUP_GETTEXT (FALSE);                                    \
-        return panel_applet_factory_setup_in_process (id, type,                 \
+        return panel_applet_factory_setup_in_process (factory_id, type,                 \
                                                       callback, data);          \
 }