Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Christoph Mende (angelos)" <angelos@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in media-sound/gimmix/files: gimmix-0.5.7.1-symbol-collision.patch
Date: Sat, 22 Mar 2014 19:19:30
Message-Id: 20140322191927.5F18720051@flycatcher.gentoo.org
1 angelos 14/03/22 19:19:27
2
3 Added: gimmix-0.5.7.1-symbol-collision.patch
4 Log:
5 Fix compilation
6
7 (Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 84F20B43)
8
9 Revision Changes Path
10 1.1 media-sound/gimmix/files/gimmix-0.5.7.1-symbol-collision.patch
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/gimmix/files/gimmix-0.5.7.1-symbol-collision.patch?rev=1.1&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/gimmix/files/gimmix-0.5.7.1-symbol-collision.patch?rev=1.1&content-type=text/plain
14
15 Index: gimmix-0.5.7.1-symbol-collision.patch
16 ===================================================================
17 diff --git a/src/gimmix-playlist.c b/src/gimmix-playlist.c
18 index cd63f58..661a47f 100644
19 --- a/src/gimmix-playlist.c
20 +++ b/src/gimmix-playlist.c
21 @@ -38,9 +38,9 @@ typedef enum {
22 } GimmixColumnType;
23
24 typedef enum {
25 - SONG = 1,
26 - DIR,
27 - PLAYLIST
28 + GFT_SONG = 1,
29 + GFT_DIR,
30 + GFT_PLAYLIST
31 } GimmixFileType;
32
33 enum { TARGET_STRING, TARGET_ROOTWIN };
34 @@ -149,7 +149,7 @@ on_drag_data_get (GtkWidget *widget, GdkDragContext *context, GtkSelectionData *
35 gtk_tree_model_get_iter (model, &iter, list->data);
36 gtk_tree_model_get (model, &iter, 2, &path, 3, &type, -1);
37
38 - if (type == DIR || type == SONG)
39 + if (type == GFT_DIR || type == GFT_SONG)
40 {
41 switch (target_type)
42 {
43 @@ -671,7 +671,7 @@ gimmix_library_and_playlists_populate (void)
44 GDK_TYPE_PIXBUF, /* icon (0) */
45 G_TYPE_STRING, /* name (1) */
46 G_TYPE_STRING, /* path (2) */
47 - G_TYPE_INT, /* type DIR/SONG (3) */
48 + G_TYPE_INT, /* type GFT_DIR/GFT_SONG (3) */
49 G_TYPE_INT); /* id (4) */
50
51 pls_store = gtk_list_store_new (2,
52 @@ -696,7 +696,7 @@ gimmix_library_and_playlists_populate (void)
53 0, dir_pixbuf,
54 1, path,
55 2, data->directory,
56 - 3, DIR,
57 + 3, GFT_DIR,
58 -1);
59 g_free (path);
60 }
61 @@ -722,7 +722,7 @@ gimmix_library_and_playlists_populate (void)
62 0, song_pixbuf,
63 1, title,
64 2, data->song->file,
65 - 3, SONG,
66 + 3, GFT_SONG,
67 -1);
68 g_free (title);
69 }
70 @@ -838,7 +838,7 @@ gimmix_library_search (gint type, gchar *text)
71 0, song_pixbuf,
72 1, title,
73 2, data->song->file,
74 - 3, SONG,
75 + 3, GFT_SONG,
76 -1);
77 g_free (title);
78 }
79 @@ -954,11 +954,11 @@ cb_library_dir_activated (gpointer data)
80 gtk_tree_model_get_iter (model, &iter, list->data);
81 gtk_tree_model_get (model, &iter, 2, &path, 3, &type, -1);
82
83 - if (type == DIR)
84 + if (type == GFT_DIR)
85 {
86 gimmix_update_library_with_dir (path);
87 }
88 - else if (type == SONG)
89 + else if (type == GFT_SONG)
90 {
91 mpd_playlist_add (gmo, path);
92 added = true;
93 @@ -1005,11 +1005,11 @@ cb_library_popup_add_clicked (GtkWidget *widget, gpointer data)
94 gtk_tree_model_get_iter (model, &iter, list->data);
95 gtk_tree_model_get (model, &iter, 2, &path, 3, &type, -1);
96
97 - if (type == DIR)
98 + if (type == GFT_DIR)
99 {
100 mpd_playlist_queue_add (gmo, path);
101 }
102 - else if (type == SONG)
103 + else if (type == GFT_SONG)
104 {
105 mpd_playlist_add (gmo, path);
106 }
107 @@ -1023,13 +1023,13 @@ cb_library_popup_add_clicked (GtkWidget *widget, gpointer data)
108 gtk_tree_model_get (model, &iter, 2, &path, 3, &type, -1);
109
110
111 - if (type == DIR)
112 + if (type == GFT_DIR)
113 {
114 mpd_playlist_queue_add (gmo, path);
115 g_free (path);
116 }
117
118 - if (type == SONG)
119 + if (type == GFT_SONG)
120 {
121 mpd_playlist_queue_add (gmo, path);
122 g_free (path);
123 @@ -1081,11 +1081,11 @@ cd_library_popup_replace_clicked (GtkWidget *widget, gpointer data)
124 gtk_tree_model_get_iter (model, &iter, list->data);
125 gtk_tree_model_get (model, &iter, 2, &path, 3, &type, -1);
126
127 - if (type == DIR)
128 + if (type == GFT_DIR)
129 {
130 mpd_playlist_queue_add (gmo, path);
131 }
132 - else if (type == SONG)
133 + else if (type == GFT_SONG)
134 {
135 mpd_playlist_add (gmo, path);
136 }
137 @@ -1099,13 +1099,13 @@ cd_library_popup_replace_clicked (GtkWidget *widget, gpointer data)
138 gtk_tree_model_get (model, &iter, 2, &path, 3, &type, -1);
139
140
141 - if (type == DIR)
142 + if (type == GFT_DIR)
143 {
144 mpd_playlist_queue_add (gmo, path);
145 g_free (path);
146 }
147
148 - if (type == SONG)
149 + if (type == GFT_SONG)
150 {
151 mpd_playlist_queue_add (gmo, path);
152 g_free (path);
153 @@ -1245,7 +1245,7 @@ gimmix_update_library_with_dir (gchar *dir)
154 0, dir_pixbuf,
155 1, "..",
156 2, parent,
157 - 3, DIR,
158 + 3, GFT_DIR,
159 -1);
160 g_free (parent);
161 }
162 @@ -1260,7 +1260,7 @@ gimmix_update_library_with_dir (gchar *dir)
163 0, dir_pixbuf,
164 1, directory,
165 2, data->directory,
166 - 3, DIR,
167 + 3, GFT_DIR,
168 -1);
169 g_free (directory);
170 }
171 @@ -1285,7 +1285,7 @@ gimmix_update_library_with_dir (gchar *dir)
172 0, song_pixbuf,
173 1, title,
174 2, data->song->file,
175 - 3, SONG,
176 + 3, GFT_SONG,
177 -1);
178 g_free (title);
179 }
180 @@ -1341,7 +1341,7 @@ gimmix_library_song_info (void)
181 gtk_tree_model_get_iter (model, &iter, list->data);
182 gtk_tree_model_get (model, &iter, 2, &path, 3, &type, 4, &id, -1);
183
184 - if (type == DIR)
185 + if (type == GFT_DIR)
186 {
187 g_free (path);
188 return;
Report Message
Find on MARC Find on Google Groups