GNOME.org
 

[gnome-control-center/wip/gbsneto/remove-old-shell: 3/4] project: Remove CcInfoPanel

commit 866981714e6d161118adcd3209dbf374d0fbcfc5
Author: Georges Basile Stavracas Neto <georges stavracas gmail com>
Date:   Sat Nov 11 01:22:40 2017 -0200

    project: Remove CcInfoPanel
    
    This panel was hidden in the new shell, and now that
    we don't have the old one, can be safely dropped.
    
    Minor adjustments were made to the other panels to
    properly remove this panel.

 configure.ac                                |    1 -
 panels/info/Makefile.am                     |   25 ++--
 panels/info/cc-info-default-apps-panel.c    |    3 +-
 panels/info/cc-info-default-apps-panel.h    |    2 +-
 panels/info/cc-info-overview-panel.c        |    5 +-
 panels/info/cc-info-overview-panel.h        |    2 +-
 panels/info/cc-info-panel.c                 |  194 ---------------------------
 panels/info/cc-info-panel.h                 |   33 -----
 panels/info/cc-info-removable-media-panel.c |    3 +-
 panels/info/cc-info-removable-media-panel.h |    2 +-
 panels/info/gnome-info-panel.desktop.in.in  |   20 ---
 panels/info/info.gresource.xml              |    1 -
 panels/info/info.ui                         |  125 -----------------
 shell/cc-panel-loader.c                     |    2 -
 14 files changed, 22 insertions(+), 396 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index d8b61a0..985af89 100644
--- a/configure.ac
+++ b/configure.ac
@@ -513,7 +513,6 @@ panels/sound/data/icons/scalable/apps/Makefile
 panels/sound/data/icons/scalable/devices/Makefile
 panels/sound/data/sounds/Makefile
 panels/info/Makefile
-panels/info/gnome-info-panel.desktop.in
 panels/info/gnome-info-overview-panel.desktop.in
 panels/info/gnome-default-apps-panel.desktop.in
 panels/info/gnome-removable-media-panel.desktop.in
diff --git a/panels/info/Makefile.am b/panels/info/Makefile.am
index 5c7e9d7..87cb6ad 100644
--- a/panels/info/Makefile.am
+++ b/panels/info/Makefile.am
@@ -17,19 +17,17 @@ BUILT_SOURCES =                     \
        cc-info-resources.c     \
        cc-info-resources.h
 
-libinfo_la_SOURCES =           \
-       $(BUILT_SOURCES)        \
-       cc-info-panel.c         \
-       cc-info-panel.h         \
-       cc-info-overview-panel.c                \
-       cc-info-overview-panel.h                \
-       cc-info-default-apps-panel.c            \
-       cc-info-default-apps-panel.h            \
-       cc-info-removable-media-panel.c         \
-       cc-info-removable-media-panel.h         \
-       gsd-disk-space-helper.h \
-       gsd-disk-space-helper.c \
-       info-cleanup.h          \
+libinfo_la_SOURCES =                   \
+       $(BUILT_SOURCES)                \
+       cc-info-overview-panel.c        \
+       cc-info-overview-panel.h        \
+       cc-info-default-apps-panel.c    \
+       cc-info-default-apps-panel.h    \
+       cc-info-removable-media-panel.c \
+       cc-info-removable-media-panel.h \
+       gsd-disk-space-helper.h         \
+       gsd-disk-space-helper.c         \
+       info-cleanup.h                  \
        info-cleanup.c
 
 libinfo_la_LIBADD = $(PANEL_LIBS) $(INFO_PANEL_LIBS)
@@ -53,7 +51,6 @@ cc-info-resources.h: info.gresource.xml $(resource_files)
 
 desktopdir = $(datadir)/applications
 desktop_in_files = \
-               gnome-info-panel.desktop.in             \
                gnome-info-overview-panel.desktop.in    \
                gnome-default-apps-panel.desktop.in     \
                gnome-removable-media-panel.desktop.in
diff --git a/panels/info/cc-info-default-apps-panel.c b/panels/info/cc-info-default-apps-panel.c
index 1aa7404..86672e2 100644
--- a/panels/info/cc-info-default-apps-panel.c
+++ b/panels/info/cc-info-default-apps-panel.c
@@ -21,7 +21,6 @@
 
 #include <config.h>
 
-#include "cc-info-panel.h"
 #include "cc-info-resources.h"
 #include "info-cleanup.h"
 
@@ -201,6 +200,8 @@ cc_info_default_apps_panel_class_init (CcInfoDefaultAppsPanelClass *klass)
 static void
 cc_info_default_apps_panel_init (CcInfoDefaultAppsPanel *self)
 {
+  g_resources_register (cc_info_get_resource ());
+
   gtk_widget_init_template (GTK_WIDGET (self));
 
   info_panel_setup_default_apps (self);
diff --git a/panels/info/cc-info-default-apps-panel.h b/panels/info/cc-info-default-apps-panel.h
index 7fb1d72..031d258 100644
--- a/panels/info/cc-info-default-apps-panel.h
+++ b/panels/info/cc-info-default-apps-panel.h
@@ -20,7 +20,7 @@
 #ifndef CC_INFO_DEFAULT_APPS_PANEL_H
 #define CC_INFO_DEFAULT_APPS_PANEL_H
 
-#include <gtk/gtk.h>
+#include <shell/cc-panel.h>
 
 G_BEGIN_DECLS
 
diff --git a/panels/info/cc-info-overview-panel.c b/panels/info/cc-info-overview-panel.c
index 3af58be..5c54f62 100644
--- a/panels/info/cc-info-overview-panel.c
+++ b/panels/info/cc-info-overview-panel.c
@@ -21,7 +21,6 @@
 
 #include <config.h>
 
-#include "cc-info-panel.h"
 #include "cc-info-resources.h"
 #include "info-cleanup.h"
 
@@ -36,6 +35,8 @@
 #include <glibtop/mem.h>
 #include <glibtop/sysinfo.h>
 
+#include <gdk/gdk.h>
+
 #ifdef GDK_WINDOWING_WAYLAND
 #include <gdk/gdkwayland.h>
 #endif
@@ -937,6 +938,8 @@ cc_info_overview_panel_init (CcInfoOverviewPanel *self)
 
   gtk_widget_init_template (GTK_WIDGET (self));
 
+  g_resources_register (cc_info_get_resource ());
+
   priv->graphics_data = get_graphics_data ();
 
   if (does_gnome_software_exist () || does_gpk_update_viewer_exist ())
diff --git a/panels/info/cc-info-overview-panel.h b/panels/info/cc-info-overview-panel.h
index d81fe58..4d0c2f1 100644
--- a/panels/info/cc-info-overview-panel.h
+++ b/panels/info/cc-info-overview-panel.h
@@ -20,7 +20,7 @@
 #ifndef CC_INFO_OVERVIEWPANEL_H
 #define CC_INFO_OVERVIEWPANEL_H
 
-#include <gtk/gtk.h>
+#include <shell/cc-panel.h>
 
 G_BEGIN_DECLS
 
diff --git a/panels/info/cc-info-removable-media-panel.c b/panels/info/cc-info-removable-media-panel.c
index f6a3b52..27731cc 100644
--- a/panels/info/cc-info-removable-media-panel.c
+++ b/panels/info/cc-info-removable-media-panel.c
@@ -21,7 +21,6 @@
 
 #include <config.h>
 
-#include "cc-info-panel.h"
 #include "cc-info-resources.h"
 #include "info-cleanup.h"
 
@@ -618,6 +617,8 @@ cc_info_removable_media_panel_class_init (CcInfoRemovableMediaPanelClass *klass)
 static void
 cc_info_removable_media_panel_init (CcInfoRemovableMediaPanel *self)
 {
+  g_resources_register (cc_info_get_resource ());
+
   gtk_widget_init_template (GTK_WIDGET (self));
   self->media_settings = g_settings_new (MEDIA_HANDLING_SCHEMA);
 
diff --git a/panels/info/cc-info-removable-media-panel.h b/panels/info/cc-info-removable-media-panel.h
index d0d1660..c77d963 100644
--- a/panels/info/cc-info-removable-media-panel.h
+++ b/panels/info/cc-info-removable-media-panel.h
@@ -20,7 +20,7 @@
 #ifndef CC_INFO_REMOVABLE_MEDIA_PANEL_H
 #define CC_INFO_REMOVABLE_MEDIA_PANEL_H
 
-#include <gtk/gtk.h>
+#include <shell/cc-panel.h>
 
 G_BEGIN_DECLS
 
diff --git a/panels/info/info.gresource.xml b/panels/info/info.gresource.xml
index ce49a67..c967223 100644
--- a/panels/info/info.gresource.xml
+++ b/panels/info/info.gresource.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <gresources>
   <gresource prefix="/org/gnome/control-center/info">
-    <file preprocess="xml-stripblanks">info.ui</file>
     <file preprocess="xml-stripblanks">info-overview.ui</file>
     <file preprocess="xml-stripblanks">info-default-apps.ui</file>
     <file preprocess="xml-stripblanks">info-removable-media.ui</file>
diff --git a/shell/cc-panel-loader.c b/shell/cc-panel-loader.c
index a7b88cb..a9762d6 100644
--- a/shell/cc-panel-loader.c
+++ b/shell/cc-panel-loader.c
@@ -36,7 +36,6 @@ extern GType cc_bluetooth_panel_get_type (void);
 extern GType cc_color_panel_get_type (void);
 extern GType cc_date_time_panel_get_type (void);
 extern GType cc_display_panel_get_type (void);
-extern GType cc_info_panel_get_type (void);
 extern GType cc_info_overview_panel_get_type (void);
 extern GType cc_info_default_apps_panel_get_type (void);
 extern GType cc_info_removable_media_panel_get_type (void);
@@ -82,7 +81,6 @@ static struct {
   PANEL_TYPE("color",            cc_color_panel_get_type        ),
   PANEL_TYPE("datetime",         cc_date_time_panel_get_type    ),
   PANEL_TYPE("display",          cc_display_panel_get_type      ),
-  PANEL_TYPE("info",             cc_info_panel_get_type         ),
   PANEL_TYPE("info-overview",    cc_info_overview_panel_get_type),
   PANEL_TYPE("default-apps",     cc_info_default_apps_panel_get_type),
   PANEL_TYPE("removable-media",  cc_info_removable_media_panel_get_type),
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]