[Xfce4-commits] [panel-plugins/xfce4-xkb-plugin] 01/01: Fix compilation warnings

[noreply at xfce.org]

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 23b5ac979e1ceb4052e2525bdd27ca313d1f81c6
Author: Viktor Odintsev <ninetls at xfce.org>
Date:   Mon Oct 30 00:55:49 2017 +0300

    Fix compilation warnings
---
 panel-plugin/xkb-modifier.c |  7 ++++---
 panel-plugin/xkb-plugin.c   | 12 +++++++-----
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/panel-plugin/xkb-modifier.c b/panel-plugin/xkb-modifier.c
index c43395b..57d095f 100644
--- a/panel-plugin/xkb-modifier.c
+++ b/panel-plugin/xkb-modifier.c
@@ -91,7 +91,8 @@ xkb_modifier_new (void)
   XkbModifier *modifier;
   Display     *display;
   XkbDescRec  *xkb_desc;
-  gint         i, states, caps_lock_mask;
+  gint         i;
+  guint        states, caps_lock_mask;
   gchar       *atom_name;
 
   modifier = g_object_new (TYPE_XKB_MODIFIER, NULL);
@@ -100,7 +101,7 @@ xkb_modifier_new (void)
   display = XOpenDisplay (NULL);
   if (display != NULL)
     {
-      XkbDescRec *xkb_desc = XkbGetKeyboard (display, XkbAllComponentsMask, XkbUseCoreKbd);
+      xkb_desc = XkbGetKeyboard (display, XkbAllComponentsMask, XkbUseCoreKbd);
       if (xkb_desc != NULL)
         {
           for (i = 0; i < XkbNumIndicators; i++)
@@ -155,7 +156,7 @@ xkb_modifier_handle_xevent (GdkXEvent *xev,
   XkbModifier         *modifier = user_data;
   Display             *display;
   XkbStateNotifyEvent *state_event = xev;
-  gint                 modifier_flags;
+  guint                modifier_flags;
 
   if (modifier->xkb_event_type != 0 &&
       state_event->type == modifier->xkb_event_type &&
diff --git a/panel-plugin/xkb-plugin.c b/panel-plugin/xkb-plugin.c
index c8e4339..4d137d4 100644
--- a/panel-plugin/xkb-plugin.c
+++ b/panel-plugin/xkb-plugin.c
@@ -376,6 +376,7 @@ xkb_plugin_calculate_sizes (XkbPlugin      *plugin,
       break;
 
     default:
+      hsize = vsize = panel_size;
       break;
     }
 
@@ -493,15 +494,16 @@ xkb_plugin_refresh_gui (XkbPlugin *plugin)
 static void
 xkb_plugin_configure_layout (GtkWidget *widget)
 {
-  gchar     *desktop_file;
-  GError    *error = NULL;
-  gchar    **argv;
-  gboolean   succeed;
+  gchar           *desktop_file;
+  GError          *error = NULL;
+  gchar          **argv;
+  gboolean         succeed;
+  GarconMenuItem  *item;
 
   desktop_file = xfce_resource_lookup (XFCE_RESOURCE_DATA,
                                        "applications/xfce-keyboard-settings.desktop");
 
-  GarconMenuItem *item = garcon_menu_item_new_for_path (desktop_file);
+  item = garcon_menu_item_new_for_path (desktop_file);
 
   if (item)
     {

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.