[Xfce4-commits] [panel-plugins/xfce4-xkb-plugin] 01/01: Fix memory leak caused by previous commit

[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 3b02d6e3a6a8146ac4e3b1a387bb1b1dd1a55743
Author: Viktor Odintsev <zakhams at gmail.com>
Date:   Sun Jun 11 01:21:17 2017 +0300

    Fix memory leak caused by previous commit
---
 panel-plugin/xkb-keyboard.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/panel-plugin/xkb-keyboard.c b/panel-plugin/xkb-keyboard.c
index 45f1482..f023e68 100644
--- a/panel-plugin/xkb-keyboard.c
+++ b/panel-plugin/xkb-keyboard.c
@@ -302,6 +302,8 @@ xkb_keyboard_initialize_xkb_options (XkbKeyboard *keyboard,
         MODIFY_INDEXES (country_indexes, country_name, country_index);
         MODIFY_INDEXES (language_indexes, language_name, language_index);
 
+        #undef MODIFY_INDEXES
+
         imgfilename = xkb_util_get_flag_filename (group_data->country_name);
         handle = rsvg_handle_new_from_file (imgfilename, NULL);
         if (handle)
@@ -433,7 +435,7 @@ xkb_keyboard_set_group_policy (XkbKeyboard *keyboard,
 
 static gboolean
 xkb_keyboard_xkl_config_rec_equals (const XklConfigRec * rec1,
-                                   const XklConfigRec * rec2)
+                                    const XklConfigRec * rec2)
 {
     gint i = 0;
 
@@ -464,7 +466,6 @@ xkb_keyboard_update_from_xkl (XkbKeyboard *keyboard)
     XklConfigRec *config_rec;
 
     config_rec = xkl_config_rec_new ();
-    g_object_ref (config_rec);
     xkl_config_rec_get_from_server (config_rec, keyboard->engine);
 
     if (keyboard->last_config_rec == NULL ||
@@ -481,6 +482,8 @@ xkb_keyboard_update_from_xkl (XkbKeyboard *keyboard)
     }
     else
     {
+        g_object_unref (config_rec);
+
         return FALSE;
     }
 }

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