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

use g_mkdir_with_parents instead of creating the whole hierarchy by hand.

Browse source 
2006-01-17  Rodrigo Moya <rodrigo@novell.com>

	* gnome-settings-font.c (load_cursor): use g_mkdir_with_parents instead
	of creating the whole hierarchy by hand.
This commit is contained in:
Rodrigo Moya 2006-01-17 15:43:50 +00:00 • committed by Rodrigo Moya
parent 06f093b466
commit b17e24b25c
2 changed files with 35 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

5
gnome-settings-daemon/ChangeLog
View file

@ -1,3 +1,8 @@
2006-01-17 Rodrigo Moya <rodrigo@novell.com>
* gnome-settings-font.c (load_cursor): use g_mkdir_with_parents instead
of creating the whole hierarchy by hand.
2006-01-15 Sebastien Bacher <seb128@debian.org> 2006-01-15 Sebastien Bacher <seb128@debian.org>
* actions/Makefile.am: * actions/Makefile.am:

70
gnome-settings-daemon/gnome-settings-font.c
View file

@ -60,58 +60,48 @@ load_cursor (GConfClient *client)
gchar *mkfontdir_cmd; gchar *mkfontdir_cmd;
/* setting up the dir */ /* setting up the dir */
font_dir_name = g_build_path (G_DIR_SEPARATOR_S, g_get_home_dir (), ".gnome2", NULL);
if (! g_file_test (font_dir_name, G_FILE_TEST_EXISTS))
mkdir (font_dir_name, 0755);
g_free (font_dir_name);
font_dir_name = g_build_path (G_DIR_SEPARATOR_S, g_get_home_dir (), ".gnome2/share", NULL);
if (! g_file_test (font_dir_name, G_FILE_TEST_EXISTS))
mkdir (font_dir_name, 0755);
g_free (font_dir_name);
font_dir_name = g_build_path (G_DIR_SEPARATOR_S, g_get_home_dir (), ".gnome2/share/fonts", NULL); font_dir_name = g_build_path (G_DIR_SEPARATOR_S, g_get_home_dir (), ".gnome2/share/fonts", NULL);
if (! g_file_test (font_dir_name, G_FILE_TEST_EXISTS)) if (! g_file_test (font_dir_name, G_FILE_TEST_EXISTS))
mkdir (font_dir_name, 0755);
if (! g_file_test (font_dir_name, G_FILE_TEST_IS_DIR))
{ {
GtkWidget *dialog; if (g_mkdir_with_parents (font_dir_name, 0755) != 0)
{
GtkWidget *dialog;
dialog = gtk_message_dialog_new (NULL, dialog = gtk_message_dialog_new (NULL,
0, 0,
GTK_MESSAGE_ERROR, GTK_MESSAGE_ERROR,
GTK_BUTTONS_CLOSE, GTK_BUTTONS_CLOSE,
"Cannot create the directory \"%s\".\n"\ _("Cannot create the directory \"%s\".\n"\
"This is needed to allow changing cursors.", "This is needed to allow changing cursors."),
font_dir_name); font_dir_name);
gtk_dialog_run (GTK_DIALOG (dialog)); gtk_dialog_run (GTK_DIALOG (dialog));
gtk_widget_destroy (dialog); gtk_widget_destroy (dialog);
g_free (font_dir_name); g_free (font_dir_name);
return; return;
}
} }
dir_name = g_build_path (G_DIR_SEPARATOR_S, g_get_home_dir (), ".gnome2/share/cursor-fonts", NULL); dir_name = g_build_path (G_DIR_SEPARATOR_S, g_get_home_dir (), ".gnome2/share/cursor-fonts", NULL);
if (! g_file_test (dir_name, G_FILE_TEST_EXISTS)) if (! g_file_test (dir_name, G_FILE_TEST_EXISTS))
mkdir (dir_name, 0755);
if (! g_file_test (dir_name, G_FILE_TEST_IS_DIR))
{ {
GtkWidget *dialog; if (g_mkdir_with_parents (dir_name, 0755) != 0)
{
GtkWidget *dialog;
dialog = gtk_message_dialog_new (NULL, dialog = gtk_message_dialog_new (NULL,
0, 0,
GTK_MESSAGE_ERROR, GTK_MESSAGE_ERROR,
GTK_BUTTONS_CLOSE, GTK_BUTTONS_CLOSE,
(_("Cannot create the directory \"%s\".\n"\ (_("Cannot create the directory \"%s\".\n"\
"This is needed to allow changing cursors.")), "This is needed to allow changing cursors.")),
dir_name); dir_name);
gtk_dialog_run (GTK_DIALOG (dialog)); gtk_dialog_run (GTK_DIALOG (dialog));
gtk_widget_destroy (dialog); gtk_widget_destroy (dialog);
g_free (dir_name); g_free (dir_name);
return; return;
}
} }
dir = opendir (dir_name); dir = opendir (dir_name);