summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libmate-panel-applet/mate-panel-applet.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/libmate-panel-applet/mate-panel-applet.h b/libmate-panel-applet/mate-panel-applet.h
index 6d747ca4..842a2ab9 100644
--- a/libmate-panel-applet/mate-panel-applet.h
+++ b/libmate-panel-applet/mate-panel-applet.h
@@ -112,10 +112,10 @@ void mate_panel_applet_request_focus(MatePanelApplet* applet, guint32 timestamp)
void mate_panel_applet_setup_menu(MatePanelApplet* applet, const gchar* xml, GtkActionGroup* action_group);
void mate_panel_applet_setup_menu_from_file(MatePanelApplet* applet, const gchar* filename, GtkActionGroup* action_group);
-int mate_panel_applet_factory_main(const gchar* factory_id, GType applet_type, MatePanelAppletFactoryCallback callback, gpointer data);
+int mate_panel_applet_factory_main(const gchar* factory_factory_id, GType applet_type, MatePanelAppletFactoryCallback callback, gpointer data);
gboolean _mate_panel_applet_shlib_factory(void);
-int panel_applet_factory_setup_in_process (const gchar *factory_id,
+int panel_applet_factory_setup_in_process (const gchar *factory_factory_id,
GType applet_type,
MatePanelAppletFactoryCallback callback,
gpointer data);
@@ -143,7 +143,7 @@ int panel_applet_factory_setup_in_process (const gchar *factory_i
} while (0)
#endif /* !defined(ENABLE_NLS) */
-#define MATE_PANEL_APPLET_OUT_PROCESS_FACTORY(id, type, name, callback, data) \
+#define MATE_PANEL_APPLET_OUT_PROCESS_FACTORY(factory_id, type, name, callback, data) \
int main(int argc, char* argv[]) \
{ \
GOptionContext* context; \
@@ -173,17 +173,17 @@ int main(int argc, char* argv[]) \
\
gtk_init (&argc, &argv); \
\
- retval = mate_panel_applet_factory_main (id, type, callback, data); \
+ retval = mate_panel_applet_factory_main (factory_id, type, callback, data); \
g_option_context_free (context); \
\
return retval; \
}
-#define MATE_PANEL_APPLET_IN_PROCESS_FACTORY(id, type, descr, callback, data) \
+#define MATE_PANEL_APPLET_IN_PROCESS_FACTORY(factory_id, type, descr, callback, data) \
G_MODULE_EXPORT gint _mate_panel_applet_shlib_factory(void) \
{ \
_MATE_PANEL_APPLET_SETUP_GETTEXT(FALSE); \
-return mate_panel_applet_factory_setup_in_process (id, type, \
+return mate_panel_applet_factory_setup_in_process (factory_id, type, \
callback, data); \
}