[gnome-panel] panel: remove old compatibility code



commit 96b96c57670172a9d234d98900416201fce3cf53
Author: Alberts Muktupāvels <alberts muktupavels gmail com>
Date:   Thu Nov 10 19:19:07 2016 +0200

    panel: remove old compatibility code

 gnome-panel/Makefile.am           |    2 -
 gnome-panel/panel-applet-frame.c  |    7 ++--
 gnome-panel/panel-compatibility.c |   67 -------------------------------------
 gnome-panel/panel-compatibility.h |   35 -------------------
 4 files changed, 3 insertions(+), 108 deletions(-)
---
diff --git a/gnome-panel/Makefile.am b/gnome-panel/Makefile.am
index d397ad7..6cc10d2 100644
--- a/gnome-panel/Makefile.am
+++ b/gnome-panel/Makefile.am
@@ -23,7 +23,6 @@ panel_sources =                       \
        xstuff.c                \
        free-the-fish.c         \
        panel-session.c         \
-       panel-compatibility.c   \
        panel.c                 \
        applet.c                \
        panel-util.c            \
@@ -66,7 +65,6 @@ panel_headers =                       \
        xstuff.h                \
        free-the-fish.h         \
        panel-session.h         \
-       panel-compatibility.h   \
        panel.h                 \
        applet.h                \
        panel-util.h            \
diff --git a/gnome-panel/panel-applet-frame.c b/gnome-panel/panel-applet-frame.c
index a5d4ba8..ba59e63 100644
--- a/gnome-panel/panel-applet-frame.c
+++ b/gnome-panel/panel-applet-frame.c
@@ -41,7 +41,6 @@
 #include "panel-schemas.h"
 #include "panel-stock-icons.h"
 #include "xstuff.h"
-#include "panel-compatibility.h"
 
 #include <libpanel-applet-private/panel-applet-frame-dbus.h>
 #include "panel-applet-frame.h"
@@ -857,14 +856,14 @@ panel_applet_frame_load (PanelWidget *panel_widget,
        g_return_if_fail (panel_widget != NULL);
        g_return_if_fail (id != NULL);
 
-       applet_iid = panel_compatibility_get_applet_iid (settings, id);
-       if (!applet_iid) {
+       applet_iid = g_settings_get_string (settings, PANEL_OBJECT_IID_KEY);
+       if (*applet_iid == '\0') {
                panel_object_loader_stop_loading (id);
+               g_free (applet_iid);
                return;
        }
 
        panel_applet_frame_load_helper (applet_iid, panel_widget, id, settings);
-
        g_free (applet_iid);
 }
 


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