[gnome-applets] i18n: include correct header file

From: Alberts Muktupāvels <muktupavels src gnome org>
To: commits-list gnome org
Cc:
Subject: [gnome-applets] i18n: include correct header file
Date: Tue, 31 Mar 2020 20:00:09 +0000 (UTC)
commit 1c5b05c6b6bf0b5046aefaaf17de6cc0addaba22
Author: Alberts Muktupāvels <alberts muktupavels gmail com>
Date:   Tue Mar 31 22:58:58 2020 +0300

    i18n: include correct header file

 gnome-applets/brightness/brightness-applet.c               |  2 +-
 gnome-applets/cpufreq/cpufreq-popup.c                      |  6 ++++--
 gnome-applets/cpufreq/cpufreq-popup.h                      |  1 +
 gnome-applets/cpufreq/cpufreq-prefs.c                      |  6 ++----
 gnome-applets/drivemount/drive-button.c                    |  8 +++-----
 gnome-applets/drivemount/drive-list.c                      |  8 +++-----
 gnome-applets/multiload/global.h                           |  1 -
 gnome-applets/multiload/multiload-applet.c                 |  4 +++-
 gnome-applets/multiload/netspeed.c                         |  7 ++++---
 gnome-applets/multiload/properties.c                       |  1 +
 gnome-applets/netspeed/preferences.c                       |  7 +++++--
 gnome-applets/sticky-notes/sticky-notes-applet-callbacks.c | 11 +++++++----
 gnome-applets/sticky-notes/sticky-notes-applet.c           |  1 +
 gnome-applets/sticky-notes/sticky-notes-applet.h           |  1 -
 gnome-applets/sticky-notes/sticky-notes-callbacks.c        |  2 ++
 gnome-applets/sticky-notes/sticky-notes.c                  |  6 ++++--
 gnome-applets/tracker-search-bar/tracker-utils.c           |  5 ++---
 gnome-applets/tracker-search-bar/tracker-utils.h           |  2 ++
 gnome-applets/trash/trash-applet.c                         |  2 +-
 gnome-applets/trash/trash-empty.c                          |  8 ++++----
 gnome-applets/window-picker/task-item.c                    |  6 ++++--
 gnome-applets/window-picker/wp-about-dialog.c              |  5 ++---
 gnome-applets/window-picker/wp-applet.c                    |  4 ++--
 23 files changed, 58 insertions(+), 46 deletions(-)
---
diff --git a/gnome-applets/brightness/brightness-applet.c b/gnome-applets/brightness/brightness-applet.c
index 161b6086d..84df4dc85 100644
--- a/gnome-applets/brightness/brightness-applet.c
+++ b/gnome-applets/brightness/brightness-applet.c
@@ -27,7 +27,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <gtk/gtk.h>
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
 #include <gdk/gdkkeysyms.h>
 #include <glib-object.h>
 
diff --git a/gnome-applets/cpufreq/cpufreq-popup.c b/gnome-applets/cpufreq/cpufreq-popup.c
index 9b1af428e..440d39c18 100644
--- a/gnome-applets/cpufreq/cpufreq-popup.c
+++ b/gnome-applets/cpufreq/cpufreq-popup.c
@@ -18,14 +18,16 @@
  * Authors : Carlos García Campos <carlosgc gnome org>
  */
 
-#include <glib/gi18n.h>
+#include "config.h"
+#include "cpufreq-popup.h"
+
+#include <glib/gi18n-lib.h>
 
 #include <gtk/gtk.h>
 #include <gdk/gdkx.h>
 #include <stdlib.h>
 #include <string.h>
 
-#include "cpufreq-popup.h"
 #include "cpufreq-selector-gen.h"
 #include "cpufreq-utils.h"
 
diff --git a/gnome-applets/cpufreq/cpufreq-popup.h b/gnome-applets/cpufreq/cpufreq-popup.h
index 6c5a541ea..4aa697439 100644
--- a/gnome-applets/cpufreq/cpufreq-popup.h
+++ b/gnome-applets/cpufreq/cpufreq-popup.h
@@ -22,6 +22,7 @@
 #define CPUFREQ_POPUP_H
 
 #include <glib-object.h>
+#include <gtk/gtk.h>
 
 #include "cpufreq-monitor.h"
 
diff --git a/gnome-applets/cpufreq/cpufreq-prefs.c b/gnome-applets/cpufreq/cpufreq-prefs.c
index e37d9eb5c..07a1a8965 100644
--- a/gnome-applets/cpufreq/cpufreq-prefs.c
+++ b/gnome-applets/cpufreq/cpufreq-prefs.c
@@ -18,14 +18,12 @@
  * Authors : Carlos García Campos <carlosgc gnome org>
  */
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
+#include "cpufreq-prefs.h"
 
 #include <gtk/gtk.h>
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
 
-#include "cpufreq-prefs.h"
 #include "cpufreq-utils.h"
 
 enum {
diff --git a/gnome-applets/drivemount/drive-button.c b/gnome-applets/drivemount/drive-button.c
index 74191667a..1aff4af64 100644
--- a/gnome-applets/drivemount/drive-button.c
+++ b/gnome-applets/drivemount/drive-button.c
@@ -20,14 +20,12 @@
  *   James Henstridge <jamesh canonical com>
  */
 
-#ifdef HAVE_CONFIG_H
-#  include <config.h>
-#endif
+#include "config.h"
+#include "drive-button.h"
 
 #include <gio/gio.h>
 #include <gio/gdesktopappinfo.h>
-#include "drive-button.h"
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
 #include <gdk/gdkkeysyms.h>
 
 #include <string.h>
diff --git a/gnome-applets/drivemount/drive-list.c b/gnome-applets/drivemount/drive-list.c
index 8656aeca4..ac5250554 100644
--- a/gnome-applets/drivemount/drive-list.c
+++ b/gnome-applets/drivemount/drive-list.c
@@ -20,14 +20,12 @@
  *   James Henstridge <jamesh canonical com>
  */
 
-#ifdef HAVE_CONFIG_H
-#  include <config.h>
-#endif
+#include "config.h"
+#include "drive-list.h"
 
 #include <gio/gio.h>
-#include "drive-list.h"
 #include "drive-button.h"
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
 
 G_DEFINE_TYPE (DriveList, drive_list, GTK_TYPE_GRID);
 
diff --git a/gnome-applets/multiload/global.h b/gnome-applets/multiload/global.h
index 2b2111798..c399a1ce6 100644
--- a/gnome-applets/multiload/global.h
+++ b/gnome-applets/multiload/global.h
@@ -4,7 +4,6 @@
 #include "multiload-applet.h"
 
 #include <glib.h>
-#include <glib/gi18n-lib.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
 #include <gtk/gtk.h>
 
diff --git a/gnome-applets/multiload/multiload-applet.c b/gnome-applets/multiload/multiload-applet.c
index bb7329fe4..a36d6cf4b 100644
--- a/gnome-applets/multiload/multiload-applet.c
+++ b/gnome-applets/multiload/multiload-applet.c
@@ -9,7 +9,8 @@
  *
  */
 
-#include <config.h>
+#include "config.h"
+
 #include <stdio.h>
 #include <sys/stat.h>
 #include <unistd.h>
@@ -21,6 +22,7 @@
 #include <glibtop.h>
 #include <gio/gdesktopappinfo.h>
 #include <gdk/gdkkeysyms.h>
+#include <glib/gi18n-lib.h>
 #include <gtk/gtk.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
 
diff --git a/gnome-applets/multiload/netspeed.c b/gnome-applets/multiload/netspeed.c
index 0b8167197..40f7fcbab 100644
--- a/gnome-applets/multiload/netspeed.c
+++ b/gnome-applets/multiload/netspeed.c
@@ -1,9 +1,10 @@
-#include <config.h>
+#include "config.h"
+#include "netspeed.h"
+
 #include <glib.h>
+#include <glib/gi18n-lib.h>
 #include <time.h>
 
-#include "netspeed.h"
-
 enum { N_STATES = 4 };
 
 struct _NetSpeed
diff --git a/gnome-applets/multiload/properties.c b/gnome-applets/multiload/properties.c
index eeabc189a..3a4696c3b 100644
--- a/gnome-applets/multiload/properties.c
+++ b/gnome-applets/multiload/properties.c
@@ -8,6 +8,7 @@
 #include "config.h"
 
 #include <string.h>
+#include <glib/gi18n-lib.h>
 #include <gtk/gtk.h>
 
 #include "global.h"
diff --git a/gnome-applets/netspeed/preferences.c b/gnome-applets/netspeed/preferences.c
index 3681c1feb..a95f55d9a 100644
--- a/gnome-applets/netspeed/preferences.c
+++ b/gnome-applets/netspeed/preferences.c
@@ -19,10 +19,13 @@
  *     Jörgen Scheibengruber <mfcn gmx de>
  */
 
-#include <glib/gi18n.h>
-#include "backend.h"
+#include "config.h"
 #include "preferences.h"
 
+#include <glib/gi18n-lib.h>
+
+#include "backend.h"
+
 struct _NetspeedPreferences
 {
   GtkDialog       parent;
diff --git a/gnome-applets/sticky-notes/sticky-notes-applet-callbacks.c 
b/gnome-applets/sticky-notes/sticky-notes-applet-callbacks.c
index 4c6cef665..91184845b 100644
--- a/gnome-applets/sticky-notes/sticky-notes-applet-callbacks.c
+++ b/gnome-applets/sticky-notes/sticky-notes-applet-callbacks.c
@@ -15,14 +15,17 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <config.h>
-#include <string.h>
+#include "config.h"
 #include "sticky-notes-applet-callbacks.h"
-#include "sticky-notes.h"
-#include "gsettings.h"
+
+#include <string.h>
 #include <gdk/gdkkeysyms.h>
 #include <X11/Xatom.h>
 #include <gdk/gdkx.h>
+#include <glib/gi18n-lib.h>
+
+#include "gsettings.h"
+#include "sticky-notes.h"
 
 #define GRESOURCE "/org/gnome/gnome-applets/sticky-notes/"
 
diff --git a/gnome-applets/sticky-notes/sticky-notes-applet.c 
b/gnome-applets/sticky-notes/sticky-notes-applet.c
index f990be7c0..e44e980c2 100644
--- a/gnome-applets/sticky-notes/sticky-notes-applet.c
+++ b/gnome-applets/sticky-notes/sticky-notes-applet.c
@@ -24,6 +24,7 @@
 #include "sticky-notes.h"
 #include "gsettings.h"
 
+#include <glib/gi18n-lib.h>
 #include <gtk/gtk.h>
 
 G_DEFINE_TYPE (StickyNotesApplet, sticky_notes_applet, GP_TYPE_APPLET)
diff --git a/gnome-applets/sticky-notes/sticky-notes-applet.h 
b/gnome-applets/sticky-notes/sticky-notes-applet.h
index 136dfa3fc..68de8205b 100644
--- a/gnome-applets/sticky-notes/sticky-notes-applet.h
+++ b/gnome-applets/sticky-notes/sticky-notes-applet.h
@@ -18,7 +18,6 @@
 #ifndef __STICKYNOTES_APPLET_H__
 #define __STICKYNOTES_APPLET_H__
 
-#include <glib/gi18n.h>
 #include <gdk/gdk.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
 #include <gtk/gtk.h>
diff --git a/gnome-applets/sticky-notes/sticky-notes-callbacks.c 
b/gnome-applets/sticky-notes/sticky-notes-callbacks.c
index aa696edbc..0c9d3143e 100644
--- a/gnome-applets/sticky-notes/sticky-notes-callbacks.c
+++ b/gnome-applets/sticky-notes/sticky-notes-callbacks.c
@@ -18,6 +18,8 @@
 #include "config.h"
 #include "sticky-notes-callbacks.h"
 
+#include <glib/gi18n-lib.h>
+
 /* Sticky Window Callback : Lock/Unlock the window */
 gboolean
 stickynote_toggle_lock_cb (GtkWidget  *widget,
diff --git a/gnome-applets/sticky-notes/sticky-notes.c b/gnome-applets/sticky-notes/sticky-notes.c
index 975fe1625..08878d32d 100644
--- a/gnome-applets/sticky-notes/sticky-notes.c
+++ b/gnome-applets/sticky-notes/sticky-notes.c
@@ -15,15 +15,17 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <config.h>
+#include "config.h"
+#include "sticky-notes.h"
+
 #include <libxml/parser.h>
 #include <X11/Xatom.h>
 #include <gdk/gdkx.h>
+#include <glib/gi18n-lib.h>
 #define WNCK_I_KNOW_THIS_IS_UNSTABLE 1
 #include <libwnck/libwnck.h>
 #include <string.h>
 
-#include "sticky-notes.h"
 #include "sticky-notes-callbacks.h"
 #include "util.h"
 #include "sticky-notes-applet.h"
diff --git a/gnome-applets/tracker-search-bar/tracker-utils.c 
b/gnome-applets/tracker-search-bar/tracker-utils.c
index f3f8691d3..106f2d989 100644
--- a/gnome-applets/tracker-search-bar/tracker-utils.c
+++ b/gnome-applets/tracker-search-bar/tracker-utils.c
@@ -18,15 +18,14 @@
  */
 
 #include "config.h"
+#include "tracker-utils.h"
 
 #include <string.h>
 #include <time.h>
 #include <sys/types.h>
 #include <regex.h>
 
-#include <glib/gi18n.h>
-
-#include "tracker-utils.h"
+#include <glib/gi18n-lib.h>
 
 /*
  * Regular Expression code to match urls.
diff --git a/gnome-applets/tracker-search-bar/tracker-utils.h 
b/gnome-applets/tracker-search-bar/tracker-utils.h
index f278723ee..bc098a81c 100644
--- a/gnome-applets/tracker-search-bar/tracker-utils.h
+++ b/gnome-applets/tracker-search-bar/tracker-utils.h
@@ -20,6 +20,8 @@
 #ifndef __TRACKER_UTILS_H__
 #define __TRACKER_UTILS_H__
 
+#include <glib.h>
+
 G_BEGIN_DECLS
 
 typedef enum {
diff --git a/gnome-applets/trash/trash-applet.c b/gnome-applets/trash/trash-applet.c
index 9e55a0f14..ae64a8d5d 100644
--- a/gnome-applets/trash/trash-applet.c
+++ b/gnome-applets/trash/trash-applet.c
@@ -23,7 +23,7 @@
 
 #include <string.h>
 
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
 #include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
 #include <gio/gio.h>
diff --git a/gnome-applets/trash/trash-empty.c b/gnome-applets/trash/trash-empty.c
index 1aeb60377..be84a32ef 100644
--- a/gnome-applets/trash/trash-empty.c
+++ b/gnome-applets/trash/trash-empty.c
@@ -17,11 +17,11 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <gio/gio.h>
-#include <glib/gi18n.h>
-
-#include "trash-empty.h"
 #include "config.h"
+#include "trash-empty.h"
+
+#include <gio/gio.h>
+#include <glib/gi18n-lib.h>
 
 /* only one concurrent trash empty operation can occur */
 static GtkDialog          *trash_empty_confirm_dialog;
diff --git a/gnome-applets/window-picker/task-item.c b/gnome-applets/window-picker/task-item.c
index 192f0a712..aeacde419 100644
--- a/gnome-applets/window-picker/task-item.c
+++ b/gnome-applets/window-picker/task-item.c
@@ -18,13 +18,15 @@
  *              Sebastian Geiger <sbastig gmx net>
  */
 
+#include "config.h"
 #include "task-item.h"
-#include "task-list.h"
 
 #include <math.h>
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
 #include <cairo/cairo.h>
 
+#include "task-list.h"
+
 struct _TaskItem {
   GtkEventBox  parent;
   WnckWindow  *window;
diff --git a/gnome-applets/window-picker/wp-about-dialog.c b/gnome-applets/window-picker/wp-about-dialog.c
index 9356df1af..390322088 100644
--- a/gnome-applets/window-picker/wp-about-dialog.c
+++ b/gnome-applets/window-picker/wp-about-dialog.c
@@ -22,11 +22,10 @@
  */
 
 #include "config.h"
-
-#include <glib/gi18n.h>
-
 #include "wp-about-dialog.h"
 
+#include <glib/gi18n-lib.h>
+
 struct _WpAboutDialog
 {
   GtkAboutDialog  parent;
diff --git a/gnome-applets/window-picker/wp-applet.c b/gnome-applets/window-picker/wp-applet.c
index 0fe6c895c..4bfe380f1 100644
--- a/gnome-applets/window-picker/wp-applet.c
+++ b/gnome-applets/window-picker/wp-applet.c
@@ -22,17 +22,17 @@
  */
 
 #include "config.h"
+#include "wp-applet.h"
 
 #include <gdk/gdk.h>
 #include <glib.h>
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
 #include <gtk/gtk.h>
 #include <libwnck/libwnck.h>
 #include <string.h>
 
 #include "task-list.h"
 #include "wp-about-dialog.h"
-#include "wp-applet.h"
 #include "wp-preferences-dialog.h"
 #include "wp-task-title.h"
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]