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

background: Guard against XDG_PICTURES_DIR not being defined

Browse source 
https://bugzilla.gnome.org/show_bug.cgi?id=709771
This commit is contained in:
Debarshi Ray 2014-02-11 16:38:37 +01:00
parent f67cb0553d
commit 8ef67d6be0
2 changed files with 19 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
panels/background/bg-pictures-source.c
View file

@ -718,6 +718,9 @@ bg_pictures_source_init (BgPicturesSource *self)
NULL); NULL);
pictures_path = g_get_user_special_dir (G_USER_DIRECTORY_PICTURES); pictures_path = g_get_user_special_dir (G_USER_DIRECTORY_PICTURES);
if (pictures_path == NULL)
pictures_path = g_get_home_dir ();
g_mkdir_with_parents (pictures_path, USER_DIR_MODE); g_mkdir_with_parents (pictures_path, USER_DIR_MODE);
dir = g_file_new_for_path (pictures_path); dir = g_file_new_for_path (pictures_path);

18
panels/background/cc-background-chooser-dialog.c
View file

@ -269,6 +269,7 @@ cc_background_chooser_dialog_init (CcBackgroundChooserDialog *chooser)
GtkStyleContext *context; GtkStyleContext *context;
gchar *markup, *href; gchar *markup, *href;
const gchar *pictures_dir; const gchar *pictures_dir;
gchar *pictures_dir_basename;
chooser->priv = CC_CHOOSER_DIALOG_GET_PRIVATE (chooser); chooser->priv = CC_CHOOSER_DIALOG_GET_PRIVATE (chooser);
priv = chooser->priv; priv = chooser->priv;
@ -390,9 +391,22 @@ cc_background_chooser_dialog_init (CcBackgroundChooserDialog *chooser)
gtk_label_set_line_wrap (GTK_LABEL (label), TRUE); gtk_label_set_line_wrap (GTK_LABEL (label), TRUE);
gtk_label_set_use_markup (GTK_LABEL (label), TRUE); gtk_label_set_use_markup (GTK_LABEL (label), TRUE);
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
pictures_dir = g_get_user_special_dir (G_USER_DIRECTORY_PICTURES); pictures_dir = g_get_user_special_dir (G_USER_DIRECTORY_PICTURES);
href = g_markup_printf_escaped ("<a href=\"file://%s\">%s</a>", pictures_dir, if (pictures_dir == NULL)
g_path_get_basename (pictures_dir)); {
pictures_dir = g_get_home_dir ();
/* translators: "Home" is used in place of the Pictures
* directory in the string below when XDG_PICTURES_DIR is
* undefined */
pictures_dir_basename = g_strdup (_("Home"));
}
else
pictures_dir_basename = g_path_get_basename (pictures_dir);
href = g_markup_printf_escaped ("<a href=\"file://%s\">%s</a>", pictures_dir, pictures_dir_basename);
g_free (pictures_dir_basename);
/* translators: %s here is the name of the Pictures directory, the string should be translated in /* translators: %s here is the name of the Pictures directory, the string should be translated in
* the context "You can add images to your Pictures folder and they will show up here" */ * the context "You can add images to your Pictures folder and they will show up here" */
markup = g_strdup_printf (_("You can add images to your %s folder and they will show up here"), href); markup = g_strdup_printf (_("You can add images to your %s folder and they will show up here"), href);