applications/gnome-control-center
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fixing one leak, pointed by kmaraas

Browse source
This commit is contained in:
Sergey V. Udaltsov 2004-09-27 22:33:49 +00:00
parent bf88391b66
commit b98fd2ff69
2 changed files with 11 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
gnome-settings-daemon/ChangeLog
View file

@ -1,3 +1,8 @@
2004-09-27 Sergey V. Udaltsov <svu@gnome.org>
* gnome-settings-keyboard-xkb.c: fix one GSwitchItXkbConfig memory
leak, spotted by kmaraas.
2004-08-30 Carlos Garnacho Parro <carlosg@gnome.org> 2004-08-30 Carlos Garnacho Parro <carlosg@gnome.org>
* gnome-settings-multimedia-keys.c: applied patch from Pierre Ossman * gnome-settings-multimedia-keys.c: applied patch from Pierre Ossman

8
gnome-settings-daemon/gnome-settings-keyboard-xkb.c
View file

@ -147,6 +147,7 @@ gnome_settings_keyboard_xkb_analyze_sysconfig (void)
{ {
GConfClient *confClient; GConfClient *confClient;
GSwitchItXkbConfig gswicWas, *pgswicNow; GSwitchItXkbConfig gswicWas, *pgswicNow;
gboolean isConfigChanged;
if (!initedOk) if (!initedOk)
return; return;
@ -158,9 +159,10 @@ gnome_settings_keyboard_xkb_analyze_sysconfig (void)
GSwitchItXkbConfigLoadSysBackup (&gswicWas); GSwitchItXkbConfigLoadSysBackup (&gswicWas);
GSwitchItXkbConfigLoadInitial (pgswicNow); GSwitchItXkbConfigLoadInitial (pgswicNow);
isConfigChanged = g_slist_length (gswicWas.layouts) &&
!GSwitchItXkbConfigEquals (pgswicNow, &gswicWas);
/* config was changed!!! */ /* config was changed!!! */
if (g_slist_length (gswicWas.layouts) && if (isConfigChanged) {
!GSwitchItXkbConfigEquals (pgswicNow, &gswicWas)) {
GtkWidget *msg = gtk_message_dialog_new_with_markup (NULL, GtkWidget *msg = gtk_message_dialog_new_with_markup (NULL,
0, 0,
GTK_MESSAGE_INFO, GTK_MESSAGE_INFO,
@ -183,6 +185,8 @@ gnome_settings_keyboard_xkb_analyze_sysconfig (void)
gtk_widget_show (msg); gtk_widget_show (msg);
} }
GSwitchItXkbConfigSaveSysBackup (pgswicNow); GSwitchItXkbConfigSaveSysBackup (pgswicNow);
if (!isConfigChanged)
g_free (pgswicNow);
GSwitchItXkbConfigTerm (&gswicWas); GSwitchItXkbConfigTerm (&gswicWas);
} }