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

Merge from stable branch

Browse source
This commit is contained in:
Kjartan Maraas 2003-04-29 17:52:40 +00:00
parent e3e9279f0c
commit 60980d0fe5
9 changed files with 35 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
capplets/common/ChangeLog
View file

@ -1,3 +1,10 @@
2003-04-29 Kjartan Maraas <kmaraas@gnome.org>
* gconf-property-editor.c: (gconf_peditor_new): Plug a leak
* gnome-theme-info.c: (top_theme_dir_changed),
(top_icon_theme_dir_changed), (real_add_top_theme_dir_monitor):
Plug leaks and fix invalid reads reported by valgrind.
2003-03-27 Andrew Sobala <aes@gnome.org>
* gnome-theme-info.c: (gnome_theme_read_meta_theme),

3
capplets/common/gconf-property-editor.c
View file

@ -374,7 +374,8 @@ gconf_peditor_new (gchar *key,
GCONF_PROPERTY_EDITOR (obj)->p->callback (client, 0, gconf_entry, obj);
GCONF_PROPERTY_EDITOR (obj)->p->inited = TRUE;
gconf_entry_free (gconf_entry);
g_object_unref (G_OBJECT (client));
return obj;
}

8
capplets/common/gnome-theme-info.c
View file

@ -936,7 +936,7 @@ top_theme_dir_changed (GnomeVFSMonitorHandle *handle,
if (result == GNOME_VFS_OK && file_info->type == GNOME_VFS_FILE_TYPE_DIRECTORY)
{
add_common_theme_dir_monitor (common_theme_dir_uri, NULL, monitor_data, NULL);
g_hash_table_insert (handle_hash, file_info->name, monitor_data);
g_hash_table_insert (handle_hash, g_strdup(file_info->name), monitor_data);
}
gnome_vfs_file_info_unref (file_info);
}
@ -988,7 +988,7 @@ top_icon_theme_dir_changed (GnomeVFSMonitorHandle *handle,
if (result == GNOME_VFS_OK && file_info->type == GNOME_VFS_FILE_TYPE_DIRECTORY)
{
add_common_icon_theme_dir_monitor (common_icon_theme_dir_uri, NULL, monitor_data, NULL);
g_hash_table_insert (handle_hash, file_info->name, monitor_data);
g_hash_table_insert (handle_hash, g_strdup(file_info->name), monitor_data);
}
gnome_vfs_file_info_unref (file_info);
}
@ -1187,7 +1187,7 @@ real_add_top_theme_dir_monitor (GnomeVFSURI *uri,
* use it to remove the monitor handles when a dir is removed.
*/
tuple = g_new0 (CallbackTuple, 1);
tuple->handle_hash = g_hash_table_new (g_str_hash, g_str_equal);
tuple->handle_hash = g_hash_table_new_full (g_str_hash, g_str_equal, (GDestroyNotify)g_free, NULL);
tuple->priority = priority;
/* Check the URI */
@ -1251,7 +1251,7 @@ real_add_top_theme_dir_monitor (GnomeVFSURI *uri,
}
g_hash_table_insert (tuple->handle_hash, file_info->name, monitor_data);
g_hash_table_insert (tuple->handle_hash, g_strdup(file_info->name), monitor_data);
gnome_vfs_file_info_clear (file_info);
gnome_vfs_uri_unref (theme_dir_uri);
}

6
capplets/file-types/ChangeLog
View file

@ -1,3 +1,9 @@
2003-04-29 Kjartan Maraas <set EMAIL_ADDRESS environment variable>
* mime-type-info.c: (mime_category_info_get_full_name),
(mime_category_info_get_full_description): Use g_string_new (NULL)
instead of g_string_new (""). Reported to be more efficient.
Tue Feb 4 17:09:18 2003 Jonathan Blandford <jrb@redhat.com>
* Release 2.2.0.1

4
capplets/file-types/mime-type-info.c
View file

@ -528,7 +528,7 @@ mime_category_info_get_full_name (MimeCategoryInfo *info)
ModelEntry *tmp;
gchar *ret, *s;
string = g_string_new ("");
string = g_string_new (NULL);
for (tmp = MODEL_ENTRY (info); tmp != NULL && tmp->type != MODEL_ENTRY_NONE; tmp = tmp->parent) {
g_string_prepend (string, MIME_CATEGORY_INFO (tmp)->name);
@ -550,7 +550,7 @@ mime_category_info_get_full_description (MimeCategoryInfo *info)
ModelEntry *tmp;
gchar *ret, *s;
string = g_string_new ("");
string = g_string_new (NULL);
for (tmp = MODEL_ENTRY (info); tmp != NULL && tmp->type != MODEL_ENTRY_NONE; tmp = tmp->parent) {
g_string_prepend (string, MIME_CATEGORY_INFO (tmp)->description);

5
capplets/mouse/ChangeLog
View file

@ -1,3 +1,8 @@
2003-04-29 Kjartan Maraas <kmaraas@gnome.org>
* gnome-mouse-properties.c: (read_cursor_font), (setup_dialog):
Plug a couple of leaks.
Tue Feb 4 17:09:18 2003 Jonathan Blandford <jrb@redhat.com>
* Release 2.2.0.1

4
capplets/mouse/gnome-mouse-properties.c
View file

@ -385,6 +385,7 @@ read_cursor_font (void)
target[length] = '\0';
retval = g_strdup (target);
g_free (link_name);
closedir (dir);
return retval;
}
@ -612,7 +613,8 @@ setup_dialog (GladeXML *dialog, GConfChangeSet *changeset)
COLUMN_FONT_PATH, font_path,
-1);
g_free (font_path);
g_free (cursor_font);
gtk_tree_view_append_column (GTK_TREE_VIEW (tree_view), column);
gconf_peditor_new_boolean

4
capplets/sound/ChangeLog
View file

@ -1,3 +1,7 @@
2003-04-29 Kjartan Maraas <kmaraas@gnome.org>
* sound-properties-capplet.c: (main): Plug a leak.
Tue Feb 4 17:09:18 2003 Jonathan Blandford <jrb@redhat.com>
* Release 2.2.0.1

3
capplets/sound/sound-properties-capplet.c
View file

@ -189,6 +189,7 @@ main (int argc, char **argv)
gtk_main ();
gconf_change_set_unref (changeset);
}
g_object_unref (dialog);
return 0;
}