info: Rename info panel to info-overview for consistency

12 files changed, 13 insertions, 16 deletions

diff --git a/panels/info/GnomeLogoVerticalMedium.svg b/panels/info-overview/GnomeLogoVerticalMedium.svg
index b697f06a5..b697f06a5 100644
--- a/panels/info/GnomeLogoVerticalMedium.svg
+++ b/panels/info-overview/GnomeLogoVerticalMedium.svg
diff --git a/panels/info/cc-info-overview-panel.c b/panels/info-overview/cc-info-overview-panel.c
index 09a589dcd..664e577c6 100644
--- a/panels/info/cc-info-overview-panel.c
+++ b/panels/info-overview/cc-info-overview-panel.c
@@ -24,7 +24,7 @@
 #include "cc-hostname-entry.h"
 #include "cc-os-release.h"
 
-#include "cc-info-resources.h"
+#include "cc-info-overview-resources.h"
 #include "info-cleanup.h"
 
 #include <glib.h>
@@ -749,7 +749,7 @@ cc_info_overview_panel_class_init (CcInfoOverviewPanelClass *klass)
   object_class->finalize = cc_info_overview_panel_finalize;
   object_class->dispose = cc_info_overview_panel_dispose;
 
-  gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/control-center/info/cc-info-overview-panel.ui");
+  gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/control-center/info-overview/cc-info-overview-panel.ui");
 
   gtk_widget_class_bind_template_child_private (widget_class, CcInfoOverviewPanel, system_image);
   gtk_widget_class_bind_template_child_private (widget_class, CcInfoOverviewPanel, version_label);
@@ -777,7 +777,7 @@ cc_info_overview_panel_init (CcInfoOverviewPanel *self)
 
   gtk_widget_init_template (GTK_WIDGET (self));
 
-  g_resources_register (cc_info_get_resource ());
+  g_resources_register (cc_info_overview_get_resource ());
 
   priv->graphics_data = get_graphics_data ();
 
diff --git a/panels/info/cc-info-overview-panel.h b/panels/info-overview/cc-info-overview-panel.h
index 4d0c2f1d9..4d0c2f1d9 100644
--- a/panels/info/cc-info-overview-panel.h
+++ b/panels/info-overview/cc-info-overview-panel.h
diff --git a/panels/info/cc-info-overview-panel.ui b/panels/info-overview/cc-info-overview-panel.ui
index ce675d383..c0e170a37 100644
--- a/panels/info/cc-info-overview-panel.ui
+++ b/panels/info-overview/cc-info-overview-panel.ui
@@ -30,7 +30,7 @@
                   <object class="GtkImage" id="system_image">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="resource">/org/gnome/control-center/info/GnomeLogoVerticalMedium.svg</property>
+                    <property name="resource">/org/gnome/control-center/info-overview/GnomeLogoVerticalMedium.svg</property>
                   </object>
                   <packing>
                     <property name="expand">False</property>
diff --git a/panels/info/gnome-info-overview-panel.desktop.in.in b/panels/info-overview/gnome-info-overview-panel.desktop.in.in
index 8b939b6e3..8b939b6e3 100644
--- a/panels/info/gnome-info-overview-panel.desktop.in.in
+++ b/panels/info-overview/gnome-info-overview-panel.desktop.in.in
diff --git a/panels/info/info-cleanup.c b/panels/info-overview/info-cleanup.c
index 9c2239523..9c2239523 100644
--- a/panels/info/info-cleanup.c
+++ b/panels/info-overview/info-cleanup.c
diff --git a/panels/info/info-cleanup.h b/panels/info-overview/info-cleanup.h
index cbc8d541d..cbc8d541d 100644
--- a/panels/info/info-cleanup.h
+++ b/panels/info-overview/info-cleanup.h
diff --git a/panels/info/info.gresource.xml b/panels/info-overview/info-overview.gresource.xml
index ac9d4d2a9..83806e0ad 100644
--- a/panels/info/info.gresource.xml
+++ b/panels/info-overview/info-overview.gresource.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <gresources>
-  <gresource prefix="/org/gnome/control-center/info">
+  <gresource prefix="/org/gnome/control-center/info-overview">
     <file preprocess="xml-stripblanks">cc-info-overview-panel.ui</file>
     <file>GnomeLogoVerticalMedium.svg</file>
   </gresource>
diff --git a/panels/info/meson.build b/panels/info-overview/meson.build
index 2e54c9079..562a83ce8 100644
--- a/panels/info/meson.build
+++ b/panels/info-overview/meson.build
@@ -1,8 +1,5 @@
-desktop = 'gnome-@0@-panel.desktop'.format('info-overview')
-
-panels_list += 'info-overview'
-
-desktop = 'gnome-info-overview-panel.desktop'
+panels_list += cappletname
+desktop = 'gnome-@0@-panel.desktop'.format(cappletname)
 
 desktop_in = configure_file(
   input: desktop + '.in.in',
@@ -39,7 +36,7 @@ resource_data = files(
 sources += gnome.compile_resources(
   'cc-' + cappletname + '-resources',
   cappletname + '.gresource.xml',
-  c_name: 'cc_' + cappletname,
+  c_name: 'cc_' + cappletname.underscorify (),
   dependencies: resource_data,
   export: true
 )
diff --git a/panels/meson.build b/panels/meson.build
index 3e7b9696d..190fee6f2 100644
--- a/panels/meson.build
+++ b/panels/meson.build
@@ -7,7 +7,7 @@ panels = [
   'datetime',
   'default-apps',
   'display',
-  'info',
+  'info-overview',
   'keyboard',
   'mouse',
   'notifications',
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 38280a989..c91489ee8 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -44,9 +44,9 @@ panels/display/cc-display-settings.ui
 panels/display/cc-night-light-page.c
 panels/display/cc-night-light-page.ui
 panels/display/gnome-display-panel.desktop.in.in
-panels/info/cc-info-overview-panel.c
-panels/info/cc-info-overview-panel.ui
-panels/info/gnome-info-overview-panel.desktop.in.in
+panels/info-overview/cc-info-overview-panel.c
+panels/info-overview/cc-info-overview-panel.ui
+panels/info-overview/gnome-info-overview-panel.desktop.in.in
 panels/keyboard/00-multimedia.xml.in
 panels/keyboard/01-input-sources.xml.in
 panels/keyboard/01-launchers.xml.in
diff --git a/tests/info/meson.build b/tests/info/meson.build
index 202e9e34e..0f5d7a916 100644
--- a/tests/info/meson.build
+++ b/tests/info/meson.build
@@ -3,7 +3,7 @@ test_units = [
   'test-info-cleanup'
 ]
 
-includes = [top_inc, include_directories('../../panels/info')]
+includes = [top_inc, include_directories('../../panels/info-overview')]
 cflags = '-DTEST_SRCDIR="@0@"'.format(meson.current_source_dir())
 
 foreach unit: test_units