[gnome-panel] libpanel-applet: remove panel_applet_factory_main



commit c515ef3af501226cfe4fb9f0979bad17098fa7b9
Author: Alberts Muktupāvels <alberts muktupavels gmail com>
Date:   Wed Sep 21 16:18:32 2016 +0300

    libpanel-applet: remove panel_applet_factory_main

 .../libpanel-applet/libpanel-applet-sections.txt   |    2 -
 libpanel-applet/panel-applet.c                     |   35 +-------------------
 libpanel-applet/panel-applet.h                     |    8 ----
 3 files changed, 1 insertions(+), 44 deletions(-)
---
diff --git a/doc/reference/libpanel-applet/libpanel-applet-sections.txt 
b/doc/reference/libpanel-applet/libpanel-applet-sections.txt
index 48ecf01..fd3d810 100644
--- a/doc/reference/libpanel-applet/libpanel-applet-sections.txt
+++ b/doc/reference/libpanel-applet/libpanel-applet-sections.txt
@@ -40,7 +40,5 @@ panel_applet_factory_setup_in_process
 <FILE>applet-factory</FILE>
 <TITLE>Panel Applet Factory</TITLE>
 PanelAppletFactoryCallback
-PANEL_APPLET_OUT_PROCESS_FACTORY
 PANEL_APPLET_IN_PROCESS_FACTORY
-panel_applet_factory_main
 </SECTION>
diff --git a/libpanel-applet/panel-applet.c b/libpanel-applet/panel-applet.c
index dc51bd5..c645010 100644
--- a/libpanel-applet/panel-applet.c
+++ b/libpanel-applet/panel-applet.c
@@ -1778,7 +1778,7 @@ panel_applet_constructed (GObject *object)
        PanelApplet *applet = PANEL_APPLET (object);
 
        if (!applet->priv->connection || !applet->priv->closure || !applet->priv->id) {
-               g_printerr ("Bad use of PanelApplet API: you should not create a PanelApplet object yourself. 
Please use panel_applet_factory_main() instead.\n");
+               g_printerr ("Bad use of PanelApplet API: you should not create a PanelApplet object 
yourself.\n");
                g_assert_not_reached ();
        }
 
@@ -2247,39 +2247,6 @@ _panel_applet_factory_main_internal (const gchar               *factory_id,
 }
 
 /**
- * panel_applet_factory_main:
- * @factory_id: identifier of an applet factory.
- * @applet_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.
- *
- * Creates the applet factory for @factory_id, so that the factory can create
- * instances of the applet types it is associated with.
- *
- * Applet instances created by the applet factory will use @applet_type as
- * GType. Unless you subclass #PanelApplet, you should use %PANEL_TYPE_APPLET
- * as @applet_type.
- *
- * On creation of the applet instances, @callback is called to setup the
- * applet. If @callback returns %FALSE, the creation of the applet instance is
- * cancelled.
- *
- * It can only be used once, and is incompatible with the use of
- * %PANEL_APPLET_IN_PROCESS_FACTORY.
- *
- * Returns: 0 on success, 1 if there is an error.
- **/
-int
-panel_applet_factory_main (const gchar               *factory_id,
-                          GType                      applet_type,
-                          PanelAppletFactoryCallback callback,
-                          gpointer                   data)
-{
-       return _panel_applet_factory_main_internal (factory_id, TRUE, applet_type,
-                                                   callback, data);
-}
-
-/**
  * panel_applet_factory_setup_in_process: (skip)
  * @factory_id: identifier of an applet factory.
  * @applet_type: GType of the applet this factory creates.
diff --git a/libpanel-applet/panel-applet.h b/libpanel-applet/panel-applet.h
index 0060a2c..a970fd1 100644
--- a/libpanel-applet/panel-applet.h
+++ b/libpanel-applet/panel-applet.h
@@ -194,11 +194,6 @@ void               panel_applet_setup_menu_from_resource (PanelApplet    *applet
                                                          GSimpleActionGroup *action_group,
                                                          const gchar        *translation_domain);
 
-int                panel_applet_factory_main          (const gchar               *factory_id,
-                                                      GType                       applet_type,
-                                                      PanelAppletFactoryCallback  callback,
-                                                      gpointer                    data);
-
 int                panel_applet_factory_setup_in_process (const gchar               *factory_id,
                                                          GType                      applet_type,
                                                          PanelAppletFactoryCallback callback,
@@ -245,9 +240,6 @@ int                panel_applet_factory_setup_in_process (const gchar
  * On creation of the applet instances, @callback is called to setup the
  * applet. If @callback returns %FALSE, the creation of the applet instance is
  * cancelled.
- *
- * It can only be used once, and is incompatible with the use of
- * panel_applet_factory_main().
  */
 #define PANEL_APPLET_IN_PROCESS_FACTORY(factory_id, type, callback, data)       \
 gboolean _panel_applet_shlib_factory (void);                                   \


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]