a couple of bugs nailedbefore.indent

2 files changed, 9 insertions, 4 deletions

diff --git a/libxklavier/xklavier_props.c b/libxklavier/xklavier_props.c
index 28174a8..652542c 100644
--- a/libxklavier/xklavier_props.c
+++ b/libxklavier/xklavier_props.c
@@ -270,7 +270,7 @@ gboolean xkl_get_names_prop( Atom rules_atom,
     /* take variants from layouts like ru(winkeys) */
     layout = data->layouts;
     variant = data->variants;
-    while ( layout != NULL && variant != NULL )
+    while( *layout != NULL && *variant != NULL )
     {
       gchar *varstart = g_strstr_len( *layout, -1, "(" );
       if( varstart != NULL )
diff --git a/libxklavier/xklavier_xmm.c b/libxklavier/xklavier_xmm.c
index 093e3a3..afef5f7 100755
--- a/libxklavier/xklavier_xmm.c
+++ b/libxklavier/xklavier_xmm.c
@@ -82,14 +82,18 @@ XmmSwitchOption *xkl_xmm_shortcut_get_current( void )
 const gchar* xkl_xmm_shortcut_get_current_option_name( void )
 {
   gchar** option = current_xmm_config.options;
-  do
+  if( option == NULL )
+    return NULL;
+
+  while( *option != NULL )
   {
     /* starts with "grp:" */
     if( strstr( *option, SHORTCUT_OPTION_PREFIX ) != NULL )
     {
       return *option + sizeof SHORTCUT_OPTION_PREFIX - 1;
     }
-  } while ( *(++option) != NULL );
+    option++;
+  }
   return NULL;
 }
 
@@ -138,7 +142,8 @@ guint xkl_xmm_groups_get_num( void )
 {
   gint rv = 0;
   gchar ** p = current_xmm_config.layouts;
-  while( *p++ != NULL ) rv++;
+  if( p != NULL )
+    while( *p++ != NULL ) rv++;
   return rv;
 }