[gnome-panel/wip/muktupavels/remove-dbus-applet-manager] remove PanelAppletsManagerDBus



commit 382921d752140cab176f89b950225306af4e5115
Author: Alberts Muktupāvels <alberts muktupavels gmail com>
Date:   Tue Mar 31 23:46:48 2020 +0300

    remove PanelAppletsManagerDBus

 gnome-panel/libpanel-applet-private/Makefile.am    |   8 -
 .../libpanel-applet-private/gp-applet-manager.c    |   9 -
 .../panel-applet-container.c                       | 781 ---------------------
 .../panel-applet-container.h                       | 119 ----
 .../panel-applet-frame-dbus.c                      | 378 ----------
 .../panel-applet-frame-dbus.h                      |  59 --
 .../panel-applets-manager-dbus.c                   | 611 ----------------
 .../panel-applets-manager-dbus.h                   |  54 --
 gnome-panel/panel-applet-frame.c                   |   9 -
 gnome-panel/panel-applets-manager.c                |  24 -
 gnome-panel/panel-applets-manager.h                |   7 -
 11 files changed, 2059 deletions(-)
---
diff --git a/gnome-panel/libpanel-applet-private/Makefile.am b/gnome-panel/libpanel-applet-private/Makefile.am
index 72ca1fe11..31b1a9c03 100644
--- a/gnome-panel/libpanel-applet-private/Makefile.am
+++ b/gnome-panel/libpanel-applet-private/Makefile.am
@@ -6,8 +6,6 @@ noinst_LTLIBRARIES = \
 
 libpanel_applet_private_la_CFLAGS = \
        -DMODULESDIR=\""$(libdir)/gnome-panel/modules"\" \
-       -DDATADIR=\""$(datadir)"\" \
-       -DPANEL_APPLETS_DIR=\"$(appletsdir)\" \
        -I$(srcdir) \
        -I$(top_srcdir) \
        -I$(top_srcdir)/gnome-panel \
@@ -24,12 +22,6 @@ libpanel_applet_private_la_SOURCES = \
        gp-applet-frame.h \
        gp-applet-manager.c \
        gp-applet-manager.h \
-       panel-applets-manager-dbus.c    \
-       panel-applets-manager-dbus.h    \
-       panel-applet-container.c        \
-       panel-applet-container.h        \
-       panel-applet-frame-dbus.c       \
-       panel-applet-frame-dbus.h \
        $(NULL)
 
 libpanel_applet_private_la_LIBADD = \
diff --git a/gnome-panel/libpanel-applet-private/gp-applet-manager.c 
b/gnome-panel/libpanel-applet-private/gp-applet-manager.c
index d391d21d9..6bb2879e4 100644
--- a/gnome-panel/libpanel-applet-private/gp-applet-manager.c
+++ b/gnome-panel/libpanel-applet-private/gp-applet-manager.c
@@ -314,14 +314,6 @@ gp_applet_manager_load_applet (PanelAppletsManager        *manager,
   return TRUE;
 }
 
-static GtkWidget *
-gp_applet_manager_get_applet_widget (PanelAppletsManager *manager,
-                                     const gchar         *iid,
-                                     guint                uid)
-{
-  return NULL;
-}
-
 static gchar *
 gp_applet_manager_get_new_iid (PanelAppletsManager *manager,
                                const gchar         *old_iid)
@@ -472,7 +464,6 @@ gp_applet_manager_class_init (GpAppletManagerClass *manager_class)
   applets_manager_class->factory_deactivate = gp_applet_manager_factory_deactivate;
   applets_manager_class->get_applet_info = gp_applet_manager_get_applet_info;
   applets_manager_class->load_applet = gp_applet_manager_load_applet;
-  applets_manager_class->get_applet_widget = gp_applet_manager_get_applet_widget;
   applets_manager_class->get_new_iid = gp_applet_manager_get_new_iid;
   applets_manager_class->open_initial_setup_dialog = gp_applet_manager_open_initial_setup_dialog;
   applets_manager_class->get_standalone_menu = gp_applet_manager_get_standalone_menu;
diff --git a/gnome-panel/panel-applet-frame.c b/gnome-panel/panel-applet-frame.c
index b71cf90a6..3c3b94da6 100644
--- a/gnome-panel/panel-applet-frame.c
+++ b/gnome-panel/panel-applet-frame.c
@@ -40,7 +40,6 @@
 #include "panel-object-loader.h"
 #include "panel-schemas.h"
 
-#include <libpanel-applet-private/panel-applet-frame-dbus.h>
 #include "panel-applet-frame.h"
 
 #define PANEL_RESPONSE_DELETE      0
@@ -336,14 +335,6 @@ panel_applet_frame_button_changed (GtkWidget      *widget,
 
        frame = PANEL_APPLET_FRAME (widget);
 
-       if (PANEL_IS_APPLET_FRAME_DBUS (frame)) {
-               if (!frame->priv->has_handle)
-                       return FALSE;
-
-               if (event->window != gtk_widget_get_window (widget))
-                       return FALSE;
-       }
-
        modifiers = event->state & gtk_accelerator_get_default_mod_mask ();
 
        switch (event->button) {
diff --git a/gnome-panel/panel-applets-manager.c b/gnome-panel/panel-applets-manager.c
index e6dd9d588..17a058299 100644
--- a/gnome-panel/panel-applets-manager.c
+++ b/gnome-panel/panel-applets-manager.c
@@ -23,7 +23,6 @@
 #include <gio/gio.h>
 
 #include <libpanel-applet-private/gp-applet-manager.h>
-#include <libpanel-applet-private/panel-applets-manager-dbus.h>
 #include <libpanel-util/panel-cleanup.h>
 
 #include "panel-applets-manager.h"
@@ -61,9 +60,6 @@ _panel_applets_managers_ensure_loaded (void)
 
        panel_cleanup_register (PANEL_CLEAN_FUNC (_panel_applets_manager_cleanup), NULL);
 
-       manager = g_object_new (PANEL_TYPE_APPLETS_MANAGER_DBUS, NULL);
-       panel_applets_managers = g_slist_append (panel_applets_managers, manager);
-
        manager = g_object_new (GP_TYPE_APPLET_MANAGER, NULL);
        panel_applets_managers = g_slist_append (panel_applets_managers, manager);
 }
@@ -160,26 +156,6 @@ panel_applets_manager_load_applet (const gchar                *iid,
        return FALSE;
 }
 
-GtkWidget *
-panel_applets_manager_get_applet_widget (const gchar *iid,
-                                         guint        uid)
-{
-       GSList *l;
-
-       _panel_applets_managers_ensure_loaded ();
-
-       for (l = panel_applets_managers; l != NULL; l = l->next) {
-               PanelAppletsManager *manager = PANEL_APPLETS_MANAGER (l->data);
-
-               if (!PANEL_APPLETS_MANAGER_GET_CLASS (manager)->get_applet_info (manager, iid))
-                       continue;
-
-               return PANEL_APPLETS_MANAGER_GET_CLASS (manager)->get_applet_widget (manager, iid, uid);
-       }
-
-       return NULL;
-}
-
 gchar *
 panel_applets_manager_get_new_iid (const gchar *old_iid)
 {
diff --git a/gnome-panel/panel-applets-manager.h b/gnome-panel/panel-applets-manager.h
index 8f3a75c5d..c1cfa037d 100644
--- a/gnome-panel/panel-applets-manager.h
+++ b/gnome-panel/panel-applets-manager.h
@@ -58,10 +58,6 @@ struct _PanelAppletsManagerClass {
                                                     const gchar                 *iid,
                                                     PanelAppletFrameActivating  *frame_act);
 
-       GtkWidget        * (*get_applet_widget)     (PanelAppletsManager         *manager,
-                                                    const gchar                 *iid,
-                                                    guint                        uid);
-
        gchar            * (*get_new_iid)           (PanelAppletsManager         *manager,
                                                     const gchar                 *old_iid);
 
@@ -91,9 +87,6 @@ PanelAppletInfo  *panel_applets_manager_get_applet_info             (const gchar
 gboolean          panel_applets_manager_load_applet                 (const gchar                *iid,
                                                                     PanelAppletFrameActivating *frame_act);
 
-GtkWidget        *panel_applets_manager_get_applet_widget           (const gchar     *iid,
-                                                                     guint            uid);
-
 gchar            *panel_applets_manager_get_new_iid                 (const gchar     *old_iid);
 
 gboolean          panel_applets_manager_open_initial_setup_dialog   (const gchar            *iid,


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