[Xfce4-commits] [panel-plugins/xfce4-xkb-plugin] 12/17: Reorganize includes
noreply at xfce.org
noreply at xfce.org
Sat Jun 10 14:31:45 CEST 2017
This is an automated email from the git hooks/post-receive script.
n i n e t l s p u s h e d a c o m m i t t o b r a n c h m a s t e r
in repository panel-plugins/xfce4-xkb-plugin.
commit 22a54b07f5ee80940fe419152c1530f8d0cf8dbb
Author: Viktor Odintsev <zakhams at gmail.com>
Date: Fri Mar 31 10:08:43 2017 +0300
Reorganize includes
---
panel-plugin/xkb-cairo.c | 7 ++---
panel-plugin/xkb-cairo.h | 3 --
panel-plugin/xkb-dialog.c | 7 +----
panel-plugin/xkb-dialog.h | 4 +++
panel-plugin/xkb-keyboard.c | 19 +------------
panel-plugin/xkb-keyboard.h | 1 -
panel-plugin/xkb-plugin.c | 66 +++++++++++++++++++++----------------------
panel-plugin/xkb-plugin.h | 9 +-----
panel-plugin/xkb-properties.h | 1 -
panel-plugin/xkb-util.c | 2 --
panel-plugin/xkb-util.h | 3 --
panel-plugin/xkb-xfconf.c | 9 +++---
panel-plugin/xkb-xfconf.h | 7 +++--
13 files changed, 50 insertions(+), 88 deletions(-)
diff --git a/panel-plugin/xkb-cairo.c b/panel-plugin/xkb-cairo.c
index e04f125..dc77c75 100644
--- a/panel-plugin/xkb-cairo.c
+++ b/panel-plugin/xkb-cairo.c
@@ -23,11 +23,11 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#include <libxfce4util/libxfce4util.h>
+#include <librsvg/rsvg.h>
+
#include "xkb-cairo.h"
#include "xkb-util.h"
-#include "xkb-plugin.h"
-
-#include <librsvg/rsvg.h>
#define XKB_PREFERRED_FONT "Courier New, Courier 10 Pitch, Monospace Bold"
@@ -320,4 +320,3 @@ xkb_cairo_draw_label_system (cairo_t *cr,
g_free (normalized_group_name);
g_object_unref (layout);
}
-
diff --git a/panel-plugin/xkb-cairo.h b/panel-plugin/xkb-cairo.h
index b08b1e3..e124760 100644
--- a/panel-plugin/xkb-cairo.h
+++ b/panel-plugin/xkb-cairo.h
@@ -26,8 +26,6 @@
#ifndef _XKB_CAIRO_H_
#define _XKB_CAIRO_H_
-#include <glib.h>
-#include <glib/gprintf.h>
#include <gdk/gdk.h>
#include <cairo/cairo.h>
#include <pango/pangocairo.h>
@@ -58,4 +56,3 @@ void xkb_cairo_draw_label_system (cairo_t *cr,
GdkRGBA rgba);
#endif
-
diff --git a/panel-plugin/xkb-dialog.c b/panel-plugin/xkb-dialog.c
index 5d378ed..aa969fd 100644
--- a/panel-plugin/xkb-dialog.c
+++ b/panel-plugin/xkb-dialog.c
@@ -27,16 +27,11 @@
#include <config.h>
#endif
-#include <string.h>
-#include <glib.h>
-#include <gtk/gtk.h>
-
-#include <libxfce4panel/xfce-panel-plugin.h>
#include <libxfce4ui/libxfce4ui.h>
#include "xkb-plugin.h"
+#include "xkb-properties.h"
#include "xkb-dialog.h"
-#include "xkb-util.h"
typedef struct
{
diff --git a/panel-plugin/xkb-dialog.h b/panel-plugin/xkb-dialog.h
index 1e2e848..7305794 100644
--- a/panel-plugin/xkb-dialog.h
+++ b/panel-plugin/xkb-dialog.h
@@ -26,6 +26,10 @@
#ifndef __XKB_SETTINGS_DIALOG_H__
#define __XKB_SETTINGS_DIALOG_H__
+#include <libxfce4panel/xfce-panel-plugin.h>
+
+#include "xkb-xfconf.h"
+
void xkb_dialog_configure_plugin (XfcePanelPlugin *plugin,
XkbXfconf *config);
void xkb_dialog_about_show (void);
diff --git a/panel-plugin/xkb-keyboard.c b/panel-plugin/xkb-keyboard.c
index 5730a4a..fd1dd8b 100644
--- a/panel-plugin/xkb-keyboard.c
+++ b/panel-plugin/xkb-keyboard.c
@@ -23,30 +23,13 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include "xkb-keyboard.h"
#include "xkb-util.h"
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include <libxklavier/xklavier.h>
-
-#include <glib.h>
-#include <glib/gstdio.h>
-#include <gtk/gtk.h>
#include <gdk/gdkx.h>
+#include <libxklavier/xklavier.h>
#include <librsvg/rsvg.h>
-#ifndef DEBUG
-#undef G_DISABLE_ASSERT
-#define G_DISABLE_ASSERT
-#endif
-
typedef struct
{
gchar *group_name;
diff --git a/panel-plugin/xkb-keyboard.h b/panel-plugin/xkb-keyboard.h
index 213e353..62096e4 100644
--- a/panel-plugin/xkb-keyboard.h
+++ b/panel-plugin/xkb-keyboard.h
@@ -27,7 +27,6 @@
#define _xkb_keyboard_H_
#include <gdk/gdk.h>
-#include <libxklavier/xklavier.h>
#include "xkb-properties.h"
diff --git a/panel-plugin/xkb-plugin.c b/panel-plugin/xkb-plugin.c
index 2b316b0..128322c 100644
--- a/panel-plugin/xkb-plugin.c
+++ b/panel-plugin/xkb-plugin.c
@@ -27,19 +27,16 @@
#include <config.h>
#endif
-#include <stdio.h>
-#include <ctype.h>
-
+#include <libxfce4ui/libxfce4ui.h>
#include <libwnck/libwnck.h>
-
#include <librsvg/rsvg.h>
#include <garcon/garcon.h>
#include "xkb-plugin.h"
+#include "xkb-properties.h"
+#include "xkb-keyboard.h"
#include "xkb-dialog.h"
-#include "xkb-util.h"
#include "xkb-cairo.h"
-#include "xkb-properties.h"
typedef struct
{
@@ -325,7 +322,7 @@ xkb_plugin_calculate_sizes (XkbPlugin *plugin,
guint nrows;
gint hsize, vsize;
gboolean proportional;
- guint display_type;
+ XkbDisplayType display_type;
display_type = xkb_xfconf_get_display_type (plugin->config);
nrows = xfce_panel_plugin_get_nrows (XFCE_PANEL_PLUGIN (plugin));
@@ -591,7 +588,8 @@ xkb_plugin_layout_image_draw (GtkWidget *widget,
PangoFontDescription *desc;
GdkRGBA rgba;
gint actual_hsize, actual_vsize;
- gint display_type, display_scale;
+ XkbDisplayType display_type;
+ gint display_scale;
display_type = xkb_xfconf_get_display_type (plugin->config);
display_scale = xkb_xfconf_get_display_scale (plugin->config);
@@ -608,33 +606,33 @@ xkb_plugin_layout_image_draw (GtkWidget *widget,
DBG ("img_exposed: actual h/v (%d/%d)",
actual_hsize, actual_vsize);
- if (display_type == DISPLAY_TYPE_IMAGE)
- {
- xkb_cairo_draw_flag (cr, group_name,
- actual_hsize, actual_vsize,
- xkb_keyboard_variant_index_for_group (plugin->keyboard, -1),
- xkb_keyboard_get_max_group_count (plugin->keyboard),
- display_scale,
- rgba
- );
- }
- else if (display_type == DISPLAY_TYPE_TEXT)
+ switch (display_type)
{
- xkb_cairo_draw_label (cr, group_name,
- actual_hsize, actual_vsize,
- xkb_keyboard_variant_index_for_group (plugin->keyboard, -1),
- display_scale,
- rgba
- );
- }
- else
- {
- gtk_style_context_get (style_ctx, state, "font", &desc, NULL);
- xkb_cairo_draw_label_system (cr, group_name,
- actual_hsize, actual_vsize,
- xkb_keyboard_variant_index_for_group (plugin->keyboard, -1),
- desc, rgba
- );
+ case DISPLAY_TYPE_IMAGE:
+ xkb_cairo_draw_flag (cr, group_name,
+ actual_hsize, actual_vsize,
+ xkb_keyboard_variant_index_for_group (plugin->keyboard, -1),
+ xkb_keyboard_get_max_group_count (plugin->keyboard),
+ display_scale,
+ rgba
+ );
+ break;
+ case DISPLAY_TYPE_TEXT:
+ xkb_cairo_draw_label (cr, group_name,
+ actual_hsize, actual_vsize,
+ xkb_keyboard_variant_index_for_group (plugin->keyboard, -1),
+ display_scale,
+ rgba
+ );
+ break;
+ case DISPLAY_TYPE_SYSTEM:
+ gtk_style_context_get (style_ctx, state, "font", &desc, NULL);
+ xkb_cairo_draw_label_system (cr, group_name,
+ actual_hsize, actual_vsize,
+ xkb_keyboard_variant_index_for_group (plugin->keyboard, -1),
+ desc, rgba
+ );
+ break;
}
return FALSE;
diff --git a/panel-plugin/xkb-plugin.h b/panel-plugin/xkb-plugin.h
index 6505f8f..3fe3ce5 100644
--- a/panel-plugin/xkb-plugin.h
+++ b/panel-plugin/xkb-plugin.h
@@ -26,16 +26,9 @@
#ifndef _XFCE_XKB_H_
#define _XFCE_XKB_H_
-#include "xkb-keyboard.h"
-#include "xkb-xfconf.h"
-
-#include <libxfce4util/libxfce4util.h>
-#include <libxfce4ui/libxfce4ui.h>
#include <libxfce4panel/xfce-panel-plugin.h>
-#include <X11/Xlib.h>
-#include <gtk/gtk.h>
-#include <glib.h>
+#include "xkb-xfconf.h"
G_BEGIN_DECLS
diff --git a/panel-plugin/xkb-properties.h b/panel-plugin/xkb-properties.h
index 0265ba6..4aae8a6 100644
--- a/panel-plugin/xkb-properties.h
+++ b/panel-plugin/xkb-properties.h
@@ -49,4 +49,3 @@ typedef enum
} XkbGroupPolicy;
#endif
-
diff --git a/panel-plugin/xkb-util.c b/panel-plugin/xkb-util.c
index 4ffd6ab..eb75f6e 100644
--- a/panel-plugin/xkb-util.c
+++ b/panel-plugin/xkb-util.c
@@ -24,7 +24,6 @@
*/
#include <string.h>
-#include <cairo/cairo.h>
#include "xkb-util.h"
@@ -99,4 +98,3 @@ xkb_util_normalize_group_name (const gchar* group_name, const gboolean capitaliz
return result;
}
-
diff --git a/panel-plugin/xkb-util.h b/panel-plugin/xkb-util.h
index 08130aa..4ce4665 100644
--- a/panel-plugin/xkb-util.h
+++ b/panel-plugin/xkb-util.h
@@ -27,8 +27,6 @@
#define __XKB_UTIL_H__
#include <glib.h>
-#include <gdk/gdk.h>
-#include <gtk/gtk.h>
gchar* xkb_util_get_flag_filename (const gchar* group_name);
@@ -38,4 +36,3 @@ gchar* xkb_util_normalize_group_name (const gchar* group_name,
const gboolean capitalize);
#endif
-
diff --git a/panel-plugin/xkb-xfconf.c b/panel-plugin/xkb-xfconf.c
index 7287c90..c73eb97 100644
--- a/panel-plugin/xkb-xfconf.c
+++ b/panel-plugin/xkb-xfconf.c
@@ -27,7 +27,6 @@
#include <config.h>
#endif
-#include "xkb-properties.h"
#include "xkb-xfconf.h"
#include <string.h>
@@ -58,10 +57,10 @@ struct _XkbXfconf
{
GObject __parent__;
- guint display_type;
+ XkbDisplayType display_type;
guint display_scale;
gboolean display_tooltip_icon;
- guint group_policy;
+ XkbGroupPolicy group_policy;
};
enum
@@ -215,7 +214,7 @@ xkb_xfconf_set_property (GObject *object, guint prop_id, const GValue *value, GP
}
}
-guint
+XkbDisplayType
xkb_xfconf_get_display_type (XkbXfconf *config)
{
g_return_val_if_fail (IS_XKB_XFCONF (config), DEFAULT_DISPLAY_TYPE);
@@ -236,7 +235,7 @@ xkb_xfconf_get_display_tooltip_icon (XkbXfconf *config)
return config->display_tooltip_icon;
}
-guint
+XkbGroupPolicy
xkb_xfconf_get_group_policy (XkbXfconf *config)
{
g_return_val_if_fail (IS_XKB_XFCONF (config), DEFAULT_GROUP_POLICY);
diff --git a/panel-plugin/xkb-xfconf.h b/panel-plugin/xkb-xfconf.h
index 95b0f64..c9c0bc7 100644
--- a/panel-plugin/xkb-xfconf.h
+++ b/panel-plugin/xkb-xfconf.h
@@ -26,7 +26,8 @@
#ifndef _XKB_XFCONF_H_
#define _XKB_XFCONF_H_
-#include <gdk/gdk.h>
+#include <glib-object.h>
+#include "xkb-properties.h"
G_BEGIN_DECLS
@@ -44,10 +45,10 @@ GType xkb_xfconf_get_type (void)
XkbXfconf *xkb_xfconf_new (const gchar *property_base);
-guint xkb_xfconf_get_display_type (XkbXfconf *config);
+XkbDisplayType xkb_xfconf_get_display_type (XkbXfconf *config);
guint xkb_xfconf_get_display_scale (XkbXfconf *config);
gboolean xkb_xfconf_get_display_tooltip_icon (XkbXfconf *config);
-guint xkb_xfconf_get_group_policy (XkbXfconf *config);
+XkbGroupPolicy xkb_xfconf_get_group_policy (XkbXfconf *config);
G_END_DECLS
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the Xfce4-commits
mailing list