annotate src/audacious/util.c @ 2989:15f6c9949cde trunk

Add and use find_path_recursively() which search the FS without using VFS (for GTK).
author William Pitcock <nenolod@atheme-project.org>
date Thu, 05 Jul 2007 01:40:11 -0500
parents 43a075cb5c81
children 3a907327e228
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
2313
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
1 /* Audacious - Cross-platform multimedia player
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
2 * Copyright (C) 2005-2007 Audacious development team
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
3 *
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
4 * Based on BMP:
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
5 * Copyright (C) 2003-2004 BMP development team.
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
6 *
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
7 * Based on XMMS:
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
8 * Copyright (C) 1998-2003 XMMS development team.
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
9 *
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
10 * This program is free software; you can redistribute it and/or modify
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
11 * it under the terms of the GNU General Public License as published by
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
12 * the Free Software Foundation; under version 2 of the License.
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
13 *
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
14 * This program is distributed in the hope that it will be useful,
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
15 * but WITHOUT ANY WARRANTY; without even the implied warranty of
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
16 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
17 * GNU General Public License for more details.
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
18 *
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
19 * You should have received a copy of the GNU General Public License
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
20 * along with this program; if not, write to the Free Software
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
21 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
22 */
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
23
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
24 #ifdef HAVE_CONFIG_H
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
25 # include "config.h"
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
26 #endif
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
27
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
28 #define NEED_GLADE
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
29 #include "util.h"
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
30
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
31 #include <glib.h>
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
32 #include <glib/gi18n.h>
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
33 #include <glade/glade.h>
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
34 #include <gtk/gtk.h>
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
35 #include <stdlib.h>
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
36 #include <string.h>
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
37 #include <ctype.h>
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
38
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
39 #include "platform/smartinclude.h"
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
40 #include <errno.h>
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
41
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
42 #ifdef HAVE_FTS_H
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
43 # include <fts.h>
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
44 #endif
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
45
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
46 #include "glade.h"
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
47 #include "input.h"
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
48 #include "main.h"
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
49 #include "playback.h"
2373
ad1d7687814c [svn] made strings.h for existing strings.c, cleanups
mf0102
parents: 2365
diff changeset
50 #include "strings.h"
2313
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
51 #include "ui_playlist.h"
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
52
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
53 #ifdef USE_CHARDET
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
54 #include "../librcd/librcd.h"
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
55 #ifdef HAVE_UDET
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
56 #include <libudet_c.h>
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
57 #endif
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
58 #endif
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
59
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
60 /*
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
61 * find <file> in directory <dirname> or subdirectories. return
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
62 * pointer to complete filename which has to be freed by calling
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
63 * "g_free()" after use. Returns NULL if file could not be found.
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
64 */
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
65
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
66 typedef struct {
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
67 const gchar *to_match;
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
68 gchar *match;
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
69 gboolean found;
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
70 } FindFileContext;
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
71
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
72 static gboolean
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
73 find_file_func(const gchar * path, const gchar * basename, gpointer data)
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
74 {
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
75 FindFileContext *context = data;
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
76
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
77 if (strlen(path) > FILENAME_MAX) {
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
78 g_warning("Ignoring path: name too long (%s)", path);
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
79 return TRUE;
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
80 }
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
81
2989
15f6c9949cde Add and use find_path_recursively() which search the FS without using VFS (for GTK).
William Pitcock <nenolod@atheme-project.org>
parents: 2988
diff changeset
82 if (vfs_file_test(path, G_FILE_TEST_IS_REGULAR)) {
2313
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
83 if (!strcasecmp(basename, context->to_match)) {
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
84 context->match = g_strdup(path);
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
85 context->found = TRUE;
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
86 return TRUE;
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
87 }
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
88 }
2989
15f6c9949cde Add and use find_path_recursively() which search the FS without using VFS (for GTK).
William Pitcock <nenolod@atheme-project.org>
parents: 2988
diff changeset
89 else if (vfs_file_test(path, G_FILE_TEST_IS_DIR)) {
2313
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
90 dir_foreach(path, find_file_func, context, NULL);
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
91 if (context->found)
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
92 return TRUE;
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
93 }
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
94
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
95 return FALSE;
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
96 }
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
97
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
98 gchar *
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
99 find_file_recursively(const gchar * path, const gchar * filename)
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
100 {
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
101 FindFileContext context;
2989
15f6c9949cde Add and use find_path_recursively() which search the FS without using VFS (for GTK).
William Pitcock <nenolod@atheme-project.org>
parents: 2988
diff changeset
102 gchar *out = NULL;
2313
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
103
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
104 context.to_match = filename;
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
105 context.match = NULL;
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
106 context.found = FALSE;
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
107
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
108 dir_foreach(path, find_file_func, &context, NULL);
2989
15f6c9949cde Add and use find_path_recursively() which search the FS without using VFS (for GTK).
William Pitcock <nenolod@atheme-project.org>
parents: 2988
diff changeset
109
15f6c9949cde Add and use find_path_recursively() which search the FS without using VFS (for GTK).
William Pitcock <nenolod@atheme-project.org>
parents: 2988
diff changeset
110 if (context.match)
15f6c9949cde Add and use find_path_recursively() which search the FS without using VFS (for GTK).
William Pitcock <nenolod@atheme-project.org>
parents: 2988
diff changeset
111 {
15f6c9949cde Add and use find_path_recursively() which search the FS without using VFS (for GTK).
William Pitcock <nenolod@atheme-project.org>
parents: 2988
diff changeset
112 out = g_filename_to_uri(context.match, NULL, NULL);
15f6c9949cde Add and use find_path_recursively() which search the FS without using VFS (for GTK).
William Pitcock <nenolod@atheme-project.org>
parents: 2988
diff changeset
113 g_free(context.match);
15f6c9949cde Add and use find_path_recursively() which search the FS without using VFS (for GTK).
William Pitcock <nenolod@atheme-project.org>
parents: 2988
diff changeset
114 }
2988
43a075cb5c81 find_file_recursively(): Return a valid URI instead of a literal path.
William Pitcock <nenolod@atheme-project.org>
parents: 2977
diff changeset
115
43a075cb5c81 find_file_recursively(): Return a valid URI instead of a literal path.
William Pitcock <nenolod@atheme-project.org>
parents: 2977
diff changeset
116 return out;
2313
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
117 }
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
118
2989
15f6c9949cde Add and use find_path_recursively() which search the FS without using VFS (for GTK).
William Pitcock <nenolod@atheme-project.org>
parents: 2988
diff changeset
119 gchar *
15f6c9949cde Add and use find_path_recursively() which search the FS without using VFS (for GTK).
William Pitcock <nenolod@atheme-project.org>
parents: 2988
diff changeset
120 find_path_recursively(const gchar * path, const gchar * filename)
15f6c9949cde Add and use find_path_recursively() which search the FS without using VFS (for GTK).
William Pitcock <nenolod@atheme-project.org>
parents: 2988
diff changeset
121 {
15f6c9949cde Add and use find_path_recursively() which search the FS without using VFS (for GTK).
William Pitcock <nenolod@atheme-project.org>
parents: 2988
diff changeset
122 FindFileContext context;
15f6c9949cde Add and use find_path_recursively() which search the FS without using VFS (for GTK).
William Pitcock <nenolod@atheme-project.org>
parents: 2988
diff changeset
123 gchar *out = NULL;
15f6c9949cde Add and use find_path_recursively() which search the FS without using VFS (for GTK).
William Pitcock <nenolod@atheme-project.org>
parents: 2988
diff changeset
124
15f6c9949cde Add and use find_path_recursively() which search the FS without using VFS (for GTK).
William Pitcock <nenolod@atheme-project.org>
parents: 2988
diff changeset
125 context.to_match = filename;
15f6c9949cde Add and use find_path_recursively() which search the FS without using VFS (for GTK).
William Pitcock <nenolod@atheme-project.org>
parents: 2988
diff changeset
126 context.match = NULL;
15f6c9949cde Add and use find_path_recursively() which search the FS without using VFS (for GTK).
William Pitcock <nenolod@atheme-project.org>
parents: 2988
diff changeset
127 context.found = FALSE;
15f6c9949cde Add and use find_path_recursively() which search the FS without using VFS (for GTK).
William Pitcock <nenolod@atheme-project.org>
parents: 2988
diff changeset
128
15f6c9949cde Add and use find_path_recursively() which search the FS without using VFS (for GTK).
William Pitcock <nenolod@atheme-project.org>
parents: 2988
diff changeset
129 dir_foreach(path, find_file_func, &context, NULL);
15f6c9949cde Add and use find_path_recursively() which search the FS without using VFS (for GTK).
William Pitcock <nenolod@atheme-project.org>
parents: 2988
diff changeset
130
15f6c9949cde Add and use find_path_recursively() which search the FS without using VFS (for GTK).
William Pitcock <nenolod@atheme-project.org>
parents: 2988
diff changeset
131 return context.match;
15f6c9949cde Add and use find_path_recursively() which search the FS without using VFS (for GTK).
William Pitcock <nenolod@atheme-project.org>
parents: 2988
diff changeset
132 }
15f6c9949cde Add and use find_path_recursively() which search the FS without using VFS (for GTK).
William Pitcock <nenolod@atheme-project.org>
parents: 2988
diff changeset
133
2313
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
134
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
135 typedef enum {
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
136 ARCHIVE_UNKNOWN = 0,
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
137 ARCHIVE_DIR,
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
138 ARCHIVE_TAR,
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
139 ARCHIVE_TGZ,
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
140 ARCHIVE_ZIP,
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
141 ARCHIVE_TBZ2
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
142 } ArchiveType;
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
143
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
144 typedef gchar *(*ArchiveExtractFunc) (const gchar *, const gchar *);
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
145
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
146 typedef struct {
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
147 ArchiveType type;
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
148 const gchar *ext;
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
149 } ArchiveExtensionType;
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
150
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
151 static ArchiveExtensionType archive_extensions[] = {
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
152 {ARCHIVE_TAR, ".tar"},
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
153 {ARCHIVE_ZIP, ".wsz"},
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
154 {ARCHIVE_ZIP, ".zip"},
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
155 {ARCHIVE_TGZ, ".tar.gz"},
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
156 {ARCHIVE_TGZ, ".tgz"},
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
157 {ARCHIVE_TBZ2, ".tar.bz2"},
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
158 {ARCHIVE_TBZ2, ".bz2"},
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
159 {ARCHIVE_UNKNOWN, NULL}
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
160 };
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
161
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
162 static gchar *archive_extract_tar(const gchar * archive, const gchar * dest);
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
163 static gchar *archive_extract_zip(const gchar * archive, const gchar * dest);
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
164 static gchar *archive_extract_tgz(const gchar * archive, const gchar * dest);
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
165 static gchar *archive_extract_tbz2(const gchar * archive, const gchar * dest);
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
166
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
167 static ArchiveExtractFunc archive_extract_funcs[] = {
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
168 NULL,
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
169 NULL,
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
170 archive_extract_tar,
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
171 archive_extract_tgz,
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
172 archive_extract_zip,
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
173 archive_extract_tbz2
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
174 };
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
175
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
176
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
177 /* FIXME: these functions can be generalised into a function using a
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
178 * command lookup table */
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
179
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
180 static const gchar *
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
181 get_tar_command(void)
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
182 {
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
183 static const gchar *command = NULL;
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
184
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
185 if (!command) {
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
186 if (!(command = getenv("TARCMD")))
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
187 command = "tar";
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
188 }
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
189
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
190 return command;
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
191 }
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
192
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
193 static const gchar *
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
194 get_unzip_command(void)
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
195 {
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
196 static const gchar *command = NULL;
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
197
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
198 if (!command) {
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
199 if (!(command = getenv("UNZIPCMD")))
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
200 command = "unzip";
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
201 }
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
202
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
203 return command;
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
204 }
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
205
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
206
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
207 static gchar *
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
208 archive_extract_tar(const gchar * archive, const gchar * dest)
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
209 {
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
210 return g_strdup_printf("%s >/dev/null xf \"%s\" -C %s",
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
211 get_tar_command(), archive, dest);
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
212 }
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
213
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
214 static gchar *
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
215 archive_extract_zip(const gchar * archive, const gchar * dest)
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
216 {
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
217 return g_strdup_printf("%s >/dev/null -o -j \"%s\" -d %s",
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
218 get_unzip_command(), archive, dest);
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
219 }
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
220
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
221 static gchar *
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
222 archive_extract_tgz(const gchar * archive, const gchar * dest)
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
223 {
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
224 return g_strdup_printf("%s >/dev/null xzf \"%s\" -C %s",
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
225 get_tar_command(), archive, dest);
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
226 }
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
227
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
228 static gchar *
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
229 archive_extract_tbz2(const gchar * archive, const gchar * dest)
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
230 {
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
231 return g_strdup_printf("bzip2 -dc \"%s\" | %s >/dev/null xf - -C %s",
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
232 archive, get_tar_command(), dest);
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
233 }
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
234
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
235
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
236 ArchiveType
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
237 archive_get_type(const gchar * filename)
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
238 {
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
239 gint i = 0;
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
240
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
241 if (g_file_test(filename, G_FILE_TEST_IS_DIR))
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
242 return ARCHIVE_DIR;
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
243
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
244 while (archive_extensions[i].ext) {
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
245 if (g_str_has_suffix(filename, archive_extensions[i].ext)) {
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
246 return archive_extensions[i].type;
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
247 }
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
248 i++;
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
249 }
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
250
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
251 return ARCHIVE_UNKNOWN;
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
252 }
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
253
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
254 gboolean
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
255 file_is_archive(const gchar * filename)
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
256 {
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
257 return (archive_get_type(filename) > ARCHIVE_DIR);
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
258 }
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
259
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
260 gchar *
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
261 archive_basename(const gchar * str)
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
262 {
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
263 gint i = 0;
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
264
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
265 while (archive_extensions[i].ext) {
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
266 if (str_has_suffix_nocase(str, archive_extensions[i].ext)) {
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
267 const gchar *end = g_strrstr(str, archive_extensions[i].ext);
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
268 if (end) {
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
269 return g_strndup(str, end - str);
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
270 }
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
271 break;
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
272 }
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
273 i++;
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
274 }
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
275
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
276 return NULL;
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
277 }
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
278
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
279 /*
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
280 decompress_archive
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
281
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
282 Decompresses the archive "filename" to a temporary directory,
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
283 returns the path to the temp dir, or NULL if failed,
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
284 watch out tho, doesn't actually check if the system command succeeds :-|
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
285 */
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
286
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
287 gchar *
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
288 archive_decompress(const gchar * filename)
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
289 {
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
290 gchar *tmpdir, *cmd, *escaped_filename;
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
291 ArchiveType type;
2328
d88558b0de0a [svn] - Added script for migration to XDG basedir.
js
parents: 2313
diff changeset
292 #ifndef HAVE_MKDTEMP
2313
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
293 mode_t mode755 = S_IRWXU | S_IRGRP | S_IXGRP | S_IROTH | S_IXOTH;
2328
d88558b0de0a [svn] - Added script for migration to XDG basedir.
js
parents: 2313
diff changeset
294 #endif
2313
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
295
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
296 if ((type = archive_get_type(filename)) <= ARCHIVE_DIR)
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
297 return NULL;
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
298
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
299 #ifdef HAVE_MKDTEMP
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
300 tmpdir = g_build_filename(g_get_tmp_dir(), "audacious.XXXXXXXX", NULL);
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
301 if (!mkdtemp(tmpdir)) {
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
302 g_free(tmpdir);
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
303 g_message("Unable to load skin: Failed to create temporary "
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
304 "directory: %s", g_strerror(errno));
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
305 return NULL;
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
306 }
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
307 #else
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
308 tmpdir = g_strdup_printf("%s/audacious.%ld", g_get_tmp_dir(), rand());
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
309 make_directory(tmpdir, mode755);
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
310 #endif
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
311
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
312 escaped_filename = escape_shell_chars(filename);
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
313 cmd = archive_extract_funcs[type] (escaped_filename, tmpdir);
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
314 g_free(escaped_filename);
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
315
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
316 if (!cmd) {
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
317 g_message("extraction function is NULL!");
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
318 g_free(tmpdir);
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
319 return NULL;
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
320 }
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
321
2361
f24ae4f40e29 [svn] - security and warning fixes from ssommer@suse
nenolod
parents: 2332
diff changeset
322 if(system(cmd) == -1)
f24ae4f40e29 [svn] - security and warning fixes from ssommer@suse
nenolod
parents: 2332
diff changeset
323 {
f24ae4f40e29 [svn] - security and warning fixes from ssommer@suse
nenolod
parents: 2332
diff changeset
324 g_message("could not execute cmd %s",cmd);
f24ae4f40e29 [svn] - security and warning fixes from ssommer@suse
nenolod
parents: 2332
diff changeset
325 g_free(cmd);
f24ae4f40e29 [svn] - security and warning fixes from ssommer@suse
nenolod
parents: 2332
diff changeset
326 return NULL;
f24ae4f40e29 [svn] - security and warning fixes from ssommer@suse
nenolod
parents: 2332
diff changeset
327 }
2313
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
328 g_free(cmd);
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
329
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
330 return tmpdir;
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
331 }
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
332
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
333
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
334 #ifdef HAVE_FTS_H
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
335
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
336 void
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
337 del_directory(const gchar * dirname)
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
338 {
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
339 gchar *const argv[2] = { (gchar *) dirname, NULL };
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
340 FTS *fts;
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
341 FTSENT *p;
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
342
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
343 fts = fts_open(argv, FTS_PHYSICAL, (gint(*)())NULL);
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
344 while ((p = fts_read(fts))) {
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
345 switch (p->fts_info) {
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
346 case FTS_D:
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
347 break;
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
348 case FTS_DNR:
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
349 case FTS_ERR:
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
350 break;
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
351 case FTS_DP:
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
352 rmdir(p->fts_accpath);
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
353 break;
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
354 default:
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
355 unlink(p->fts_accpath);
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
356 break;
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
357 }
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
358 }
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
359 fts_close(fts);
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
360 }
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
361
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
362 #else /* !HAVE_FTS */
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
363
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
364 gboolean
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
365 del_directory_func(const gchar * path, const gchar * basename,
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
366 gpointer params)
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
367 {
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
368 if (!strcmp(basename, ".") || !strcmp(path, ".."))
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
369 return FALSE;
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
370
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
371 if (g_file_test(path, G_FILE_TEST_IS_DIR)) {
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
372 dir_foreach(path, del_directory_func, NULL, NULL);
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
373 rmdir(path);
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
374 return FALSE;
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
375 }
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
376
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
377 unlink(path);
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
378
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
379 return FALSE;
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
380 }
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
381
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
382 void
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
383 del_directory(const gchar * path)
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
384 {
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
385 dir_foreach(path, del_directory_func, NULL, NULL);
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
386 rmdir(path);
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
387 }
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
388
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
389 #endif /* ifdef HAVE_FTS */
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
390
2529
299be5908480 [svn] - made new INI file parser
mf0102
parents: 2514
diff changeset
391 static void
299be5908480 [svn] - made new INI file parser
mf0102
parents: 2514
diff changeset
392 strip_string(GString *string)
299be5908480 [svn] - made new INI file parser
mf0102
parents: 2514
diff changeset
393 {
299be5908480 [svn] - made new INI file parser
mf0102
parents: 2514
diff changeset
394 while (string->len > 0 && string->str[0] == ' ')
299be5908480 [svn] - made new INI file parser
mf0102
parents: 2514
diff changeset
395 g_string_erase(string, 0, 1);
299be5908480 [svn] - made new INI file parser
mf0102
parents: 2514
diff changeset
396
299be5908480 [svn] - made new INI file parser
mf0102
parents: 2514
diff changeset
397 while (string->len > 0 && string->str[string->len - 1] == ' ')
299be5908480 [svn] - made new INI file parser
mf0102
parents: 2514
diff changeset
398 g_string_erase(string, string->len - 1, 1);
299be5908480 [svn] - made new INI file parser
mf0102
parents: 2514
diff changeset
399 }
299be5908480 [svn] - made new INI file parser
mf0102
parents: 2514
diff changeset
400
299be5908480 [svn] - made new INI file parser
mf0102
parents: 2514
diff changeset
401 static void
299be5908480 [svn] - made new INI file parser
mf0102
parents: 2514
diff changeset
402 strip_lower_string(GString *string)
299be5908480 [svn] - made new INI file parser
mf0102
parents: 2514
diff changeset
403 {
2660
8d0b89db56e5 [svn] - fixed c++ish declaration in a c file (part 7)
giacomo
parents: 2635
diff changeset
404 gchar *lower;
2529
299be5908480 [svn] - made new INI file parser
mf0102
parents: 2514
diff changeset
405 strip_string(string);
2609
fe33bdd3d5ad [svn] Prevent double free() by strdup'ing value.
hansmi
parents: 2607
diff changeset
406
2660
8d0b89db56e5 [svn] - fixed c++ish declaration in a c file (part 7)
giacomo
parents: 2635
diff changeset
407 lower = g_ascii_strdown(string->str, -1);
2529
299be5908480 [svn] - made new INI file parser
mf0102
parents: 2514
diff changeset
408 g_free(string->str);
299be5908480 [svn] - made new INI file parser
mf0102
parents: 2514
diff changeset
409 string->str = lower;
299be5908480 [svn] - made new INI file parser
mf0102
parents: 2514
diff changeset
410 }
299be5908480 [svn] - made new INI file parser
mf0102
parents: 2514
diff changeset
411
299be5908480 [svn] - made new INI file parser
mf0102
parents: 2514
diff changeset
412 INIFile *
299be5908480 [svn] - made new INI file parser
mf0102
parents: 2514
diff changeset
413 open_ini_file(const gchar *filename)
2313
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
414 {
2529
299be5908480 [svn] - made new INI file parser
mf0102
parents: 2514
diff changeset
415 GHashTable *ini_file = g_hash_table_new(NULL, NULL);
299be5908480 [svn] - made new INI file parser
mf0102
parents: 2514
diff changeset
416 GHashTable *section = g_hash_table_new(NULL, NULL);
299be5908480 [svn] - made new INI file parser
mf0102
parents: 2514
diff changeset
417 GString *section_name, *key_name, *value;
299be5908480 [svn] - made new INI file parser
mf0102
parents: 2514
diff changeset
418 gpointer section_hash, key_hash;
299be5908480 [svn] - made new INI file parser
mf0102
parents: 2514
diff changeset
419 gchar *buffer = NULL;
2313
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
420 gsize off = 0;
2529
299be5908480 [svn] - made new INI file parser
mf0102
parents: 2514
diff changeset
421 gsize filesize = 0;
299be5908480 [svn] - made new INI file parser
mf0102
parents: 2514
diff changeset
422
2313
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
423 unsigned char x[] = { 0xff, 0xfe, 0x00 };
2529
299be5908480 [svn] - made new INI file parser
mf0102
parents: 2514
diff changeset
424
299be5908480 [svn] - made new INI file parser
mf0102
parents: 2514
diff changeset
425
299be5908480 [svn] - made new INI file parser
mf0102
parents: 2514
diff changeset
426 g_return_val_if_fail(filename, NULL);
299be5908480 [svn] - made new INI file parser
mf0102
parents: 2514
diff changeset
427
299be5908480 [svn] - made new INI file parser
mf0102
parents: 2514
diff changeset
428 section_name = g_string_new("");
299be5908480 [svn] - made new INI file parser
mf0102
parents: 2514
diff changeset
429 key_name = g_string_new(NULL);
299be5908480 [svn] - made new INI file parser
mf0102
parents: 2514
diff changeset
430 value = g_string_new(NULL);
2313
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
431
2529
299be5908480 [svn] - made new INI file parser
mf0102
parents: 2514
diff changeset
432 /* make a nameless section which should store all entries that are not
299be5908480 [svn] - made new INI file parser
mf0102
parents: 2514
diff changeset
433 * embedded in a section */
299be5908480 [svn] - made new INI file parser
mf0102
parents: 2514
diff changeset
434 section_hash = GINT_TO_POINTER(g_string_hash(section_name));
299be5908480 [svn] - made new INI file parser
mf0102
parents: 2514
diff changeset
435 g_hash_table_insert(ini_file, section_hash, section);
299be5908480 [svn] - made new INI file parser
mf0102
parents: 2514
diff changeset
436
299be5908480 [svn] - made new INI file parser
mf0102
parents: 2514
diff changeset
437 vfs_file_get_contents(filename, &buffer, &filesize);
299be5908480 [svn] - made new INI file parser
mf0102
parents: 2514
diff changeset
438 if (buffer == NULL)
2313
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
439 return NULL;
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
440
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
441
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
442 /*
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
443 * Convert UTF-16 into something useful. Original implementation
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
444 * by incomp@#audacious. Cleanups \nenolod
2529
299be5908480 [svn] - made new INI file parser
mf0102
parents: 2514
diff changeset
445 * FIXME: can't we use a GLib function for that? -- 01mf02
2313
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
446 */
2607
65543c999c7e [svn] Check filesize before doing memcmp (potential sigsegv).
hansmi
parents: 2556
diff changeset
447 if (filesize > 2 && !memcmp(&buffer[0],&x,2))
2529
299be5908480 [svn] - made new INI file parser
mf0102
parents: 2514
diff changeset
448 {
299be5908480 [svn] - made new INI file parser
mf0102
parents: 2514
diff changeset
449 gchar *outbuf = g_malloc (filesize); /* it's safe to waste memory. */
299be5908480 [svn] - made new INI file parser
mf0102
parents: 2514
diff changeset
450 guint counter;
2313
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
451
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
452 for (counter = 2; counter < filesize; counter += 2)
2529
299be5908480 [svn] - made new INI file parser
mf0102
parents: 2514
diff changeset
453 {
2313
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
454 if (!memcmp(&buffer[counter+1], &x[2], 1))
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
455 outbuf[(counter-2)/2] = buffer[counter];
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
456 else
2529
299be5908480 [svn] - made new INI file parser
mf0102
parents: 2514
diff changeset
457 return NULL;
299be5908480 [svn] - made new INI file parser
mf0102
parents: 2514
diff changeset
458 }
2313
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
459
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
460 outbuf[(counter-2)/2] = '\0';
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
461
2529
299be5908480 [svn] - made new INI file parser
mf0102
parents: 2514
diff changeset
462 if ((filesize - 2) / 2 == (counter - 2) / 2)
299be5908480 [svn] - made new INI file parser
mf0102
parents: 2514
diff changeset
463 {
2313
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
464 g_free(buffer);
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
465 buffer = outbuf;
2529
299be5908480 [svn] - made new INI file parser
mf0102
parents: 2514
diff changeset
466 }
299be5908480 [svn] - made new INI file parser
mf0102
parents: 2514
diff changeset
467 else
299be5908480 [svn] - made new INI file parser
mf0102
parents: 2514
diff changeset
468 {
2313
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
469 g_free(outbuf);
2529
299be5908480 [svn] - made new INI file parser
mf0102
parents: 2514
diff changeset
470 return NULL; /* XXX wrong encoding */
2313
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
471 }
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
472 }
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
473
2529
299be5908480 [svn] - made new INI file parser
mf0102
parents: 2514
diff changeset
474 while (off < filesize)
299be5908480 [svn] - made new INI file parser
mf0102
parents: 2514
diff changeset
475 {
299be5908480 [svn] - made new INI file parser
mf0102
parents: 2514
diff changeset
476 /* ignore the following characters */
299be5908480 [svn] - made new INI file parser
mf0102
parents: 2514
diff changeset
477 if (buffer[off] == '\r' || buffer[off] == '\n' ||
299be5908480 [svn] - made new INI file parser
mf0102
parents: 2514
diff changeset
478 buffer[off] == ' ' || buffer[off] == '\t')
299be5908480 [svn] - made new INI file parser
mf0102
parents: 2514
diff changeset
479 {
299be5908480 [svn] - made new INI file parser
mf0102
parents: 2514
diff changeset
480 if (buffer[off] == '\n')
299be5908480 [svn] - made new INI file parser
mf0102
parents: 2514
diff changeset
481 {
299be5908480 [svn] - made new INI file parser
mf0102
parents: 2514
diff changeset
482 g_string_free(key_name, TRUE);
299be5908480 [svn] - made new INI file parser
mf0102
parents: 2514
diff changeset
483 g_string_free(value, FALSE);
299be5908480 [svn] - made new INI file parser
mf0102
parents: 2514
diff changeset
484 key_name = g_string_new(NULL);
299be5908480 [svn] - made new INI file parser
mf0102
parents: 2514
diff changeset
485 value = g_string_new(NULL);
299be5908480 [svn] - made new INI file parser
mf0102
parents: 2514
diff changeset
486 }
299be5908480 [svn] - made new INI file parser
mf0102
parents: 2514
diff changeset
487
299be5908480 [svn] - made new INI file parser
mf0102
parents: 2514
diff changeset
488 off++;
299be5908480 [svn] - made new INI file parser
mf0102
parents: 2514
diff changeset
489 continue;
299be5908480 [svn] - made new INI file parser
mf0102
parents: 2514
diff changeset
490 }
299be5908480 [svn] - made new INI file parser
mf0102
parents: 2514
diff changeset
491
299be5908480 [svn] - made new INI file parser
mf0102
parents: 2514
diff changeset
492 /* if we encounter a possible section statement */
299be5908480 [svn] - made new INI file parser
mf0102
parents: 2514
diff changeset
493 if (buffer[off] == '[')
299be5908480 [svn] - made new INI file parser
mf0102
parents: 2514
diff changeset
494 {
299be5908480 [svn] - made new INI file parser
mf0102
parents: 2514
diff changeset
495 g_string_free(section_name, TRUE);
299be5908480 [svn] - made new INI file parser
mf0102
parents: 2514
diff changeset
496 section_name = g_string_new(NULL);
2313
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
497 off++;
2529
299be5908480 [svn] - made new INI file parser
mf0102
parents: 2514
diff changeset
498
299be5908480 [svn] - made new INI file parser
mf0102
parents: 2514
diff changeset
499 if (off >= filesize)
299be5908480 [svn] - made new INI file parser
mf0102
parents: 2514
diff changeset
500 goto return_sequence;
299be5908480 [svn] - made new INI file parser
mf0102
parents: 2514
diff changeset
501
299be5908480 [svn] - made new INI file parser
mf0102
parents: 2514
diff changeset
502 while (buffer[off] != ']')
299be5908480 [svn] - made new INI file parser
mf0102
parents: 2514
diff changeset
503 {
299be5908480 [svn] - made new INI file parser
mf0102
parents: 2514
diff changeset
504 /* if the section statement has not been closed before a
299be5908480 [svn] - made new INI file parser
mf0102
parents: 2514
diff changeset
505 * linebreak */
299be5908480 [svn] - made new INI file parser
mf0102
parents: 2514
diff changeset
506 if (buffer[off] == '\n')
299be5908480 [svn] - made new INI file parser
mf0102
parents: 2514
diff changeset
507 break;
299be5908480 [svn] - made new INI file parser
mf0102
parents: 2514
diff changeset
508
299be5908480 [svn] - made new INI file parser
mf0102
parents: 2514
diff changeset
509 g_string_append_c(section_name, buffer[off]);
299be5908480 [svn] - made new INI file parser
mf0102
parents: 2514
diff changeset
510 off++;
299be5908480 [svn] - made new INI file parser
mf0102
parents: 2514
diff changeset
511 if (off >= filesize)
299be5908480 [svn] - made new INI file parser
mf0102
parents: 2514
diff changeset
512 goto return_sequence;
299be5908480 [svn] - made new INI file parser
mf0102
parents: 2514
diff changeset
513 }
299be5908480 [svn] - made new INI file parser
mf0102
parents: 2514
diff changeset
514 if (buffer[off] == '\n')
299be5908480 [svn] - made new INI file parser
mf0102
parents: 2514
diff changeset
515 continue;
299be5908480 [svn] - made new INI file parser
mf0102
parents: 2514
diff changeset
516 if (buffer[off] == ']')
299be5908480 [svn] - made new INI file parser
mf0102
parents: 2514
diff changeset
517 {
299be5908480 [svn] - made new INI file parser
mf0102
parents: 2514
diff changeset
518 off++;
299be5908480 [svn] - made new INI file parser
mf0102
parents: 2514
diff changeset
519 if (off >= filesize)
299be5908480 [svn] - made new INI file parser
mf0102
parents: 2514
diff changeset
520 goto return_sequence;
299be5908480 [svn] - made new INI file parser
mf0102
parents: 2514
diff changeset
521
299be5908480 [svn] - made new INI file parser
mf0102
parents: 2514
diff changeset
522 strip_lower_string(section_name);
299be5908480 [svn] - made new INI file parser
mf0102
parents: 2514
diff changeset
523 section_hash = GINT_TO_POINTER(g_string_hash(section_name));
299be5908480 [svn] - made new INI file parser
mf0102
parents: 2514
diff changeset
524
299be5908480 [svn] - made new INI file parser
mf0102
parents: 2514
diff changeset
525 /* if this section already exists, we don't make a new one,
299be5908480 [svn] - made new INI file parser
mf0102
parents: 2514
diff changeset
526 * but reuse the old one */
299be5908480 [svn] - made new INI file parser
mf0102
parents: 2514
diff changeset
527 if (g_hash_table_lookup(ini_file, section_hash) != NULL)
299be5908480 [svn] - made new INI file parser
mf0102
parents: 2514
diff changeset
528 section = g_hash_table_lookup(ini_file, section_hash);
299be5908480 [svn] - made new INI file parser
mf0102
parents: 2514
diff changeset
529 else
299be5908480 [svn] - made new INI file parser
mf0102
parents: 2514
diff changeset
530 {
299be5908480 [svn] - made new INI file parser
mf0102
parents: 2514
diff changeset
531 section = g_hash_table_new(NULL, NULL);
299be5908480 [svn] - made new INI file parser
mf0102
parents: 2514
diff changeset
532 g_hash_table_insert(ini_file, section_hash, section);
2313
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
533 }
2529
299be5908480 [svn] - made new INI file parser
mf0102
parents: 2514
diff changeset
534
299be5908480 [svn] - made new INI file parser
mf0102
parents: 2514
diff changeset
535 continue;
2313
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
536 }
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
537 }
2529
299be5908480 [svn] - made new INI file parser
mf0102
parents: 2514
diff changeset
538
299be5908480 [svn] - made new INI file parser
mf0102
parents: 2514
diff changeset
539 if (buffer[off] == '=')
299be5908480 [svn] - made new INI file parser
mf0102
parents: 2514
diff changeset
540 {
299be5908480 [svn] - made new INI file parser
mf0102
parents: 2514
diff changeset
541 off++;
2313
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
542 if (off >= filesize)
2529
299be5908480 [svn] - made new INI file parser
mf0102
parents: 2514
diff changeset
543 goto return_sequence;
299be5908480 [svn] - made new INI file parser
mf0102
parents: 2514
diff changeset
544
2556
a221f10fd105 [svn] - or comparison should be an and comparison
nenolod
parents: 2555
diff changeset
545 while (buffer[off] != '\n' && buffer[off] != '\r')
2529
299be5908480 [svn] - made new INI file parser
mf0102
parents: 2514
diff changeset
546 {
299be5908480 [svn] - made new INI file parser
mf0102
parents: 2514
diff changeset
547 g_string_append_c(value, buffer[off]);
2313
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
548 off++;
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
549 if (off >= filesize)
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
550 break;
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
551 }
2529
299be5908480 [svn] - made new INI file parser
mf0102
parents: 2514
diff changeset
552
299be5908480 [svn] - made new INI file parser
mf0102
parents: 2514
diff changeset
553 strip_lower_string(key_name);
299be5908480 [svn] - made new INI file parser
mf0102
parents: 2514
diff changeset
554 key_hash = GINT_TO_POINTER(g_string_hash(key_name));
299be5908480 [svn] - made new INI file parser
mf0102
parents: 2514
diff changeset
555 strip_string(value);
299be5908480 [svn] - made new INI file parser
mf0102
parents: 2514
diff changeset
556
299be5908480 [svn] - made new INI file parser
mf0102
parents: 2514
diff changeset
557 if (key_name->len > 0 && value->len > 0)
2609
fe33bdd3d5ad [svn] Prevent double free() by strdup'ing value.
hansmi
parents: 2607
diff changeset
558 g_hash_table_insert(section, key_hash, g_strdup(value->str));
2313
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
559 }
2529
299be5908480 [svn] - made new INI file parser
mf0102
parents: 2514
diff changeset
560 else
299be5908480 [svn] - made new INI file parser
mf0102
parents: 2514
diff changeset
561 {
299be5908480 [svn] - made new INI file parser
mf0102
parents: 2514
diff changeset
562 g_string_append_c(key_name, buffer[off]);
2313
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
563 off++;
2529
299be5908480 [svn] - made new INI file parser
mf0102
parents: 2514
diff changeset
564 if (off >= filesize)
299be5908480 [svn] - made new INI file parser
mf0102
parents: 2514
diff changeset
565 goto return_sequence;
299be5908480 [svn] - made new INI file parser
mf0102
parents: 2514
diff changeset
566 }
2313
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
567 }
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
568
2529
299be5908480 [svn] - made new INI file parser
mf0102
parents: 2514
diff changeset
569 return_sequence:
299be5908480 [svn] - made new INI file parser
mf0102
parents: 2514
diff changeset
570 g_string_free(section_name, TRUE);
299be5908480 [svn] - made new INI file parser
mf0102
parents: 2514
diff changeset
571 g_string_free(key_name, TRUE);
299be5908480 [svn] - made new INI file parser
mf0102
parents: 2514
diff changeset
572 g_string_free(value, TRUE);
299be5908480 [svn] - made new INI file parser
mf0102
parents: 2514
diff changeset
573 g_free(buffer);
299be5908480 [svn] - made new INI file parser
mf0102
parents: 2514
diff changeset
574 return ini_file;
299be5908480 [svn] - made new INI file parser
mf0102
parents: 2514
diff changeset
575 }
299be5908480 [svn] - made new INI file parser
mf0102
parents: 2514
diff changeset
576
299be5908480 [svn] - made new INI file parser
mf0102
parents: 2514
diff changeset
577 void
299be5908480 [svn] - made new INI file parser
mf0102
parents: 2514
diff changeset
578 close_ini_file(INIFile *inifile)
299be5908480 [svn] - made new INI file parser
mf0102
parents: 2514
diff changeset
579 {
299be5908480 [svn] - made new INI file parser
mf0102
parents: 2514
diff changeset
580 g_return_if_fail(inifile);
299be5908480 [svn] - made new INI file parser
mf0102
parents: 2514
diff changeset
581
299be5908480 [svn] - made new INI file parser
mf0102
parents: 2514
diff changeset
582 /* we don't have to destroy anything in the hash table manually, as the
299be5908480 [svn] - made new INI file parser
mf0102
parents: 2514
diff changeset
583 * keys are represented as integers and the string values may be used in
299be5908480 [svn] - made new INI file parser
mf0102
parents: 2514
diff changeset
584 * functions which have read the strings from the hash table
299be5908480 [svn] - made new INI file parser
mf0102
parents: 2514
diff changeset
585 */
299be5908480 [svn] - made new INI file parser
mf0102
parents: 2514
diff changeset
586 g_hash_table_destroy(inifile);
299be5908480 [svn] - made new INI file parser
mf0102
parents: 2514
diff changeset
587 }
299be5908480 [svn] - made new INI file parser
mf0102
parents: 2514
diff changeset
588
299be5908480 [svn] - made new INI file parser
mf0102
parents: 2514
diff changeset
589 gchar *
299be5908480 [svn] - made new INI file parser
mf0102
parents: 2514
diff changeset
590 read_ini_string(INIFile *inifile, const gchar *section, const gchar *key)
299be5908480 [svn] - made new INI file parser
mf0102
parents: 2514
diff changeset
591 {
2660
8d0b89db56e5 [svn] - fixed c++ish declaration in a c file (part 7)
giacomo
parents: 2635
diff changeset
592 GString *section_string;
8d0b89db56e5 [svn] - fixed c++ish declaration in a c file (part 7)
giacomo
parents: 2635
diff changeset
593 GString *key_string;
8d0b89db56e5 [svn] - fixed c++ish declaration in a c file (part 7)
giacomo
parents: 2635
diff changeset
594 gchar *value = NULL;
8d0b89db56e5 [svn] - fixed c++ish declaration in a c file (part 7)
giacomo
parents: 2635
diff changeset
595 gpointer section_hash, key_hash;
8d0b89db56e5 [svn] - fixed c++ish declaration in a c file (part 7)
giacomo
parents: 2635
diff changeset
596 GHashTable *section_table;
8d0b89db56e5 [svn] - fixed c++ish declaration in a c file (part 7)
giacomo
parents: 2635
diff changeset
597
2529
299be5908480 [svn] - made new INI file parser
mf0102
parents: 2514
diff changeset
598 g_return_val_if_fail(inifile, NULL);
299be5908480 [svn] - made new INI file parser
mf0102
parents: 2514
diff changeset
599
2660
8d0b89db56e5 [svn] - fixed c++ish declaration in a c file (part 7)
giacomo
parents: 2635
diff changeset
600 section_string = g_string_new(section);
8d0b89db56e5 [svn] - fixed c++ish declaration in a c file (part 7)
giacomo
parents: 2635
diff changeset
601 key_string = g_string_new(key);
8d0b89db56e5 [svn] - fixed c++ish declaration in a c file (part 7)
giacomo
parents: 2635
diff changeset
602 value = NULL;
2529
299be5908480 [svn] - made new INI file parser
mf0102
parents: 2514
diff changeset
603
299be5908480 [svn] - made new INI file parser
mf0102
parents: 2514
diff changeset
604 strip_lower_string(section_string);
299be5908480 [svn] - made new INI file parser
mf0102
parents: 2514
diff changeset
605 strip_lower_string(key_string);
2660
8d0b89db56e5 [svn] - fixed c++ish declaration in a c file (part 7)
giacomo
parents: 2635
diff changeset
606 section_hash = GINT_TO_POINTER(g_string_hash(section_string));
8d0b89db56e5 [svn] - fixed c++ish declaration in a c file (part 7)
giacomo
parents: 2635
diff changeset
607 key_hash = GINT_TO_POINTER(g_string_hash(key_string));
2529
299be5908480 [svn] - made new INI file parser
mf0102
parents: 2514
diff changeset
608 g_string_free(section_string, FALSE);
299be5908480 [svn] - made new INI file parser
mf0102
parents: 2514
diff changeset
609 g_string_free(key_string, FALSE);
299be5908480 [svn] - made new INI file parser
mf0102
parents: 2514
diff changeset
610
2660
8d0b89db56e5 [svn] - fixed c++ish declaration in a c file (part 7)
giacomo
parents: 2635
diff changeset
611 section_table = g_hash_table_lookup(inifile, section_hash);
2529
299be5908480 [svn] - made new INI file parser
mf0102
parents: 2514
diff changeset
612 g_return_val_if_fail(section_table, NULL);
299be5908480 [svn] - made new INI file parser
mf0102
parents: 2514
diff changeset
613
299be5908480 [svn] - made new INI file parser
mf0102
parents: 2514
diff changeset
614 value = g_hash_table_lookup(section_table, GINT_TO_POINTER(key_hash));
299be5908480 [svn] - made new INI file parser
mf0102
parents: 2514
diff changeset
615 return value;
2313
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
616 }
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
617
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
618 GArray *
2529
299be5908480 [svn] - made new INI file parser
mf0102
parents: 2514
diff changeset
619 read_ini_array(INIFile *inifile, const gchar *section, const gchar *key)
2514
7934ac463591 [svn] - removed unused function bmp_menu_translate()
mf0102
parents: 2494
diff changeset
620 {
7934ac463591 [svn] - removed unused function bmp_menu_translate()
mf0102
parents: 2494
diff changeset
621 gchar *temp;
7934ac463591 [svn] - removed unused function bmp_menu_translate()
mf0102
parents: 2494
diff changeset
622 GArray *a;
7934ac463591 [svn] - removed unused function bmp_menu_translate()
mf0102
parents: 2494
diff changeset
623
2529
299be5908480 [svn] - made new INI file parser
mf0102
parents: 2514
diff changeset
624 g_return_val_if_fail((temp = read_ini_string(inifile, section, key)), NULL);
299be5908480 [svn] - made new INI file parser
mf0102
parents: 2514
diff changeset
625
2514
7934ac463591 [svn] - removed unused function bmp_menu_translate()
mf0102
parents: 2494
diff changeset
626 a = string_to_garray(temp);
7934ac463591 [svn] - removed unused function bmp_menu_translate()
mf0102
parents: 2494
diff changeset
627 g_free(temp);
7934ac463591 [svn] - removed unused function bmp_menu_translate()
mf0102
parents: 2494
diff changeset
628 return a;
7934ac463591 [svn] - removed unused function bmp_menu_translate()
mf0102
parents: 2494
diff changeset
629 }
7934ac463591 [svn] - removed unused function bmp_menu_translate()
mf0102
parents: 2494
diff changeset
630
7934ac463591 [svn] - removed unused function bmp_menu_translate()
mf0102
parents: 2494
diff changeset
631 GArray *
2313
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
632 string_to_garray(const gchar * str)
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
633 {
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
634 GArray *array;
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
635 gint temp;
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
636 const gchar *ptr = str;
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
637 gchar *endptr;
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
638
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
639 array = g_array_new(FALSE, TRUE, sizeof(gint));
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
640 for (;;) {
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
641 temp = strtol(ptr, &endptr, 10);
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
642 if (ptr == endptr)
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
643 break;
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
644 g_array_append_val(array, temp);
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
645 ptr = endptr;
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
646 while (!isdigit((int) *ptr) && (*ptr) != '\0')
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
647 ptr++;
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
648 if (*ptr == '\0')
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
649 break;
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
650 }
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
651 return (array);
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
652 }
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
653
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
654 void
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
655 glist_movedown(GList * list)
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
656 {
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
657 gpointer temp;
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
658
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
659 if (g_list_next(list)) {
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
660 temp = list->data;
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
661 list->data = list->next->data;
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
662 list->next->data = temp;
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
663 }
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
664 }
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
665
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
666 void
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
667 glist_moveup(GList * list)
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
668 {
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
669 gpointer temp;
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
670
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
671 if (g_list_previous(list)) {
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
672 temp = list->data;
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
673 list->data = list->prev->data;
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
674 list->prev->data = temp;
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
675 }
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
676 }
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
677
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
678
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
679 void
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
680 util_menu_position(GtkMenu * menu, gint * x, gint * y,
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
681 gboolean * push_in, gpointer data)
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
682 {
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
683 GtkRequisition requisition;
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
684 gint screen_width;
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
685 gint screen_height;
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
686 MenuPos *pos = data;
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
687
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
688 gtk_widget_size_request(GTK_WIDGET(menu), &requisition);
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
689
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
690 screen_width = gdk_screen_width();
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
691 screen_height = gdk_screen_height();
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
692
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
693 *x = CLAMP(pos->x - 2, 0, MAX(0, screen_width - requisition.width));
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
694 *y = CLAMP(pos->y - 2, 0, MAX(0, screen_height - requisition.height));
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
695 }
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
696
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
697 GdkFont *
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
698 util_font_load(const gchar * name)
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
699 {
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
700 GdkFont *font;
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
701 PangoFontDescription *desc;
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
702
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
703 desc = pango_font_description_from_string(name);
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
704 font = gdk_font_from_description(desc);
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
705
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
706 return font;
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
707 }
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
708
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
709 /* text_get_extents() taken from The GIMP (C) Spencer Kimball, Peter
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
710 * Mattis et al */
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
711 gboolean
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
712 text_get_extents(const gchar * fontname,
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
713 const gchar * text,
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
714 gint * width, gint * height, gint * ascent, gint * descent)
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
715 {
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
716 PangoFontDescription *font_desc;
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
717 PangoLayout *layout;
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
718 PangoRectangle rect;
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
719
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
720 g_return_val_if_fail(fontname != NULL, FALSE);
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
721 g_return_val_if_fail(text != NULL, FALSE);
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
722
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
723 /* FIXME: resolution */
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
724 layout = gtk_widget_create_pango_layout(GTK_WIDGET(mainwin), text);
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
725
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
726 font_desc = pango_font_description_from_string(fontname);
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
727 pango_layout_set_font_description(layout, font_desc);
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
728 pango_font_description_free(font_desc);
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
729 pango_layout_get_pixel_extents(layout, NULL, &rect);
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
730
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
731 if (width)
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
732 *width = rect.width;
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
733 if (height)
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
734 *height = rect.height;
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
735
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
736 if (ascent || descent) {
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
737 PangoLayoutIter *iter;
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
738 PangoLayoutLine *line;
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
739
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
740 iter = pango_layout_get_iter(layout);
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
741 line = pango_layout_iter_get_line(iter);
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
742 pango_layout_iter_free(iter);
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
743
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
744 pango_layout_line_get_pixel_extents(line, NULL, &rect);
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
745
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
746 if (ascent)
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
747 *ascent = PANGO_ASCENT(rect);
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
748 if (descent)
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
749 *descent = -PANGO_DESCENT(rect);
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
750 }
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
751
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
752 g_object_unref(layout);
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
753
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
754 return TRUE;
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
755 }
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
756
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
757 /* counts number of digits in a gint */
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
758 guint
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
759 gint_count_digits(gint n)
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
760 {
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
761 guint count = 0;
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
762
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
763 n = ABS(n);
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
764 do {
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
765 count++;
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
766 n /= 10;
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
767 } while (n > 0);
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
768
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
769 return count;
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
770 }
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
771
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
772 gboolean
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
773 dir_foreach(const gchar * path, DirForeachFunc function,
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
774 gpointer user_data, GError ** error)
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
775 {
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
776 GError *error_out = NULL;
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
777 GDir *dir;
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
778 const gchar *entry;
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
779 gchar *entry_fullpath;
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
780
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
781 if (!(dir = g_dir_open(path, 0, &error_out))) {
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
782 g_propagate_error(error, error_out);
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
783 return FALSE;
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
784 }
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
785
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
786 while ((entry = g_dir_read_name(dir))) {
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
787 entry_fullpath = g_build_filename(path, entry, NULL);
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
788
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
789 if ((*function) (entry_fullpath, entry, user_data)) {
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
790 g_free(entry_fullpath);
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
791 break;
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
792 }
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
793
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
794 g_free(entry_fullpath);
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
795 }
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
796
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
797 g_dir_close(dir);
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
798
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
799 return TRUE;
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
800 }
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
801
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
802 GtkWidget *
2514
7934ac463591 [svn] - removed unused function bmp_menu_translate()
mf0102
parents: 2494
diff changeset
803 make_filebrowser(const gchar *title, gboolean save)
2313
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
804 {
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
805 GtkWidget *dialog;
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
806 GtkWidget *button;
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
807
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
808 g_return_val_if_fail(title != NULL, NULL);
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
809
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
810 dialog = gtk_file_chooser_dialog_new(title, GTK_WINDOW(mainwin),
2514
7934ac463591 [svn] - removed unused function bmp_menu_translate()
mf0102
parents: 2494
diff changeset
811 save ?
7934ac463591 [svn] - removed unused function bmp_menu_translate()
mf0102
parents: 2494
diff changeset
812 GTK_FILE_CHOOSER_ACTION_SAVE :
7934ac463591 [svn] - removed unused function bmp_menu_translate()
mf0102
parents: 2494
diff changeset
813 GTK_FILE_CHOOSER_ACTION_OPEN,
7934ac463591 [svn] - removed unused function bmp_menu_translate()
mf0102
parents: 2494
diff changeset
814 NULL, NULL);
2313
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
815
2514
7934ac463591 [svn] - removed unused function bmp_menu_translate()
mf0102
parents: 2494
diff changeset
816 button = gtk_dialog_add_button(GTK_DIALOG(dialog), GTK_STOCK_CANCEL,
7934ac463591 [svn] - removed unused function bmp_menu_translate()
mf0102
parents: 2494
diff changeset
817 GTK_RESPONSE_REJECT);
2313
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
818
2514
7934ac463591 [svn] - removed unused function bmp_menu_translate()
mf0102
parents: 2494
diff changeset
819 gtk_button_set_use_stock(GTK_BUTTON(button), TRUE);
7934ac463591 [svn] - removed unused function bmp_menu_translate()
mf0102
parents: 2494
diff changeset
820 GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
2313
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
821
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
822 button = gtk_dialog_add_button(GTK_DIALOG(dialog), save ?
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
823 GTK_STOCK_SAVE : GTK_STOCK_OPEN,
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
824 GTK_RESPONSE_ACCEPT);
2514
7934ac463591 [svn] - removed unused function bmp_menu_translate()
mf0102
parents: 2494
diff changeset
825
2313
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
826 gtk_button_set_use_stock(GTK_BUTTON(button), TRUE);
2514
7934ac463591 [svn] - removed unused function bmp_menu_translate()
mf0102
parents: 2494
diff changeset
827 gtk_dialog_set_default_response(GTK_DIALOG(dialog), GTK_RESPONSE_ACCEPT);
2635
9b763f1f4e6a [svn] tweak UI behaviors:
yaz
parents: 2609
diff changeset
828 gtk_window_set_position(GTK_WINDOW(dialog), GTK_WIN_POS_CENTER); /* centering */
2313
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
829
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
830 return dialog;
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
831 }
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
832
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
833 /*
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
834 * Resizes a GDK pixmap.
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
835 */
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
836 GdkPixmap *audacious_pixmap_resize(GdkWindow *src, GdkGC *src_gc, GdkPixmap *in, gint width, gint height)
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
837 {
2402
6725ce180c26 [svn] recoded gtk2 style file opener
mf0102
parents: 2373
diff changeset
838 GdkPixmap *out;
6725ce180c26 [svn] recoded gtk2 style file opener
mf0102
parents: 2373
diff changeset
839 gint owidth, oheight;
2313
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
840
2402
6725ce180c26 [svn] recoded gtk2 style file opener
mf0102
parents: 2373
diff changeset
841 g_return_val_if_fail(src != NULL, NULL);
6725ce180c26 [svn] recoded gtk2 style file opener
mf0102
parents: 2373
diff changeset
842 g_return_val_if_fail(src_gc != NULL, NULL);
6725ce180c26 [svn] recoded gtk2 style file opener
mf0102
parents: 2373
diff changeset
843 g_return_val_if_fail(in != NULL, NULL);
6725ce180c26 [svn] recoded gtk2 style file opener
mf0102
parents: 2373
diff changeset
844 g_return_val_if_fail(width > 0 && height > 0, NULL);
2313
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
845
2402
6725ce180c26 [svn] recoded gtk2 style file opener
mf0102
parents: 2373
diff changeset
846 gdk_drawable_get_size(in, &owidth, &oheight);
2313
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
847
2402
6725ce180c26 [svn] recoded gtk2 style file opener
mf0102
parents: 2373
diff changeset
848 if (oheight == height && owidth == width)
6725ce180c26 [svn] recoded gtk2 style file opener
mf0102
parents: 2373
diff changeset
849 return NULL;
2313
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
850
2402
6725ce180c26 [svn] recoded gtk2 style file opener
mf0102
parents: 2373
diff changeset
851 out = gdk_pixmap_new(src, width, height, -1);
2313
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
852
2402
6725ce180c26 [svn] recoded gtk2 style file opener
mf0102
parents: 2373
diff changeset
853 gdk_draw_rectangle(out, src_gc, TRUE, 0, 0, width, height);
2313
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
854
2402
6725ce180c26 [svn] recoded gtk2 style file opener
mf0102
parents: 2373
diff changeset
855 gdk_window_copy_area(out, src_gc, 0, 0, in, 0, 0, owidth, oheight);
6725ce180c26 [svn] recoded gtk2 style file opener
mf0102
parents: 2373
diff changeset
856 g_object_unref(src);
2313
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
857
2402
6725ce180c26 [svn] recoded gtk2 style file opener
mf0102
parents: 2373
diff changeset
858 return out;
2313
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
859 }
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
860
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
861 GdkImage *create_dblsize_image(GdkImage * img)
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
862 {
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
863 GdkImage *dblimg;
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
864 register guint x, y;
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
865
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
866 /*
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
867 * This needs to be optimized
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
868 */
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
869
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
870 dblimg =
2402
6725ce180c26 [svn] recoded gtk2 style file opener
mf0102
parents: 2373
diff changeset
871 gdk_image_new(GDK_IMAGE_NORMAL, gdk_visual_get_system(),
6725ce180c26 [svn] recoded gtk2 style file opener
mf0102
parents: 2373
diff changeset
872 img->width << 1, img->height << 1);
2313
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
873 if (dblimg->bpp == 1) {
2402
6725ce180c26 [svn] recoded gtk2 style file opener
mf0102
parents: 2373
diff changeset
874 register guint8 *srcptr, *ptr, *ptr2, pix;
2313
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
875
2402
6725ce180c26 [svn] recoded gtk2 style file opener
mf0102
parents: 2373
diff changeset
876 srcptr = GDK_IMAGE(img)->mem;
6725ce180c26 [svn] recoded gtk2 style file opener
mf0102
parents: 2373
diff changeset
877 ptr = GDK_IMAGE(dblimg)->mem;
6725ce180c26 [svn] recoded gtk2 style file opener
mf0102
parents: 2373
diff changeset
878 ptr2 = ptr + dblimg->bpl;
2313
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
879
2402
6725ce180c26 [svn] recoded gtk2 style file opener
mf0102
parents: 2373
diff changeset
880 for (y = 0; y < img->height; y++) {
6725ce180c26 [svn] recoded gtk2 style file opener
mf0102
parents: 2373
diff changeset
881 for (x = 0; x < img->width; x++) {
6725ce180c26 [svn] recoded gtk2 style file opener
mf0102
parents: 2373
diff changeset
882 pix = *srcptr++;
6725ce180c26 [svn] recoded gtk2 style file opener
mf0102
parents: 2373
diff changeset
883 *ptr++ = pix;
6725ce180c26 [svn] recoded gtk2 style file opener
mf0102
parents: 2373
diff changeset
884 *ptr++ = pix;
6725ce180c26 [svn] recoded gtk2 style file opener
mf0102
parents: 2373
diff changeset
885 *ptr2++ = pix;
6725ce180c26 [svn] recoded gtk2 style file opener
mf0102
parents: 2373
diff changeset
886 *ptr2++ = pix;
6725ce180c26 [svn] recoded gtk2 style file opener
mf0102
parents: 2373
diff changeset
887 }
6725ce180c26 [svn] recoded gtk2 style file opener
mf0102
parents: 2373
diff changeset
888 srcptr += img->bpl - img->width;
6725ce180c26 [svn] recoded gtk2 style file opener
mf0102
parents: 2373
diff changeset
889 ptr += (dblimg->bpl << 1) - dblimg->width;
6725ce180c26 [svn] recoded gtk2 style file opener
mf0102
parents: 2373
diff changeset
890 ptr2 += (dblimg->bpl << 1) - dblimg->width;
6725ce180c26 [svn] recoded gtk2 style file opener
mf0102
parents: 2373
diff changeset
891 }
2313
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
892 }
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
893 if (dblimg->bpp == 2) {
2402
6725ce180c26 [svn] recoded gtk2 style file opener
mf0102
parents: 2373
diff changeset
894 guint16 *srcptr, *ptr, *ptr2, pix;
2313
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
895
2402
6725ce180c26 [svn] recoded gtk2 style file opener
mf0102
parents: 2373
diff changeset
896 srcptr = (guint16 *) GDK_IMAGE_XIMAGE(img)->data;
6725ce180c26 [svn] recoded gtk2 style file opener
mf0102
parents: 2373
diff changeset
897 ptr = (guint16 *) GDK_IMAGE_XIMAGE(dblimg)->data;
6725ce180c26 [svn] recoded gtk2 style file opener
mf0102
parents: 2373
diff changeset
898 ptr2 = ptr + (dblimg->bpl >> 1);
2313
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
899
2402
6725ce180c26 [svn] recoded gtk2 style file opener
mf0102
parents: 2373
diff changeset
900 for (y = 0; y < img->height; y++) {
6725ce180c26 [svn] recoded gtk2 style file opener
mf0102
parents: 2373
diff changeset
901 for (x = 0; x < img->width; x++) {
6725ce180c26 [svn] recoded gtk2 style file opener
mf0102
parents: 2373
diff changeset
902 pix = *srcptr++;
6725ce180c26 [svn] recoded gtk2 style file opener
mf0102
parents: 2373
diff changeset
903 *ptr++ = pix;
6725ce180c26 [svn] recoded gtk2 style file opener
mf0102
parents: 2373
diff changeset
904 *ptr++ = pix;
6725ce180c26 [svn] recoded gtk2 style file opener
mf0102
parents: 2373
diff changeset
905 *ptr2++ = pix;
6725ce180c26 [svn] recoded gtk2 style file opener
mf0102
parents: 2373
diff changeset
906 *ptr2++ = pix;
6725ce180c26 [svn] recoded gtk2 style file opener
mf0102
parents: 2373
diff changeset
907 }
6725ce180c26 [svn] recoded gtk2 style file opener
mf0102
parents: 2373
diff changeset
908 srcptr += (img->bpl >> 1) - img->width;
6725ce180c26 [svn] recoded gtk2 style file opener
mf0102
parents: 2373
diff changeset
909 ptr += (dblimg->bpl) - dblimg->width;
6725ce180c26 [svn] recoded gtk2 style file opener
mf0102
parents: 2373
diff changeset
910 ptr2 += (dblimg->bpl) - dblimg->width;
6725ce180c26 [svn] recoded gtk2 style file opener
mf0102
parents: 2373
diff changeset
911 }
2313
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
912 }
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
913 if (dblimg->bpp == 3) {
2402
6725ce180c26 [svn] recoded gtk2 style file opener
mf0102
parents: 2373
diff changeset
914 register guint8 *srcptr, *ptr, *ptr2, pix1, pix2, pix3;
2313
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
915
2402
6725ce180c26 [svn] recoded gtk2 style file opener
mf0102
parents: 2373
diff changeset
916 srcptr = GDK_IMAGE(img)->mem;
6725ce180c26 [svn] recoded gtk2 style file opener
mf0102
parents: 2373
diff changeset
917 ptr = GDK_IMAGE(dblimg)->mem;
6725ce180c26 [svn] recoded gtk2 style file opener
mf0102
parents: 2373
diff changeset
918 ptr2 = ptr + dblimg->bpl;
2313
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
919
2402
6725ce180c26 [svn] recoded gtk2 style file opener
mf0102
parents: 2373
diff changeset
920 for (y = 0; y < img->height; y++) {
6725ce180c26 [svn] recoded gtk2 style file opener
mf0102
parents: 2373
diff changeset
921 for (x = 0; x < img->width; x++) {
6725ce180c26 [svn] recoded gtk2 style file opener
mf0102
parents: 2373
diff changeset
922 pix1 = *srcptr++;
6725ce180c26 [svn] recoded gtk2 style file opener
mf0102
parents: 2373
diff changeset
923 pix2 = *srcptr++;
6725ce180c26 [svn] recoded gtk2 style file opener
mf0102
parents: 2373
diff changeset
924 pix3 = *srcptr++;
6725ce180c26 [svn] recoded gtk2 style file opener
mf0102
parents: 2373
diff changeset
925 *ptr++ = pix1;
6725ce180c26 [svn] recoded gtk2 style file opener
mf0102
parents: 2373
diff changeset
926 *ptr++ = pix2;
6725ce180c26 [svn] recoded gtk2 style file opener
mf0102
parents: 2373
diff changeset
927 *ptr++ = pix3;
6725ce180c26 [svn] recoded gtk2 style file opener
mf0102
parents: 2373
diff changeset
928 *ptr++ = pix1;
6725ce180c26 [svn] recoded gtk2 style file opener
mf0102
parents: 2373
diff changeset
929 *ptr++ = pix2;
6725ce180c26 [svn] recoded gtk2 style file opener
mf0102
parents: 2373
diff changeset
930 *ptr++ = pix3;
6725ce180c26 [svn] recoded gtk2 style file opener
mf0102
parents: 2373
diff changeset
931 *ptr2++ = pix1;
6725ce180c26 [svn] recoded gtk2 style file opener
mf0102
parents: 2373
diff changeset
932 *ptr2++ = pix2;
6725ce180c26 [svn] recoded gtk2 style file opener
mf0102
parents: 2373
diff changeset
933 *ptr2++ = pix3;
6725ce180c26 [svn] recoded gtk2 style file opener
mf0102
parents: 2373
diff changeset
934 *ptr2++ = pix1;
6725ce180c26 [svn] recoded gtk2 style file opener
mf0102
parents: 2373
diff changeset
935 *ptr2++ = pix2;
6725ce180c26 [svn] recoded gtk2 style file opener
mf0102
parents: 2373
diff changeset
936 *ptr2++ = pix3;
2313
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
937
2402
6725ce180c26 [svn] recoded gtk2 style file opener
mf0102
parents: 2373
diff changeset
938 }
6725ce180c26 [svn] recoded gtk2 style file opener
mf0102
parents: 2373
diff changeset
939 srcptr += img->bpl - (img->width * 3);
6725ce180c26 [svn] recoded gtk2 style file opener
mf0102
parents: 2373
diff changeset
940 ptr += (dblimg->bpl << 1) - (dblimg->width * 3);
6725ce180c26 [svn] recoded gtk2 style file opener
mf0102
parents: 2373
diff changeset
941 ptr2 += (dblimg->bpl << 1) - (dblimg->width * 3);
6725ce180c26 [svn] recoded gtk2 style file opener
mf0102
parents: 2373
diff changeset
942 }
2313
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
943 }
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
944 if (dblimg->bpp == 4) {
2402
6725ce180c26 [svn] recoded gtk2 style file opener
mf0102
parents: 2373
diff changeset
945 register guint32 *srcptr, *ptr, *ptr2, pix;
2313
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
946
2402
6725ce180c26 [svn] recoded gtk2 style file opener
mf0102
parents: 2373
diff changeset
947 srcptr = (guint32 *) GDK_IMAGE(img)->mem;
6725ce180c26 [svn] recoded gtk2 style file opener
mf0102
parents: 2373
diff changeset
948 ptr = (guint32 *) GDK_IMAGE(dblimg)->mem;
6725ce180c26 [svn] recoded gtk2 style file opener
mf0102
parents: 2373
diff changeset
949 ptr2 = ptr + (dblimg->bpl >> 2);
2313
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
950
2402
6725ce180c26 [svn] recoded gtk2 style file opener
mf0102
parents: 2373
diff changeset
951 for (y = 0; y < img->height; y++) {
6725ce180c26 [svn] recoded gtk2 style file opener
mf0102
parents: 2373
diff changeset
952 for (x = 0; x < img->width; x++) {
6725ce180c26 [svn] recoded gtk2 style file opener
mf0102
parents: 2373
diff changeset
953 pix = *srcptr++;
6725ce180c26 [svn] recoded gtk2 style file opener
mf0102
parents: 2373
diff changeset
954 *ptr++ = pix;
6725ce180c26 [svn] recoded gtk2 style file opener
mf0102
parents: 2373
diff changeset
955 *ptr++ = pix;
6725ce180c26 [svn] recoded gtk2 style file opener
mf0102
parents: 2373
diff changeset
956 *ptr2++ = pix;
6725ce180c26 [svn] recoded gtk2 style file opener
mf0102
parents: 2373
diff changeset
957 *ptr2++ = pix;
6725ce180c26 [svn] recoded gtk2 style file opener
mf0102
parents: 2373
diff changeset
958 }
6725ce180c26 [svn] recoded gtk2 style file opener
mf0102
parents: 2373
diff changeset
959 srcptr += (img->bpl >> 2) - img->width;
6725ce180c26 [svn] recoded gtk2 style file opener
mf0102
parents: 2373
diff changeset
960 ptr += (dblimg->bpl >> 1) - dblimg->width;
6725ce180c26 [svn] recoded gtk2 style file opener
mf0102
parents: 2373
diff changeset
961 ptr2 += (dblimg->bpl >> 1) - dblimg->width;
6725ce180c26 [svn] recoded gtk2 style file opener
mf0102
parents: 2373
diff changeset
962 }
2313
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
963 }
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
964 return dblimg;
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
965 }
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
966
2421
74ec16ef847b [svn] - fix accidental removal of xmms_show_message
nenolod
parents: 2416
diff changeset
967 /**
74ec16ef847b [svn] - fix accidental removal of xmms_show_message
nenolod
parents: 2416
diff changeset
968 * xmms_show_message:
74ec16ef847b [svn] - fix accidental removal of xmms_show_message
nenolod
parents: 2416
diff changeset
969 * @title: The title of the message to show.
74ec16ef847b [svn] - fix accidental removal of xmms_show_message
nenolod
parents: 2416
diff changeset
970 * @text: The text of the message to show.
74ec16ef847b [svn] - fix accidental removal of xmms_show_message
nenolod
parents: 2416
diff changeset
971 * @button_text: The text of the button which will close the messagebox.
74ec16ef847b [svn] - fix accidental removal of xmms_show_message
nenolod
parents: 2416
diff changeset
972 * @modal: Whether or not the messagebox should be modal.
74ec16ef847b [svn] - fix accidental removal of xmms_show_message
nenolod
parents: 2416
diff changeset
973 * @button_action: Code to execute on when the messagebox is closed, or %NULL.
74ec16ef847b [svn] - fix accidental removal of xmms_show_message
nenolod
parents: 2416
diff changeset
974 * @action_data: Optional opaque data to pass to @button_action.
74ec16ef847b [svn] - fix accidental removal of xmms_show_message
nenolod
parents: 2416
diff changeset
975 *
74ec16ef847b [svn] - fix accidental removal of xmms_show_message
nenolod
parents: 2416
diff changeset
976 * Displays a message box.
74ec16ef847b [svn] - fix accidental removal of xmms_show_message
nenolod
parents: 2416
diff changeset
977 *
74ec16ef847b [svn] - fix accidental removal of xmms_show_message
nenolod
parents: 2416
diff changeset
978 * Return value: A GTK widget handle for the message box.
74ec16ef847b [svn] - fix accidental removal of xmms_show_message
nenolod
parents: 2416
diff changeset
979 **/
74ec16ef847b [svn] - fix accidental removal of xmms_show_message
nenolod
parents: 2416
diff changeset
980 GtkWidget *
74ec16ef847b [svn] - fix accidental removal of xmms_show_message
nenolod
parents: 2416
diff changeset
981 xmms_show_message(const gchar * title, const gchar * text,
74ec16ef847b [svn] - fix accidental removal of xmms_show_message
nenolod
parents: 2416
diff changeset
982 const gchar * button_text, gboolean modal,
74ec16ef847b [svn] - fix accidental removal of xmms_show_message
nenolod
parents: 2416
diff changeset
983 GtkSignalFunc button_action, gpointer action_data)
74ec16ef847b [svn] - fix accidental removal of xmms_show_message
nenolod
parents: 2416
diff changeset
984 {
74ec16ef847b [svn] - fix accidental removal of xmms_show_message
nenolod
parents: 2416
diff changeset
985 GtkWidget *dialog;
74ec16ef847b [svn] - fix accidental removal of xmms_show_message
nenolod
parents: 2416
diff changeset
986 GtkWidget *dialog_vbox, *dialog_hbox, *dialog_bbox;
74ec16ef847b [svn] - fix accidental removal of xmms_show_message
nenolod
parents: 2416
diff changeset
987 GtkWidget *dialog_bbox_b1;
74ec16ef847b [svn] - fix accidental removal of xmms_show_message
nenolod
parents: 2416
diff changeset
988 GtkWidget *dialog_textlabel;
74ec16ef847b [svn] - fix accidental removal of xmms_show_message
nenolod
parents: 2416
diff changeset
989 GtkWidget *dialog_icon;
74ec16ef847b [svn] - fix accidental removal of xmms_show_message
nenolod
parents: 2416
diff changeset
990
74ec16ef847b [svn] - fix accidental removal of xmms_show_message
nenolod
parents: 2416
diff changeset
991 dialog = gtk_window_new(GTK_WINDOW_TOPLEVEL);
74ec16ef847b [svn] - fix accidental removal of xmms_show_message
nenolod
parents: 2416
diff changeset
992 gtk_window_set_type_hint( GTK_WINDOW(dialog) , GDK_WINDOW_TYPE_HINT_DIALOG );
74ec16ef847b [svn] - fix accidental removal of xmms_show_message
nenolod
parents: 2416
diff changeset
993 gtk_window_set_modal( GTK_WINDOW(dialog) , modal );
74ec16ef847b [svn] - fix accidental removal of xmms_show_message
nenolod
parents: 2416
diff changeset
994 gtk_window_set_title( GTK_WINDOW(dialog) , title );
74ec16ef847b [svn] - fix accidental removal of xmms_show_message
nenolod
parents: 2416
diff changeset
995 gtk_container_set_border_width( GTK_CONTAINER(dialog) , 10 );
74ec16ef847b [svn] - fix accidental removal of xmms_show_message
nenolod
parents: 2416
diff changeset
996
74ec16ef847b [svn] - fix accidental removal of xmms_show_message
nenolod
parents: 2416
diff changeset
997 dialog_vbox = gtk_vbox_new( FALSE , 0 );
74ec16ef847b [svn] - fix accidental removal of xmms_show_message
nenolod
parents: 2416
diff changeset
998 dialog_hbox = gtk_hbox_new( FALSE , 0 );
74ec16ef847b [svn] - fix accidental removal of xmms_show_message
nenolod
parents: 2416
diff changeset
999
74ec16ef847b [svn] - fix accidental removal of xmms_show_message
nenolod
parents: 2416
diff changeset
1000 /* icon */
74ec16ef847b [svn] - fix accidental removal of xmms_show_message
nenolod
parents: 2416
diff changeset
1001 dialog_icon = gtk_image_new_from_stock( GTK_STOCK_DIALOG_INFO , GTK_ICON_SIZE_DIALOG );
74ec16ef847b [svn] - fix accidental removal of xmms_show_message
nenolod
parents: 2416
diff changeset
1002 gtk_box_pack_start( GTK_BOX(dialog_hbox) , dialog_icon , FALSE , FALSE , 2 );
74ec16ef847b [svn] - fix accidental removal of xmms_show_message
nenolod
parents: 2416
diff changeset
1003
74ec16ef847b [svn] - fix accidental removal of xmms_show_message
nenolod
parents: 2416
diff changeset
1004 /* label */
74ec16ef847b [svn] - fix accidental removal of xmms_show_message
nenolod
parents: 2416
diff changeset
1005 dialog_textlabel = gtk_label_new( text );
74ec16ef847b [svn] - fix accidental removal of xmms_show_message
nenolod
parents: 2416
diff changeset
1006 /* gtk_label_set_selectable( GTK_LABEL(dialog_textlabel) , TRUE ); */
74ec16ef847b [svn] - fix accidental removal of xmms_show_message
nenolod
parents: 2416
diff changeset
1007 gtk_box_pack_start( GTK_BOX(dialog_hbox) , dialog_textlabel , TRUE , TRUE , 2 );
74ec16ef847b [svn] - fix accidental removal of xmms_show_message
nenolod
parents: 2416
diff changeset
1008
74ec16ef847b [svn] - fix accidental removal of xmms_show_message
nenolod
parents: 2416
diff changeset
1009 gtk_box_pack_start( GTK_BOX(dialog_vbox) , dialog_hbox , FALSE , FALSE , 2 );
74ec16ef847b [svn] - fix accidental removal of xmms_show_message
nenolod
parents: 2416
diff changeset
1010 gtk_box_pack_start( GTK_BOX(dialog_vbox) , gtk_hseparator_new() , FALSE , FALSE , 4 );
74ec16ef847b [svn] - fix accidental removal of xmms_show_message
nenolod
parents: 2416
diff changeset
1011
74ec16ef847b [svn] - fix accidental removal of xmms_show_message
nenolod
parents: 2416
diff changeset
1012 dialog_bbox = gtk_hbutton_box_new();
74ec16ef847b [svn] - fix accidental removal of xmms_show_message
nenolod
parents: 2416
diff changeset
1013 gtk_button_box_set_layout( GTK_BUTTON_BOX(dialog_bbox) , GTK_BUTTONBOX_END );
74ec16ef847b [svn] - fix accidental removal of xmms_show_message
nenolod
parents: 2416
diff changeset
1014 dialog_bbox_b1 = gtk_button_new_with_label( button_text );
74ec16ef847b [svn] - fix accidental removal of xmms_show_message
nenolod
parents: 2416
diff changeset
1015 g_signal_connect_swapped( G_OBJECT(dialog_bbox_b1) , "clicked" ,
74ec16ef847b [svn] - fix accidental removal of xmms_show_message
nenolod
parents: 2416
diff changeset
1016 G_CALLBACK(gtk_widget_destroy) , dialog );
74ec16ef847b [svn] - fix accidental removal of xmms_show_message
nenolod
parents: 2416
diff changeset
1017 if ( button_action )
74ec16ef847b [svn] - fix accidental removal of xmms_show_message
nenolod
parents: 2416
diff changeset
1018 g_signal_connect( G_OBJECT(dialog_bbox_b1) , "clicked" ,
74ec16ef847b [svn] - fix accidental removal of xmms_show_message
nenolod
parents: 2416
diff changeset
1019 button_action , action_data );
74ec16ef847b [svn] - fix accidental removal of xmms_show_message
nenolod
parents: 2416
diff changeset
1020 GTK_WIDGET_SET_FLAGS( dialog_bbox_b1 , GTK_CAN_DEFAULT);
74ec16ef847b [svn] - fix accidental removal of xmms_show_message
nenolod
parents: 2416
diff changeset
1021 gtk_widget_grab_default( dialog_bbox_b1 );
74ec16ef847b [svn] - fix accidental removal of xmms_show_message
nenolod
parents: 2416
diff changeset
1022
74ec16ef847b [svn] - fix accidental removal of xmms_show_message
nenolod
parents: 2416
diff changeset
1023 gtk_container_add( GTK_CONTAINER(dialog_bbox) , dialog_bbox_b1 );
74ec16ef847b [svn] - fix accidental removal of xmms_show_message
nenolod
parents: 2416
diff changeset
1024 gtk_box_pack_start( GTK_BOX(dialog_vbox) , dialog_bbox , FALSE , FALSE , 0 );
74ec16ef847b [svn] - fix accidental removal of xmms_show_message
nenolod
parents: 2416
diff changeset
1025
74ec16ef847b [svn] - fix accidental removal of xmms_show_message
nenolod
parents: 2416
diff changeset
1026 gtk_container_add( GTK_CONTAINER(dialog) , dialog_vbox );
74ec16ef847b [svn] - fix accidental removal of xmms_show_message
nenolod
parents: 2416
diff changeset
1027 gtk_widget_show_all(dialog);
74ec16ef847b [svn] - fix accidental removal of xmms_show_message
nenolod
parents: 2416
diff changeset
1028
74ec16ef847b [svn] - fix accidental removal of xmms_show_message
nenolod
parents: 2416
diff changeset
1029 return dialog;
74ec16ef847b [svn] - fix accidental removal of xmms_show_message
nenolod
parents: 2416
diff changeset
1030 }
74ec16ef847b [svn] - fix accidental removal of xmms_show_message
nenolod
parents: 2416
diff changeset
1031
74ec16ef847b [svn] - fix accidental removal of xmms_show_message
nenolod
parents: 2416
diff changeset
1032
74ec16ef847b [svn] - fix accidental removal of xmms_show_message
nenolod
parents: 2416
diff changeset
1033 /**
74ec16ef847b [svn] - fix accidental removal of xmms_show_message
nenolod
parents: 2416
diff changeset
1034 * audacious_get_localdir:
74ec16ef847b [svn] - fix accidental removal of xmms_show_message
nenolod
parents: 2416
diff changeset
1035 *
74ec16ef847b [svn] - fix accidental removal of xmms_show_message
nenolod
parents: 2416
diff changeset
1036 * Returns a string with the full path of Audacious local datadir (where config files are placed).
74ec16ef847b [svn] - fix accidental removal of xmms_show_message
nenolod
parents: 2416
diff changeset
1037 * It's useful in order to put in the right place custom config files for audacious plugins.
74ec16ef847b [svn] - fix accidental removal of xmms_show_message
nenolod
parents: 2416
diff changeset
1038 *
74ec16ef847b [svn] - fix accidental removal of xmms_show_message
nenolod
parents: 2416
diff changeset
1039 * Return value: a string with full path of Audacious local datadir (should be freed after use)
74ec16ef847b [svn] - fix accidental removal of xmms_show_message
nenolod
parents: 2416
diff changeset
1040 **/
74ec16ef847b [svn] - fix accidental removal of xmms_show_message
nenolod
parents: 2416
diff changeset
1041 gchar*
74ec16ef847b [svn] - fix accidental removal of xmms_show_message
nenolod
parents: 2416
diff changeset
1042 audacious_get_localdir(void)
74ec16ef847b [svn] - fix accidental removal of xmms_show_message
nenolod
parents: 2416
diff changeset
1043 {
74ec16ef847b [svn] - fix accidental removal of xmms_show_message
nenolod
parents: 2416
diff changeset
1044 gchar *datadir;
74ec16ef847b [svn] - fix accidental removal of xmms_show_message
nenolod
parents: 2416
diff changeset
1045 gchar *tmp;
74ec16ef847b [svn] - fix accidental removal of xmms_show_message
nenolod
parents: 2416
diff changeset
1046
74ec16ef847b [svn] - fix accidental removal of xmms_show_message
nenolod
parents: 2416
diff changeset
1047 if ( (tmp = getenv("XDG_CONFIG_HOME")) == NULL )
74ec16ef847b [svn] - fix accidental removal of xmms_show_message
nenolod
parents: 2416
diff changeset
1048 datadir = g_build_filename( g_get_home_dir() , ".config" , "audacious" , NULL );
74ec16ef847b [svn] - fix accidental removal of xmms_show_message
nenolod
parents: 2416
diff changeset
1049 else
74ec16ef847b [svn] - fix accidental removal of xmms_show_message
nenolod
parents: 2416
diff changeset
1050 datadir = g_build_filename( tmp , "audacious" , NULL );
74ec16ef847b [svn] - fix accidental removal of xmms_show_message
nenolod
parents: 2416
diff changeset
1051
74ec16ef847b [svn] - fix accidental removal of xmms_show_message
nenolod
parents: 2416
diff changeset
1052 return datadir;
74ec16ef847b [svn] - fix accidental removal of xmms_show_message
nenolod
parents: 2416
diff changeset
1053 }
74ec16ef847b [svn] - fix accidental removal of xmms_show_message
nenolod
parents: 2416
diff changeset
1054
74ec16ef847b [svn] - fix accidental removal of xmms_show_message
nenolod
parents: 2416
diff changeset
1055
74ec16ef847b [svn] - fix accidental removal of xmms_show_message
nenolod
parents: 2416
diff changeset
1056 /**
74ec16ef847b [svn] - fix accidental removal of xmms_show_message
nenolod
parents: 2416
diff changeset
1057 * xmms_check_realtime_priority:
74ec16ef847b [svn] - fix accidental removal of xmms_show_message
nenolod
parents: 2416
diff changeset
1058 *
74ec16ef847b [svn] - fix accidental removal of xmms_show_message
nenolod
parents: 2416
diff changeset
1059 * Legacy function included for compatibility with XMMS.
74ec16ef847b [svn] - fix accidental removal of xmms_show_message
nenolod
parents: 2416
diff changeset
1060 *
74ec16ef847b [svn] - fix accidental removal of xmms_show_message
nenolod
parents: 2416
diff changeset
1061 * Return value: FALSE
74ec16ef847b [svn] - fix accidental removal of xmms_show_message
nenolod
parents: 2416
diff changeset
1062 **/
74ec16ef847b [svn] - fix accidental removal of xmms_show_message
nenolod
parents: 2416
diff changeset
1063 gboolean
74ec16ef847b [svn] - fix accidental removal of xmms_show_message
nenolod
parents: 2416
diff changeset
1064 xmms_check_realtime_priority(void)
74ec16ef847b [svn] - fix accidental removal of xmms_show_message
nenolod
parents: 2416
diff changeset
1065 {
74ec16ef847b [svn] - fix accidental removal of xmms_show_message
nenolod
parents: 2416
diff changeset
1066 return FALSE;
74ec16ef847b [svn] - fix accidental removal of xmms_show_message
nenolod
parents: 2416
diff changeset
1067 }
74ec16ef847b [svn] - fix accidental removal of xmms_show_message
nenolod
parents: 2416
diff changeset
1068
74ec16ef847b [svn] - fix accidental removal of xmms_show_message
nenolod
parents: 2416
diff changeset
1069 /**
74ec16ef847b [svn] - fix accidental removal of xmms_show_message
nenolod
parents: 2416
diff changeset
1070 * xmms_usleep:
74ec16ef847b [svn] - fix accidental removal of xmms_show_message
nenolod
parents: 2416
diff changeset
1071 * @usec: The amount of microseconds to sleep.
74ec16ef847b [svn] - fix accidental removal of xmms_show_message
nenolod
parents: 2416
diff changeset
1072 *
74ec16ef847b [svn] - fix accidental removal of xmms_show_message
nenolod
parents: 2416
diff changeset
1073 * Legacy function included for compatibility with XMMS.
74ec16ef847b [svn] - fix accidental removal of xmms_show_message
nenolod
parents: 2416
diff changeset
1074 **/
74ec16ef847b [svn] - fix accidental removal of xmms_show_message
nenolod
parents: 2416
diff changeset
1075 void
74ec16ef847b [svn] - fix accidental removal of xmms_show_message
nenolod
parents: 2416
diff changeset
1076 xmms_usleep(gint usec)
74ec16ef847b [svn] - fix accidental removal of xmms_show_message
nenolod
parents: 2416
diff changeset
1077 {
74ec16ef847b [svn] - fix accidental removal of xmms_show_message
nenolod
parents: 2416
diff changeset
1078 g_usleep(usec);
74ec16ef847b [svn] - fix accidental removal of xmms_show_message
nenolod
parents: 2416
diff changeset
1079 }