← Back to branch summary

~ubuntu-branches/ubuntu/saucy/parole/saucy

« back to all changes in this revision

Viewing changes to debian/patches/02_fix-ftbfs-enable-debug.patch

  • Committer: Package Import Robot
  • Author(s): Lionel Le Folgoc
  • Date: 2012-08-16 17:46:42 UTC
  • mfrom: (1.1.3)
  • Revision ID: package-import@ubuntu.com-20120816174642-mfc9qz0gsvs7ggfa
Tags: 0.3.0.1-0ubuntu1
* New upstream bugfix release.
* debian/control:
  - drop b-deps on xfce4-dev-tools, libtool, gtk-doc-tools, unused.
* debian/rules:
  - drop xdt-autogen call.
 * debian/patches:
  - 01_fix-plugin-install-dir.patch, 02_fix-ftbfs-enable-debug.patch,
    03_fix-ftbfs-built-twice.patch: dropped, included upstream.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/02_fix-ftbfs-enable-debug.patch
1
 
From b68b07cb964ace117b34630712586bf92fe5e364 Mon Sep 17 00:00:00 2001
2
 
From: Sean Davis <smd.seandavis@gmail.com>
3
 
Date: Thu, 09 Aug 2012 18:22:47 +0000
4
 
Subject: Fixed debug compilition errors.
5
 
 
6
 
---
7
 
diff --git a/src/gst/parole-gst.c b/src/gst/parole-gst.c
8
 
index dcd4d63..ef1a3a8 100644
9
 
--- a/src/gst/parole-gst.c
10
 
+++ b/src/gst/parole-gst.c
11
 
@@ -43,6 +43,8 @@
12
 
 #include "common/parole-common.h"
13
 
 #include "common/parole-rc-utils.h"
14
 
 
15
 
+#include "parole-utils.h"
16
 
+
17
 
 #include "gst-enum-types.h"
18
 
 #include "gstmarshal.h"
19
 
 
20
 
@@ -252,10 +254,6 @@ parole_gst_realize (GtkWidget *widget)
21
 
 static void
22
 
 parole_gst_show (GtkWidget *widget)
23
 
 {
24
 
-    ParoleGst *gst;
25
 
-    
26
 
-    gst = PAROLE_GST (widget);
27
 
-    
28
 
     if ( widget->window )
29
 
        gdk_window_show (widget->window);
30
 
     
31
 
@@ -2313,14 +2311,13 @@ gst_set_current_subtitle_track( ParoleGst *gst, gint track_no )
32
 
 {
33
 
        
34
 
        gchar *uri, *sub;
35
 
+       gint flags;
36
 
        
37
 
        g_object_get (G_OBJECT (gst->priv->stream),
38
 
                  "uri", &uri,
39
 
                  NULL);
40
 
                  
41
 
        sub = (gchar*) parole_get_subtitle_path(uri);
42
 
-       
43
 
-       gint flags;
44
 
 
45
 
        g_object_get (gst->priv->playbin, "flags", &flags, NULL);
46
 
        
47
 
diff --git a/src/main.c b/src/main.c
48
 
index 22006d6..7f64524 100644
49
 
--- a/src/main.c
50
 
+++ b/src/main.c
51
 
@@ -48,6 +48,7 @@
52
 
 #include "parole-rc-utils.h"
53
 
 
54
 
 #include <X11/X.h>
55
 
+#include <X11/Xlib.h>
56
 
 
57
 
 static void G_GNUC_NORETURN
58
 
 show_version (void)
59
 
diff --git a/src/parole-disc.c b/src/parole-disc.c
60
 
index 150f76d..6827f02 100644
61
 
--- a/src/parole-disc.c
62
 
+++ b/src/parole-disc.c
63
 
@@ -249,6 +249,11 @@ parole_disc_check_cdrom (ParoleDisc *disc, GVolume *volume, const gchar *device)
64
 
 #if defined(__linux__)
65
 
     gint fd;
66
 
     gint drive;
67
 
+    
68
 
+    MountData *data;
69
 
+    
70
 
+       gchar *name;
71
 
+       gchar *label;
72
 
 
73
 
     TRACE ("device : %s", device);
74
 
     
75
 
@@ -272,11 +277,7 @@ parole_disc_check_cdrom (ParoleDisc *disc, GVolume *volume, const gchar *device)
76
 
            {
77
 
                if ( drive == CDS_AUDIO || drive == CDS_MIXED )
78
 
                {
79
 
-                   MountData *data;
80
 
                    data = parole_disc_get_mount_data (disc, "cdda://", device, PAROLE_DISC_CDDA);
81
 
-                   
82
 
-                   gchar *name;
83
 
-                       gchar *label;
84
 
        
85
 
                        name = g_volume_get_name (volume);
86
 
                        label = g_strdup_printf ("%s '%s'", _("Play Disc"), name);
87
 
diff --git a/src/parole-mediachooser.c b/src/parole-mediachooser.c
88
 
index c70fad0..b55b941 100644
89
 
--- a/src/parole-mediachooser.c
90
 
+++ b/src/parole-mediachooser.c
91
 
@@ -189,8 +189,6 @@ parole_media_chooser_open_internal (ParoleMediaChooser *media_chooser)
92
 
     GtkWidget       *file_chooser;
93
 
     GtkBuilder      *builder;
94
 
     GtkWidget       *recursive;
95
 
-    GtkWidget       *replace;
96
 
-    GtkWidget       *play_opened;
97
 
     GtkFileFilter   *filter, *all_files;
98
 
     gboolean        scan_recursive;
99
 
     gboolean        replace_playlist;
100
 
@@ -231,8 +229,6 @@ parole_media_chooser_open_internal (ParoleMediaChooser *media_chooser)
101
 
                  NULL);
102
 
     
103
 
     recursive = GTK_WIDGET (gtk_builder_get_object (builder, "recursive"));
104
 
-    replace = GTK_WIDGET (gtk_builder_get_object (builder, "replace"));
105
 
-    play_opened = GTK_WIDGET (gtk_builder_get_object (builder, "play-added-files"));
106
 
     
107
 
     g_object_set_data (G_OBJECT (media_chooser), "file-chooser", file_chooser);
108
 
     g_object_set_data (G_OBJECT (media_chooser), "recursive", recursive);
109
 
diff --git a/src/parole-medialist.c b/src/parole-medialist.c
110
 
index 95ec2ba..f90a350 100644
111
 
--- a/src/parole-medialist.c
112
 
+++ b/src/parole-medialist.c
113
 
@@ -145,6 +145,9 @@ void                parole_media_list_close_save_dialog_cb (GtkButton *button,
114
 
                                                    
115
 
 void           parole_media_list_save_playlist_cb     (GtkButton *button,
116
 
                                                        ParolePlaylistSave *data);
117
 
+                                                       
118
 
+void           parole_media_list_save_cb (GtkButton *button, 
119
 
+                                                               ParoleMediaList *list);
120
 
 
121
 
 gboolean       parole_media_list_query_tooltip         (GtkWidget *widget,
122
 
                                                         gint x,
123
 
@@ -153,6 +156,9 @@ gboolean    parole_media_list_query_tooltip         (GtkWidget *widget,
124
 
                                                         GtkTooltip *tooltip,
125
 
                                                         ParoleMediaList *list);
126
 
                                                         
127
 
+void           parole_media_list_menu_pos (GtkMenu *menu, 
128
 
+                                                       gint *px, gint *py, gpointer data);
129
 
+                                                        
130
 
 /*
131
 
  * End of GtkBuilder callbacks
132
 
  */
133
 
@@ -866,159 +872,6 @@ parole_media_list_remove_clicked_cb (GtkButton *button, ParoleMediaList *list)
134
 
 }
135
 
 
136
 
 /**
137
 
- * parole_media_list_move_on_down:
138
 
- * 
139
 
- * @store: a #GtkListStore
140
 
- * @iter: a #GtkTreeIter
141
 
- * 
142
 
- * Move the node pointed to by @iter one step down, if the node is the last
143
 
- * one then move it to the first position in the @store.
144
 
- * 
145
 
- **/
146
 
-static void
147
 
-parole_media_list_move_one_down (GtkListStore *store, GtkTreeIter *iter)
148
 
-{
149
 
-    GtkTreeIter *pos_iter;
150
 
-    
151
 
-    /* Save the selected iter to the selected row */
152
 
-    pos_iter = gtk_tree_iter_copy (iter);
153
 
-
154
 
-    /* We are on the last node in the list!*/
155
 
-    if ( !gtk_tree_model_iter_next (GTK_TREE_MODEL (store), iter) )
156
 
-    {
157
 
-       /* Return false if tree is empty*/
158
 
-       if (gtk_tree_model_get_iter_first (GTK_TREE_MODEL (store), iter))
159
 
-       {
160
 
-           gtk_list_store_move_before (GTK_LIST_STORE (store), pos_iter, iter);
161
 
-       }
162
 
-    }
163
 
-    else
164
 
-    {
165
 
-       gtk_list_store_move_after (GTK_LIST_STORE (store), pos_iter, iter);
166
 
-    }
167
 
-    
168
 
-    gtk_tree_iter_free (pos_iter);
169
 
-}
170
 
-
171
 
-/**
172
 
- * parole_media_list_move_many_down:
173
 
- * @path_list: a #GList contains list of #GtkTreePath
174
 
- * @model: a #GtkTreeModel
175
 
- * 
176
 
- * Moves down many nodes pointed to by the paths that are in
177
 
- * the list.
178
 
- * 
179
 
- **/
180
 
-static void
181
 
-parole_media_list_move_many_down (GList *path_list, GtkTreeModel *model)
182
 
-{
183
 
-    GList *row_list = NULL;
184
 
-    GtkTreeIter iter;
185
 
-    guint len;
186
 
-    guint i;
187
 
-    
188
 
-    row_list = parole_media_list_paths_to_row_list (path_list, model);
189
 
-    
190
 
-    len = g_list_length (row_list);
191
 
-    
192
 
-    for ( i = 0; i < len; i++)
193
 
-    {
194
 
-       GtkTreeRowReference *row;
195
 
-       GtkTreePath *path;
196
 
-       
197
 
-       row = g_list_nth_data (row_list, i);
198
 
-       
199
 
-       path = gtk_tree_row_reference_get_path (row);
200
 
-       
201
 
-       if ( G_LIKELY (gtk_tree_model_get_iter (model, &iter, path) ) )
202
 
-       {
203
 
-           parole_media_list_move_one_down (GTK_LIST_STORE (model), &iter);
204
 
-       }
205
 
-    }
206
 
-    
207
 
-    g_list_foreach (row_list, (GFunc) gtk_tree_row_reference_free, NULL);
208
 
-    g_list_free (row_list);
209
 
-}
210
 
-
211
 
-/**
212
 
- * parole_media_list_move_on_up:
213
 
- * 
214
 
- * @store: a #GtkListStore
215
 
- * @iter: a #GtkTreeIter
216
 
- * 
217
 
- * Move the node pointed to by @iter one step up, if the node is the first
218
 
- * one then move it to the last position in the @store.
219
 
- * 
220
 
- **/
221
 
-static void
222
 
-parole_media_list_move_one_up (GtkListStore *store, GtkTreeIter *iter)
223
 
-{
224
 
-    GtkTreePath *path;
225
 
-    GtkTreeIter *pos_iter;
226
 
-    
227
 
-    /* Save the selected iter to the selected row */
228
 
-    pos_iter = gtk_tree_iter_copy (iter);
229
 
-    
230
 
-    path = gtk_tree_model_get_path (GTK_TREE_MODEL (store), iter);
231
 
-    
232
 
-    /* We are on the top of the list */
233
 
-    if ( !gtk_tree_path_prev (path) )
234
 
-    {
235
 
-       /* Passing NULL as the last argument will cause this call to move 
236
 
-        * the iter to the end of the list, Gtk API doc*/
237
 
-       gtk_list_store_move_before (GTK_LIST_STORE (store), iter, NULL);
238
 
-    }
239
 
-    else
240
 
-    {
241
 
-       if (gtk_tree_model_get_iter (GTK_TREE_MODEL (store), iter, path))
242
 
-           gtk_list_store_move_before (GTK_LIST_STORE (store), pos_iter, iter);
243
 
-    }
244
 
-    
245
 
-    gtk_tree_path_free (path);
246
 
-    gtk_tree_iter_free (pos_iter);
247
 
-}
248
 
-
249
 
-/**
250
 
- * parole_media_list_move_many_up:
251
 
- * @path_list: a #GList contains list of #GtkTreePath
252
 
- * @model: a #GtkTreeModel
253
 
- * 
254
 
- * Moves up many nodes pointed to by the paths that are in
255
 
- * the list.
256
 
- * 
257
 
- **/
258
 
-static void
259
 
-parole_media_list_move_many_up (GList *path_list, GtkTreeModel *model)
260
 
-{
261
 
-    GList *row_list = NULL;
262
 
-    GtkTreeIter iter;
263
 
-    guint len;
264
 
-    guint i;
265
 
-    
266
 
-    row_list = parole_media_list_paths_to_row_list (path_list, model);
267
 
-    
268
 
-    len = g_list_length (row_list);
269
 
-    
270
 
-    for ( i = 0; i < len; i++)
271
 
-    {
272
 
-       GtkTreeRowReference *row;
273
 
-       GtkTreePath *path;
274
 
-       
275
 
-       row = g_list_nth_data (row_list, i);
276
 
-       
277
 
-       path = gtk_tree_row_reference_get_path (row);
278
 
-       
279
 
-       if ( G_LIKELY (gtk_tree_model_get_iter (model, &iter, path) ) )
280
 
-       {
281
 
-           parole_media_list_move_one_up (GTK_LIST_STORE (model), &iter);
282
 
-       }
283
 
-    }
284
 
-    
285
 
-    g_list_foreach (row_list, (GFunc) gtk_tree_row_reference_free, NULL);
286
 
-    g_list_free (row_list);
287
 
-}
288
 
-
289
 
-/**
290
 
  * parole_media_list_row_activated_cb:
291
 
  * 
292
 
  * 
293
 
@@ -1027,11 +880,8 @@ void
294
 
 parole_media_list_row_activated_cb (GtkTreeView *view, GtkTreePath *path, 
295
 
                                    GtkTreeViewColumn *col, ParoleMediaList *list)
296
 
 {
297
 
-    GtkTreeModel *model;
298
 
     GtkTreeRowReference *row;
299
 
     
300
 
-    model = gtk_tree_view_get_model (GTK_TREE_VIEW (list->priv->view));
301
 
-
302
 
     row = gtk_tree_row_reference_new (gtk_tree_view_get_model (GTK_TREE_VIEW (list->priv->view)), 
303
 
                                      path);
304
 
                                      
305
 
@@ -1181,12 +1031,12 @@ parole_media_list_menu_pos (GtkMenu *menu, gint *px, gint *py, gpointer data)
306
 
        gint x, y;
307
 
        GtkAllocation widget_allocation, menu_allocation;
308
 
        GtkWidget *widget = gtk_menu_get_attach_widget( menu );
309
 
+       GdkWindow *window;
310
 
        
311
 
        gtk_widget_get_allocation( widget, &widget_allocation );
312
 
        gtk_widget_get_allocation( GTK_WIDGET(menu), &menu_allocation );
313
 
        
314
 
-       //g_print("h = %i", requisition.height);
315
 
-       GdkWindow *window = gtk_widget_get_window( widget );
316
 
+       window = gtk_widget_get_window( widget );
317
 
        gdk_window_get_position( window, &x, &y );
318
 
        
319
 
        px += x + widget_allocation.x - menu_allocation.width + widget_allocation.width;
320
 
@@ -1224,22 +1074,25 @@ static void
321
 
 parole_media_list_show_button_menu (GtkToggleButton *button, ParoleMediaList *list)
322
 
 {
323
 
        gboolean toggled = gtk_toggle_button_get_active( button );
324
 
+       gboolean val;
325
 
+       GtkBuilder *builder;
326
 
+       GtkMenu *menu;
327
 
+       GtkMenuItem *clear;
328
 
+       GtkCheckMenuItem *repeat_menu, *shuffle_menu, *replace, *play_opened;
329
 
+       GtkCheckMenuItem *remember;
330
 
+       
331
 
        if (!toggled)
332
 
        return;
333
 
-
334
 
-       gboolean val;
335
 
-    
336
 
-    GtkBuilder *builder;
337
 
     
338
 
     builder = parole_builder_new_from_string (playlist_ui, playlist_ui_length);
339
 
     
340
 
-    GtkMenu *menu = GTK_MENU (gtk_builder_get_object (builder, "playlist-menu"));
341
 
-    GtkCheckMenuItem *repeat_menu = GTK_CHECK_MENU_ITEM (gtk_builder_get_object (builder, "menu-repeat"));
342
 
-    GtkCheckMenuItem *shuffle_menu = GTK_CHECK_MENU_ITEM (gtk_builder_get_object (builder, "menu-shuffle"));
343
 
-    GtkCheckMenuItem *replace = GTK_CHECK_MENU_ITEM (gtk_builder_get_object (builder, "menu-replace"));
344
 
-    GtkCheckMenuItem *play_opened = GTK_CHECK_MENU_ITEM (gtk_builder_get_object (builder, "menu-play-opened"));
345
 
-    GtkCheckMenuItem *remember = GTK_CHECK_MENU_ITEM (gtk_builder_get_object (builder, "menu-remember"));
346
 
-    GtkMenuItem *clear = GTK_MENU_ITEM (gtk_builder_get_object (builder, "menu-clear"));
347
 
+    menu = GTK_MENU (gtk_builder_get_object (builder, "playlist-menu"));
348
 
+    repeat_menu = GTK_CHECK_MENU_ITEM (gtk_builder_get_object (builder, "menu-repeat"));
349
 
+    shuffle_menu = GTK_CHECK_MENU_ITEM (gtk_builder_get_object (builder, "menu-shuffle"));
350
 
+    replace = GTK_CHECK_MENU_ITEM (gtk_builder_get_object (builder, "menu-replace"));
351
 
+    play_opened = GTK_CHECK_MENU_ITEM (gtk_builder_get_object (builder, "menu-play-opened"));
352
 
+    remember = GTK_CHECK_MENU_ITEM (gtk_builder_get_object (builder, "menu-remember"));
353
 
+    clear = GTK_MENU_ITEM (gtk_builder_get_object (builder, "menu-clear"));
354
 
     
355
 
     gtk_menu_attach_to_widget( GTK_MENU(menu), list->priv->settings_button, (GtkMenuDetachFunc) menu_detach );
356
 
 
357
 
@@ -1304,15 +1157,20 @@ parole_media_list_show_menu (ParoleMediaList *list, GdkEventButton *ev)
358
 
     
359
 
     GtkBuilder *builder;
360
 
     
361
 
+    GtkMenu *menu;
362
 
+       GtkMenuItem *clear;
363
 
+       GtkCheckMenuItem *repeat_menu, *shuffle_menu, *replace, *play_opened;
364
 
+       GtkCheckMenuItem *remember;
365
 
+    
366
 
     builder = parole_builder_new_from_string (playlist_ui, playlist_ui_length);
367
 
     
368
 
-    GtkMenu *menu = GTK_MENU (gtk_builder_get_object (builder, "playlist-menu"));
369
 
-    GtkCheckMenuItem *repeat_menu = GTK_CHECK_MENU_ITEM (gtk_builder_get_object (builder, "menu-repeat"));
370
 
-    GtkCheckMenuItem *shuffle_menu = GTK_CHECK_MENU_ITEM (gtk_builder_get_object (builder, "menu-shuffle"));
371
 
-    GtkCheckMenuItem *replace = GTK_CHECK_MENU_ITEM (gtk_builder_get_object (builder, "menu-replace"));
372
 
-    GtkCheckMenuItem *play_opened = GTK_CHECK_MENU_ITEM (gtk_builder_get_object (builder, "menu-play-opened"));
373
 
-    GtkCheckMenuItem *remember = GTK_CHECK_MENU_ITEM (gtk_builder_get_object (builder, "menu-remember"));
374
 
-    GtkMenuItem *clear = GTK_MENU_ITEM (gtk_builder_get_object (builder, "menu-clear"));
375
 
+    menu = GTK_MENU (gtk_builder_get_object (builder, "playlist-menu"));
376
 
+    repeat_menu = GTK_CHECK_MENU_ITEM (gtk_builder_get_object (builder, "menu-repeat"));
377
 
+    shuffle_menu = GTK_CHECK_MENU_ITEM (gtk_builder_get_object (builder, "menu-shuffle"));
378
 
+    replace = GTK_CHECK_MENU_ITEM (gtk_builder_get_object (builder, "menu-replace"));
379
 
+    play_opened = GTK_CHECK_MENU_ITEM (gtk_builder_get_object (builder, "menu-play-opened"));
380
 
+    remember = GTK_CHECK_MENU_ITEM (gtk_builder_get_object (builder, "menu-remember"));
381
 
+    clear = GTK_MENU_ITEM (gtk_builder_get_object (builder, "menu-clear"));
382
 
     
383
 
     parole_media_list_add_open_containing_folder (list, GTK_WIDGET(menu), (gint)ev->x, (gint)ev->y);
384
 
 
385
 
diff --git a/src/parole-open-location.c b/src/parole-open-location.c
386
 
index 8fdcab4..c314046 100644
387
 
--- a/src/parole-open-location.c
388
 
+++ b/src/parole-open-location.c
389
 
@@ -155,10 +155,6 @@ parole_open_location_init (ParoleOpenLocation *self)
390
 
 static void
391
 
 parole_open_location_finalize (GObject *object)
392
 
 {
393
 
-    ParoleOpenLocation *self;
394
 
-
395
 
-    self = PAROLE_OPEN_LOCATION (object);
396
 
-
397
 
     G_OBJECT_CLASS (parole_open_location_parent_class)->finalize (object);
398
 
 }
399
 
 
400
 
diff --git a/src/parole-player.c b/src/parole-player.c
401
 
index e3c0954..7f9aebf 100644
402
 
--- a/src/parole-player.c
403
 
+++ b/src/parole-player.c
404
 
@@ -228,10 +228,28 @@ void              ratio_16_9_toggled_cb                   (GtkWidget *widget,
405
 
 
406
 
 void           ratio_20_9_toggled_cb                   (GtkWidget *widget,
407
 
                                                         ParolePlayer *player);
408
 
+                                                        
409
 
+void           parole_player_set_playlist_visible (ParolePlayer *player, 
410
 
+                                                        gboolean visibility);
411
 
+                                                        
412
 
+gboolean       parole_player_gst_widget_button_press (GtkWidget *widget, 
413
 
+                                                        GdkEventButton *ev, ParolePlayer *player);
414
 
 
415
 
 void           parole_show_about                       (GtkWidget *widget,
416
 
                                                        ParolePlayer *player);
417
 
                                                        
418
 
+void           parole_player_set_audiotrack_radio_menu_item_selected(
419
 
+                                                       ParolePlayer *player, gint audio_index);
420
 
+                                                       
421
 
+void           parole_player_set_subtitle_radio_menu_item_selected(
422
 
+                                                       ParolePlayer *player, gint sub_index);
423
 
+                                                       
424
 
+void           parole_player_combo_box_audiotrack_changed_cb(GtkWidget *widget, 
425
 
+                                                       ParolePlayer *player);
426
 
+                                                       
427
 
+void           parole_player_combo_box_subtitles_changed_cb(GtkWidget *widget, 
428
 
+                                                       ParolePlayer *player);
429
 
+                                                       
430
 
 static void parole_player_audiotrack_radio_menu_item_changed_cb(GtkWidget *widget, ParolePlayer *player);
431
 
 
432
 
 static void parole_player_subtitles_radio_menu_item_changed_cb(GtkWidget *widget, ParolePlayer *player);
433
 
@@ -563,20 +581,20 @@ parole_sublang_equal_lists (GList *orig, GList *new)
434
 
 static void
435
 
 parole_player_clear_subtitles (ParolePlayer *player)
436
 
 {
437
 
+       GtkTreeIter iter;
438
 
+       GList *menu_items, *menu_iter;
439
 
+       gint counter = 0;
440
 
+       
441
 
        /* Clear the InfoBar Combobox */
442
 
        gtk_list_store_clear(player->priv->liststore_subtitles);
443
 
-       GtkTreeIter iter;
444
 
        gtk_list_store_append(GTK_LIST_STORE(player->priv->liststore_subtitles), &iter);
445
 
        gtk_list_store_set(GTK_LIST_STORE(player->priv->liststore_subtitles), &iter, 0, "None", -1);
446
 
        gtk_combo_box_set_active( GTK_COMBO_BOX(player->priv->combobox_subtitles), 0 );
447
 
        
448
 
        /* Clear the subtitle menu options */
449
 
-       GList *menu_items, *menu_iter;
450
 
        menu_items = gtk_container_get_children( GTK_CONTAINER (player->priv->subtitles_menu) );
451
 
-       
452
 
        gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(player->priv->subtitles_group), TRUE);
453
 
        
454
 
-       gint counter = 0;
455
 
        for (menu_iter = menu_items; menu_iter != NULL; menu_iter = g_list_next(menu_iter))
456
 
        {
457
 
                if (counter >= 4)
458
 
@@ -589,28 +607,25 @@ parole_player_clear_subtitles (ParolePlayer *player)
459
 
 static void
460
 
 parole_player_set_subtitles_list (ParolePlayer *player, GList *subtitle_list)
461
 
 {
462
 
-       parole_player_clear_subtitles( player );
463
 
-       
464
 
        GList *l;
465
 
        gchar* language;
466
 
-
467
 
-       guint64 index;
468
 
-       
469
 
-       player->priv->subtitle_list = subtitle_list;
470
 
        
471
 
        GtkTreeIter iter;
472
 
-       
473
 
        gint counter = 0;
474
 
        
475
 
+       GtkWidget *menu_item;
476
 
+
477
 
+       parole_player_clear_subtitles( player );
478
 
+
479
 
+       player->priv->subtitle_list = subtitle_list;
480
 
+
481
 
        for (l = subtitle_list; l != NULL; l = l->next)
482
 
        {
483
 
                language = g_strdup (l->data);
484
 
-       
485
 
-               GtkTreeIter iter;
486
 
+
487
 
                gtk_list_store_append(GTK_LIST_STORE(player->priv->liststore_subtitles), &iter);
488
 
                gtk_list_store_set(GTK_LIST_STORE(player->priv->liststore_subtitles), &iter, 0, language, -1);
489
 
-    
490
 
-       GtkWidget *menu_item;
491
 
+
492
 
                menu_item = gtk_radio_menu_item_new_with_label_from_widget (GTK_RADIO_MENU_ITEM(player->priv->subtitles_group), language);
493
 
                gtk_widget_show (menu_item);
494
 
                
495
 
@@ -631,18 +646,21 @@ parole_player_set_subtitles_list (ParolePlayer *player, GList *subtitle_list)
496
 
 static void
497
 
 parole_player_clear_audio_tracks (ParolePlayer *player)
498
 
 {
499
 
+       GList *menu_items, *menu_iter;
500
 
+       GtkWidget *empty_item;
501
 
+
502
 
        gtk_list_store_clear(player->priv->liststore_audiotrack);
503
 
        player->priv->audio_group = NULL;
504
 
        
505
 
        /* Clear the subtitle menu options */
506
 
-       GList *menu_items, *menu_iter;
507
 
+       
508
 
        menu_items = gtk_container_get_children( GTK_CONTAINER (player->priv->languages_menu) );
509
 
        
510
 
        for (menu_iter = menu_items; menu_iter != NULL; menu_iter = g_list_next(menu_iter))
511
 
        gtk_widget_destroy(GTK_WIDGET(menu_iter->data));
512
 
        g_list_free(menu_items);
513
 
        
514
 
-       GtkWidget *empty_item = gtk_menu_item_new_with_label(_("Empty"));
515
 
+       empty_item = gtk_menu_item_new_with_label(_("Empty"));
516
 
        gtk_widget_set_sensitive( empty_item, FALSE );
517
 
        gtk_widget_show( empty_item );
518
 
        
519
 
@@ -652,24 +670,27 @@ parole_player_clear_audio_tracks (ParolePlayer *player)
520
 
 static void
521
 
 parole_player_set_audio_list (ParolePlayer *player, GList *audio_list)
522
 
 {
523
 
-       parole_player_clear_audio_tracks( player );
524
 
-       
525
 
        GList *menu_iter;
526
 
+       GList *l;
527
 
+       gchar* language;
528
 
+       
529
 
+       GtkTreeIter iter;
530
 
+       
531
 
+       GtkWidget *menu_item;
532
 
+       
533
 
+       parole_player_clear_audio_tracks( player );
534
 
+
535
 
        menu_iter = gtk_container_get_children( GTK_CONTAINER (player->priv->languages_menu) );
536
 
        
537
 
        gtk_widget_destroy(GTK_WIDGET(menu_iter->data));
538
 
        g_list_free(menu_iter);
539
 
        
540
 
-       GList *l;
541
 
-       gchar* language;
542
 
-       
543
 
        player->priv->audio_list = audio_list;
544
 
        
545
 
        for (l = audio_list; l != NULL; l = l->next)
546
 
        {
547
 
                language = g_strdup (l->data);
548
 
        
549
 
-               GtkTreeIter iter;
550
 
                gtk_list_store_append(GTK_LIST_STORE(player->priv->liststore_audiotrack), &iter);
551
 
                gtk_list_store_set(GTK_LIST_STORE(player->priv->liststore_audiotrack), &iter, 0, language, -1);
552
 
                
553
 
@@ -683,7 +704,7 @@ parole_player_set_audio_list (ParolePlayer *player, GList *audio_list)
554
 
                        g_signal_connect (player->priv->audio_group, "activate",
555
 
                      G_CALLBACK (parole_player_audiotrack_radio_menu_item_changed_cb), player);
556
 
                } else {
557
 
-                       GtkWidget *menu_item;
558
 
+                       
559
 
                        menu_item = gtk_radio_menu_item_new_with_label_from_widget (GTK_RADIO_MENU_ITEM(player->priv->audio_group), language);
560
 
                        gtk_widget_show (menu_item);
561
 
                        gtk_menu_shell_append (GTK_MENU_SHELL (player->priv->languages_menu), menu_item);
562
 
@@ -728,17 +749,17 @@ parole_player_update_subtitles (ParolePlayer *player, ParoleGst *gst)
563
 
 {
564
 
        GList * list = gst_get_lang_list_for_type (gst, "TEXT");
565
 
        
566
 
-       guint64 index;
567
 
-       index = 0;
568
 
-       
569
 
+       guint64 sub_index;
570
 
        gboolean sub_enabled;
571
 
        
572
 
+       sub_index = 0;
573
 
+       
574
 
        g_object_get (G_OBJECT (player->priv->conf),
575
 
                  "enable-subtitle", &sub_enabled,
576
 
                  NULL);
577
 
                  
578
 
        if (sub_enabled)
579
 
-       index = 1;
580
 
+       sub_index = 1;
581
 
        
582
 
        if (parole_sublang_equal_lists (player->priv->subtitle_list, list) == TRUE)
583
 
        {
584
 
@@ -751,7 +772,7 @@ parole_player_update_subtitles (ParolePlayer *player, ParoleGst *gst)
585
 
        
586
 
        parole_player_set_subtitles_list (player, list);
587
 
        
588
 
-       gtk_combo_box_set_active( GTK_COMBO_BOX(player->priv->combobox_subtitles), index );
589
 
+       gtk_combo_box_set_active( GTK_COMBO_BOX(player->priv->combobox_subtitles), sub_index );
590
 
        
591
 
        if (g_list_length (list) != 1) {
592
 
        gtk_widget_show(player->priv->infobar);
593
 
@@ -877,6 +898,7 @@ parole_player_media_list_repeat_toggled_cb (ParoleMediaList *list, gboolean repe
594
 
 static void
595
 
 parole_player_media_progressed_cb (ParoleGst *gst, const ParoleStream *stream, gint64 value, ParolePlayer *player)
596
 
 {
597
 
+       gchar pos_text[128];
598
 
 #ifdef DEBUG
599
 
     g_return_if_fail (value > 0);
600
 
 #endif
601
 
@@ -884,7 +906,6 @@ parole_player_media_progressed_cb (ParoleGst *gst, const ParoleStream *stream, g
602
 
     if ( !player->priv->user_seeking && player->priv->state == PAROLE_STATE_PLAYING )
603
 
     {
604
 
        parole_player_change_range_value (player, value);
605
 
-    gchar pos_text[128];
606
 
     get_time_string (pos_text, value);
607
 
     gtk_label_set_text (GTK_LABEL (player->priv->label_elapsed), pos_text);
608
 
     }
609
 
@@ -1105,6 +1126,9 @@ parole_player_play_selected_row (ParolePlayer *player)
610
 
 static void
611
 
 parole_player_play_next (ParolePlayer *player, gboolean allow_shuffle)
612
 
 {
613
 
+       gboolean repeat, shuffle;
614
 
+    GtkTreeRowReference *row;
615
 
+
616
 
        if ( player->priv->current_media_type == PAROLE_MEDIA_TYPE_DVD ||
617
 
         player->priv->current_media_type == PAROLE_MEDIA_TYPE_CDDA )
618
 
     {
619
 
@@ -1114,9 +1138,6 @@ parole_player_play_next (ParolePlayer *player, gboolean allow_shuffle)
620
 
                parole_gst_next_cdda_track (PAROLE_GST(player->priv->gst));
621
 
                return;
622
 
     }
623
 
-    gboolean repeat, shuffle;
624
 
-    
625
 
-    GtkTreeRowReference *row;
626
 
     
627
 
     g_object_get (G_OBJECT (player->priv->conf),
628
 
                  "shuffle", &shuffle,
629
 
@@ -1151,6 +1172,8 @@ parole_player_play_next (ParolePlayer *player, gboolean allow_shuffle)
630
 
 static void
631
 
 parole_player_play_prev (ParolePlayer *player)
632
 
 {
633
 
+       GtkTreeRowReference *row;
634
 
+
635
 
        if ( player->priv->current_media_type == PAROLE_MEDIA_TYPE_DVD ||
636
 
         player->priv->current_media_type == PAROLE_MEDIA_TYPE_CDDA )
637
 
     {
638
 
@@ -1160,7 +1183,6 @@ parole_player_play_prev (ParolePlayer *player)
639
 
                parole_gst_prev_cdda_track (PAROLE_GST(player->priv->gst));
640
 
                return;
641
 
     }
642
 
-    GtkTreeRowReference *row;
643
 
     
644
 
     if ( player->priv->row )
645
 
     {
646
 
@@ -1415,6 +1437,8 @@ parole_player_media_tag_cb (ParoleGst *gst, const ParoleStream *stream, ParolePl
647
 
 static void
648
 
 parole_player_buffering_cb (ParoleGst *gst, const ParoleStream *stream, gint percentage, ParolePlayer *player)
649
 
 {
650
 
+       gchar *buff;
651
 
+
652
 
     if ( percentage == 100 )
653
 
     {
654
 
        player->priv->buffering = FALSE;
655
 
@@ -1430,8 +1454,6 @@ parole_player_buffering_cb (ParoleGst *gst, const ParoleStream *stream, gint per
656
 
        if ( player->priv->state == PAROLE_STATE_PLAYING )
657
 
            parole_gst_pause (PAROLE_GST (player->priv->gst));
658
 
            
659
 
-    gchar *buff;
660
 
-    
661
 
     buff = g_strdup_printf ("%s (%d%%)", _("Buffering"), percentage);
662
 
     
663
 
     gtk_progress_bar_set_text (GTK_PROGRESS_BAR (player->priv->progressbar_buffering), buff);
664
 
@@ -1491,6 +1513,8 @@ parole_player_full_screen (ParolePlayer *player, gboolean fullscreen)
665
 
     static gint current_page = 0;
666
 
     GdkWindow *gdkwindow;
667
 
     
668
 
+    gboolean show_playlist;
669
 
+    
670
 
     if ( player->priv->full_screen == fullscreen )
671
 
        return;
672
 
     
673
 
@@ -1502,7 +1526,7 @@ parole_player_full_screen (ParolePlayer *player, gboolean fullscreen)
674
 
        gtk_widget_hide (player->priv->fs_window);
675
 
        gtk_widget_show (player->priv->play_box);
676
 
        gtk_widget_show (player->priv->menu_bar);
677
 
-       gboolean show_playlist = gtk_check_menu_item_get_active( GTK_CHECK_MENU_ITEM(player->priv->show_hide_playlist) );
678
 
+       show_playlist = gtk_check_menu_item_get_active( GTK_CHECK_MENU_ITEM(player->priv->show_hide_playlist) );
679
 
     gtk_widget_show (player->priv->playlist_nt);
680
 
        parole_player_set_playlist_visible(player, show_playlist);
681
 
        gtk_widget_show (player->priv->go_fs);
682
 
@@ -1557,7 +1581,7 @@ void parole_player_leave_fs_cb (GtkButton *button, ParolePlayer *player)
683
 
 static void
684
 
 parole_player_show_menu (ParolePlayer *player, guint button, guint activate_time)
685
 
 {
686
 
-    GtkWidget *menu, *mi, *img;
687
 
+    GtkWidget *menu, *mi;
688
 
     gboolean sensitive;
689
 
     
690
 
     player->priv->current_media_type = parole_gst_get_current_stream_type (PAROLE_GST (player->priv->gst));
691
 
@@ -2279,6 +2303,7 @@ parole_player_set_wm_opacity_hint (GtkWidget *widget)
692
 
                     1);
693
 
 }
694
 
 
695
 
+static void
696
 
 parole_player_setup_multimedia_keys (ParolePlayer *player)
697
 
 {
698
 
     #ifdef HAVE_XF86_KEYSYM
699
 
@@ -2307,6 +2332,11 @@ parole_player_init (ParolePlayer *player)
700
 
     
701
 
     gboolean repeat, shuffle;
702
 
     
703
 
+    GtkWidget *infobar_contents;
704
 
+    GtkCellRenderer *cell, *sub_cell;
705
 
+    
706
 
+    GtkWidget *content_area;
707
 
+    
708
 
     player->priv = PAROLE_PLAYER_GET_PRIVATE (player);
709
 
 
710
 
     player->priv->client_id = NULL;
711
 
@@ -2428,13 +2458,13 @@ parole_player_init (ParolePlayer *player)
712
 
     player->priv->liststore_subtitles = GTK_LIST_STORE (gtk_builder_get_object (builder, "liststore_subtitles"));
713
 
     player->priv->audio_list = NULL;
714
 
     player->priv->subtitle_list = NULL;
715
 
-    GtkWidget *infobar_contents = GTK_WIDGET (gtk_builder_get_object( builder, "infobar_contents"));
716
 
+    infobar_contents = GTK_WIDGET (gtk_builder_get_object( builder, "infobar_contents"));
717
 
     
718
 
-    GtkCellRenderer * cell = gtk_cell_renderer_text_new();
719
 
+    cell = gtk_cell_renderer_text_new();
720
 
        gtk_cell_layout_pack_start( GTK_CELL_LAYOUT( player->priv->combobox_audiotrack ), cell, TRUE );
721
 
        gtk_cell_layout_set_attributes( GTK_CELL_LAYOUT( player->priv->combobox_audiotrack ), cell, "text", 0, NULL );
722
 
        
723
 
-       GtkCellRenderer * sub_cell = gtk_cell_renderer_text_new();
724
 
+       sub_cell = gtk_cell_renderer_text_new();
725
 
        gtk_cell_layout_pack_start( GTK_CELL_LAYOUT( player->priv->combobox_subtitles ), sub_cell, TRUE );
726
 
        gtk_cell_layout_set_attributes( GTK_CELL_LAYOUT( player->priv->combobox_subtitles ), sub_cell, "text", 0, NULL );
727
 
        
728
 
@@ -2442,7 +2472,7 @@ parole_player_init (ParolePlayer *player)
729
 
        player->priv->infobar = gtk_info_bar_new ();
730
 
        gtk_widget_set_no_show_all (player->priv->infobar, TRUE);
731
 
 
732
 
-       GtkWidget *content_area = gtk_info_bar_get_content_area (GTK_INFO_BAR (player->priv->infobar));
733
 
+       content_area = gtk_info_bar_get_content_area (GTK_INFO_BAR (player->priv->infobar));
734
 
        gtk_widget_reparent (infobar_contents, content_area);
735
 
        gtk_info_bar_add_button (GTK_INFO_BAR (player->priv->infobar),
736
 
                                     GTK_STOCK_CLOSE, GTK_RESPONSE_OK);
737
 
@@ -2585,15 +2615,16 @@ void parole_player_play_uri_disc (ParolePlayer *player, const gchar *uri, const
738
 
     }
739
 
 }
740
 
 
741
 
-void parole_player_set_audiotrack_radio_menu_item_selected(ParolePlayer *player, gint index)
742
 
+void parole_player_set_audiotrack_radio_menu_item_selected(ParolePlayer *player, gint audio_index)
743
 
 {
744
 
        GList *menu_items, *menu_iter;
745
 
+       gint counter = 0;
746
 
+       
747
 
        menu_items = gtk_container_get_children( GTK_CONTAINER (player->priv->languages_menu) );
748
 
        
749
 
-       gint counter = 0;
750
 
        for (menu_iter = menu_items; menu_iter != NULL; menu_iter = g_list_next(menu_iter))
751
 
        {
752
 
-               if (counter == index) {
753
 
+               if (counter == audio_index) {
754
 
                        gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menu_iter->data), TRUE);
755
 
                        break;
756
 
                }
757
 
@@ -2602,12 +2633,12 @@ void parole_player_set_audiotrack_radio_menu_item_selected(ParolePlayer *player,
758
 
        g_list_free(menu_items);
759
 
 }
760
 
 
761
 
-void parole_player_set_subtitle_radio_menu_item_selected(ParolePlayer *player, gint index)
762
 
+void parole_player_set_subtitle_radio_menu_item_selected(ParolePlayer *player, gint sub_index)
763
 
 {
764
 
        GList *menu_items, *menu_iter;
765
 
        menu_items = gtk_container_get_children( GTK_CONTAINER (player->priv->subtitles_menu) );
766
 
        
767
 
-       if (index <= 0)
768
 
+       if (sub_index <= 0)
769
 
        {
770
 
                gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menu_items->data), TRUE);
771
 
        }
772
 
@@ -2616,7 +2647,7 @@ void parole_player_set_subtitle_radio_menu_item_selected(ParolePlayer *player, g
773
 
                gint counter = -3;
774
 
                for (menu_iter = menu_items; menu_iter != NULL; menu_iter = g_list_next(menu_iter))
775
 
                {
776
 
-                       if (counter == index) {
777
 
+                       if (counter == sub_index) {
778
 
                                gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menu_iter->data), TRUE);
779
 
                                break;
780
 
                        }
781
 
@@ -2629,11 +2660,12 @@ void parole_player_set_subtitle_radio_menu_item_selected(ParolePlayer *player, g
782
 
 void parole_player_audiotrack_radio_menu_item_changed_cb(GtkWidget *widget, ParolePlayer *player)
783
 
 {
784
 
        gint radio_index;
785
 
-       
786
 
        GList *menu_items, *menu_iter;
787
 
+       gint counter = 0;
788
 
+       gint combobox_index;
789
 
+       
790
 
        menu_items = gtk_container_get_children( GTK_CONTAINER (player->priv->languages_menu) );
791
 
        
792
 
-       gint counter = 0;
793
 
        for (menu_iter = menu_items; menu_iter != NULL; menu_iter = g_list_next(menu_iter))
794
 
        {
795
 
                if (gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(menu_iter->data)) == TRUE) {
796
 
@@ -2644,19 +2676,19 @@ void parole_player_audiotrack_radio_menu_item_changed_cb(GtkWidget *widget, Paro
797
 
        }
798
 
        g_list_free(menu_items);
799
 
        
800
 
-       gint combobox_index = gtk_combo_box_get_active(GTK_COMBO_BOX(player->priv->combobox_audiotrack));
801
 
+       combobox_index = gtk_combo_box_get_active(GTK_COMBO_BOX(player->priv->combobox_audiotrack));
802
 
        if (radio_index != combobox_index)
803
 
        gtk_combo_box_set_active(GTK_COMBO_BOX(player->priv->combobox_audiotrack), radio_index);
804
 
 }
805
 
 
806
 
 void parole_player_subtitles_radio_menu_item_changed_cb(GtkWidget *widget, ParolePlayer *player)
807
 
 {
808
 
-       gint radio_index;
809
 
+       gint radio_index, combobox_index; 
810
 
+       gint counter = 0;
811
 
        
812
 
        GList *menu_items, *menu_iter;
813
 
        menu_items = gtk_container_get_children( GTK_CONTAINER (player->priv->subtitles_menu) );
814
 
        
815
 
-       gint counter = 0;
816
 
        for (menu_iter = menu_items; menu_iter != NULL; menu_iter = g_list_next(menu_iter))
817
 
        {
818
 
                if (counter == 0 || counter > 3)
819
 
@@ -2673,23 +2705,23 @@ void parole_player_subtitles_radio_menu_item_changed_cb(GtkWidget *widget, Parol
820
 
        if (radio_index != 0)
821
 
        radio_index -= 3;
822
 
 
823
 
-       gint combobox_index = gtk_combo_box_get_active(GTK_COMBO_BOX(player->priv->combobox_subtitles));
824
 
+       combobox_index = gtk_combo_box_get_active(GTK_COMBO_BOX(player->priv->combobox_subtitles));
825
 
        if (radio_index != combobox_index)
826
 
        gtk_combo_box_set_active(GTK_COMBO_BOX(player->priv->combobox_subtitles), radio_index);
827
 
 }
828
 
 
829
 
 void parole_player_combo_box_audiotrack_changed_cb(GtkWidget *widget, ParolePlayer *player)
830
 
 {
831
 
-       gint index = gtk_combo_box_get_active(GTK_COMBO_BOX(player->priv->combobox_audiotrack));
832
 
-       gst_set_current_audio_track(PAROLE_GST(player->priv->gst), index);
833
 
-       parole_player_set_audiotrack_radio_menu_item_selected(player, index);
834
 
+       gint audio_index = gtk_combo_box_get_active(GTK_COMBO_BOX(player->priv->combobox_audiotrack));
835
 
+       gst_set_current_audio_track(PAROLE_GST(player->priv->gst), audio_index);
836
 
+       parole_player_set_audiotrack_radio_menu_item_selected(player, audio_index);
837
 
 }
838
 
 
839
 
 void parole_player_combo_box_subtitles_changed_cb(GtkWidget *widget, ParolePlayer *player)
840
 
 {
841
 
-       gint index = gtk_combo_box_get_active(GTK_COMBO_BOX(player->priv->combobox_subtitles));
842
 
-       gst_set_current_subtitle_track(PAROLE_GST(player->priv->gst), index);
843
 
-       parole_player_set_subtitle_radio_menu_item_selected(player, index);
844
 
+       gint sub_index = gtk_combo_box_get_active(GTK_COMBO_BOX(player->priv->combobox_subtitles));
845
 
+       gst_set_current_subtitle_track(PAROLE_GST(player->priv->gst), sub_index);
846
 
+       parole_player_set_subtitle_radio_menu_item_selected(player, sub_index);
847
 
 }
848
 
 
849
 
 void parole_player_terminate (ParolePlayer *player)
850
 
diff --git a/src/parole-plugins-manager.c b/src/parole-plugins-manager.c
851
 
index ee4034d..7216d9b 100644
852
 
--- a/src/parole-plugins-manager.c
853
 
+++ b/src/parole-plugins-manager.c
854
 
@@ -374,7 +374,6 @@ static void
855
 
 parole_plugins_manager_show_plugins_pref (GtkWidget *widget, ParolePluginsManager *manager)
856
 
 {
857
 
     GtkBuilder *builder;
858
 
-    GtkWidget *site_box;
859
 
     GtkTreeSelection *sel;
860
 
     GtkTreePath *path;
861
 
     GtkTreeIter iter;
862
 
--
863
 
cgit v0.9.0.3