[snappy] ui: use g_build_filename () for file paths
- From: Luis de Bethencourt <luisbg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [snappy] ui: use g_build_filename () for file paths
- Date: Thu, 17 May 2012 15:40:36 +0000 (UTC)
commit e847c955e00284aa94021e381b0a0329f18b1b8d
Author: Luis de Bethencourt <luis debethencourt com>
Date: Thu May 17 16:40:37 2012 +0100
ui: use g_build_filename () for file paths
Use g_build_filename () for file paths instead of g_strdup_printf () so the
paths also work in Win32. Instead of hardcoding the "/", g_build_filename
uses "/" or "\" as it fits.
src/user_interface.c | 30 +++++++++++++++---------------
1 files changed, 15 insertions(+), 15 deletions(-)
---
diff --git a/src/user_interface.c b/src/user_interface.c
index 87a6619..c708e44 100644
--- a/src/user_interface.c
+++ b/src/user_interface.c
@@ -402,21 +402,21 @@ load_controls (UserInterface * ui)
ClutterActor *vol_int_box = NULL;
GError *error = NULL;
- vid_panel_png = g_strdup_printf ("%s%s", SNAPPY_DATA_DIR, "/vid-panel.png");
- ui->play_png = g_strdup_printf ("%s%s", SNAPPY_DATA_DIR,
- "/media-actions-start.png");
- ui->pause_png = g_strdup_printf ("%s%s", SNAPPY_DATA_DIR,
- "/media-actions-pause.png");
- ui->volume_low_png = g_strdup_printf ("%s%s", SNAPPY_DATA_DIR,
- "/audio-volume-low.png");
- ui->volume_high_png = g_strdup_printf ("%s%s", SNAPPY_DATA_DIR,
- "/audio-volume-high.png");
- ui->subtitle_toggle_png = g_strdup_printf ("%s%s", SNAPPY_DATA_DIR,
- "/subtitle-toggle.png");
- ui->video_stream_toggle_png = g_strdup_printf ("%s%s", SNAPPY_DATA_DIR,
- "/video-stream-toggle.png");
- ui->audio_stream_toggle_png = g_strdup_printf ("%s%s", SNAPPY_DATA_DIR,
- "/audio-stream-toggle.png");
+ vid_panel_png = g_build_filename (SNAPPY_DATA_DIR, "vid-panel.png", NULL);
+ ui->play_png = g_build_filename (SNAPPY_DATA_DIR, "media-actions-start.png",
+ NULL);
+ ui->pause_png = g_build_filename (SNAPPY_DATA_DIR, "media-actions-pause.png",
+ NULL);
+ ui->volume_low_png = g_build_filename (SNAPPY_DATA_DIR,
+ "audio-volume-low.png", NULL);
+ ui->volume_high_png = g_build_filename (SNAPPY_DATA_DIR,
+ "audio-volume-high.png", NULL);
+ ui->subtitle_toggle_png = g_build_filename (SNAPPY_DATA_DIR,
+ "subtitle-toggle.png", NULL);
+ ui->video_stream_toggle_png = g_build_filename (SNAPPY_DATA_DIR,
+ "video-stream-toggle.png", NULL);
+ ui->audio_stream_toggle_png = g_build_filename (SNAPPY_DATA_DIR,
+ "audio-stream-toggle.png", NULL);
icon_files[0] = vid_panel_png;
icon_files[1] = ui->play_png;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]