~diwic/gnome-control-center/lp1060143

« back to all changes in this revision

Viewing changes to debian/patches/96_sound_nua_panel.patch

  • Committer: David Henningsson
  • Date: 2012-10-03 14:46:54 UTC
  • Revision ID: david.henningsson@canonical.com-20121003144654-h8kpulyy3cdmnlah
sound-nua: Select first item automatically (LP: #1060143)

Show diffs side-by-side

added added

removed removed

Lines of Context:
5
5
=== modified file 'configure.ac'
6
6
Index: gnome-control-center-3.4.2/configure.ac
7
7
===================================================================
8
 
--- gnome-control-center-3.4.2.orig/configure.ac        2012-05-15 12:19:58.000000000 +0200
9
 
+++ gnome-control-center-3.4.2/configure.ac     2012-08-28 17:08:53.636517102 +0200
10
 
@@ -345,6 +346,9 @@
 
8
--- gnome-control-center-3.4.2.orig/configure.ac        2012-10-03 16:39:56.797397745 +0200
 
9
+++ gnome-control-center-3.4.2/configure.ac     2012-10-03 16:40:00.033398187 +0200
 
10
@@ -345,6 +345,9 @@
11
11
 panels/online-accounts/icons/32x32/Makefile
12
12
 panels/online-accounts/icons/48x48/Makefile
13
13
 panels/online-accounts/icons/256x256/Makefile
19
19
 panels/sound/data/gnome-sound-panel.desktop.in
20
20
Index: gnome-control-center-3.4.2/panels/Makefile.am
21
21
===================================================================
22
 
--- gnome-control-center-3.4.2.orig/panels/Makefile.am  2012-03-05 15:04:55.000000000 +0100
23
 
+++ gnome-control-center-3.4.2/panels/Makefile.am       2012-08-28 17:08:49.404516897 +0200
 
22
--- gnome-control-center-3.4.2.orig/panels/Makefile.am  2012-10-03 16:39:56.797397745 +0200
 
23
+++ gnome-control-center-3.4.2/panels/Makefile.am       2012-10-03 16:40:00.033398187 +0200
24
24
@@ -10,6 +10,7 @@
25
25
        region \
26
26
        info \
32
32
Index: gnome-control-center-3.4.2/panels/sound-nua/Makefile.am
33
33
===================================================================
34
34
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
35
 
+++ gnome-control-center-3.4.2/panels/sound-nua/Makefile.am     2012-08-28 17:08:49.408516897 +0200
 
35
+++ gnome-control-center-3.4.2/panels/sound-nua/Makefile.am     2012-10-03 16:40:00.033398187 +0200
36
36
@@ -0,0 +1,93 @@
37
37
+SUBDIRS = data
38
38
+
130
130
Index: gnome-control-center-3.4.2/panels/sound-nua/applet-main.c
131
131
===================================================================
132
132
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
133
 
+++ gnome-control-center-3.4.2/panels/sound-nua/applet-main.c   2012-08-28 17:08:49.412516897 +0200
 
133
+++ gnome-control-center-3.4.2/panels/sound-nua/applet-main.c   2012-10-03 16:40:00.033398187 +0200
134
134
@@ -0,0 +1,110 @@
135
135
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
136
136
+ *
245
245
Index: gnome-control-center-3.4.2/panels/sound-nua/cc-sound-panel.c
246
246
===================================================================
247
247
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
248
 
+++ gnome-control-center-3.4.2/panels/sound-nua/cc-sound-panel.c        2012-08-28 17:08:49.412516897 +0200
 
248
+++ gnome-control-center-3.4.2/panels/sound-nua/cc-sound-panel.c        2012-10-03 16:40:00.033398187 +0200
249
249
@@ -0,0 +1,141 @@
250
250
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
251
251
+ *
391
391
Index: gnome-control-center-3.4.2/panels/sound-nua/cc-sound-panel.h
392
392
===================================================================
393
393
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
394
 
+++ gnome-control-center-3.4.2/panels/sound-nua/cc-sound-panel.h        2012-08-28 17:08:49.416516897 +0200
 
394
+++ gnome-control-center-3.4.2/panels/sound-nua/cc-sound-panel.h        2012-10-03 16:40:00.033398187 +0200
395
395
@@ -0,0 +1,60 @@
396
396
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
397
397
+ *
456
456
Index: gnome-control-center-3.4.2/panels/sound-nua/data/Makefile.am
457
457
===================================================================
458
458
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
459
 
+++ gnome-control-center-3.4.2/panels/sound-nua/data/Makefile.am        2012-08-28 17:08:49.420516898 +0200
 
459
+++ gnome-control-center-3.4.2/panels/sound-nua/data/Makefile.am        2012-10-03 16:40:00.033398187 +0200
460
460
@@ -0,0 +1,17 @@
461
461
+NULL =
462
462
+
478
478
Index: gnome-control-center-3.4.2/panels/sound-nua/data/gnome-sound-nua-panel.desktop.in.in
479
479
===================================================================
480
480
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
481
 
+++ gnome-control-center-3.4.2/panels/sound-nua/data/gnome-sound-nua-panel.desktop.in.in        2012-08-28 17:08:49.424516898 +0200
 
481
+++ gnome-control-center-3.4.2/panels/sound-nua/data/gnome-sound-nua-panel.desktop.in.in        2012-10-03 16:40:00.033398187 +0200
482
482
@@ -0,0 +1,17 @@
483
483
+[Desktop Entry]
484
484
+_Name=Sound
500
500
Index: gnome-control-center-3.4.2/panels/sound-nua/gvc-applet.c
501
501
===================================================================
502
502
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
503
 
+++ gnome-control-center-3.4.2/panels/sound-nua/gvc-applet.c    2012-08-28 17:08:49.428516898 +0200
 
503
+++ gnome-control-center-3.4.2/panels/sound-nua/gvc-applet.c    2012-10-03 16:40:00.033398187 +0200
504
504
@@ -0,0 +1,305 @@
505
505
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
506
506
+ *
810
810
Index: gnome-control-center-3.4.2/panels/sound-nua/gvc-applet.h
811
811
===================================================================
812
812
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
813
 
+++ gnome-control-center-3.4.2/panels/sound-nua/gvc-applet.h    2012-08-28 17:08:49.428516898 +0200
 
813
+++ gnome-control-center-3.4.2/panels/sound-nua/gvc-applet.h    2012-10-03 16:40:00.033398187 +0200
814
814
@@ -0,0 +1,55 @@
815
815
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
816
816
+ *
870
870
Index: gnome-control-center-3.4.2/panels/sound-nua/gvc-balance-bar.c
871
871
===================================================================
872
872
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
873
 
+++ gnome-control-center-3.4.2/panels/sound-nua/gvc-balance-bar.c       2012-08-28 17:08:49.432516898 +0200
 
873
+++ gnome-control-center-3.4.2/panels/sound-nua/gvc-balance-bar.c       2012-10-03 16:40:00.033398187 +0200
874
874
@@ -0,0 +1,575 @@
875
875
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
876
876
+ *
1450
1450
Index: gnome-control-center-3.4.2/panels/sound-nua/gvc-balance-bar.h
1451
1451
===================================================================
1452
1452
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
1453
 
+++ gnome-control-center-3.4.2/panels/sound-nua/gvc-balance-bar.h       2012-08-28 17:08:49.432516898 +0200
 
1453
+++ gnome-control-center-3.4.2/panels/sound-nua/gvc-balance-bar.h       2012-10-03 16:40:00.033398187 +0200
1454
1454
@@ -0,0 +1,70 @@
1455
1455
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
1456
1456
+ *
1525
1525
Index: gnome-control-center-3.4.2/panels/sound-nua/gvc-channel-bar.c
1526
1526
===================================================================
1527
1527
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
1528
 
+++ gnome-control-center-3.4.2/panels/sound-nua/gvc-channel-bar.c       2012-08-28 17:08:49.436516898 +0200
 
1528
+++ gnome-control-center-3.4.2/panels/sound-nua/gvc-channel-bar.c       2012-10-03 16:40:00.037398188 +0200
1529
1529
@@ -0,0 +1,973 @@
1530
1530
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
1531
1531
+ *
2503
2503
Index: gnome-control-center-3.4.2/panels/sound-nua/gvc-channel-bar.h
2504
2504
===================================================================
2505
2505
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
2506
 
+++ gnome-control-center-3.4.2/panels/sound-nua/gvc-channel-bar.h       2012-08-28 17:08:49.436516898 +0200
 
2506
+++ gnome-control-center-3.4.2/panels/sound-nua/gvc-channel-bar.h       2012-10-03 16:40:00.037398188 +0200
2507
2507
@@ -0,0 +1,89 @@
2508
2508
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
2509
2509
+ *
2597
2597
Index: gnome-control-center-3.4.2/panels/sound-nua/gvc-channel-map-private.h
2598
2598
===================================================================
2599
2599
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
2600
 
+++ gnome-control-center-3.4.2/panels/sound-nua/gvc-channel-map-private.h       2012-08-28 17:08:49.436516898 +0200
 
2600
+++ gnome-control-center-3.4.2/panels/sound-nua/gvc-channel-map-private.h       2012-10-03 16:40:00.037398188 +0200
2601
2601
@@ -0,0 +1,39 @@
2602
2602
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
2603
2603
+ *
2641
2641
Index: gnome-control-center-3.4.2/panels/sound-nua/gvc-channel-map.c
2642
2642
===================================================================
2643
2643
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
2644
 
+++ gnome-control-center-3.4.2/panels/sound-nua/gvc-channel-map.c       2012-08-28 17:08:49.436516898 +0200
 
2644
+++ gnome-control-center-3.4.2/panels/sound-nua/gvc-channel-map.c       2012-10-03 16:40:00.037398188 +0200
2645
2645
@@ -0,0 +1,254 @@
2646
2646
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
2647
2647
+ *
2900
2900
Index: gnome-control-center-3.4.2/panels/sound-nua/gvc-channel-map.h
2901
2901
===================================================================
2902
2902
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
2903
 
+++ gnome-control-center-3.4.2/panels/sound-nua/gvc-channel-map.h       2012-08-28 17:08:49.440516899 +0200
 
2903
+++ gnome-control-center-3.4.2/panels/sound-nua/gvc-channel-map.h       2012-10-03 16:40:00.037398188 +0200
2904
2904
@@ -0,0 +1,73 @@
2905
2905
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
2906
2906
+ *
2978
2978
Index: gnome-control-center-3.4.2/panels/sound-nua/gvc-combo-box.c
2979
2979
===================================================================
2980
2980
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
2981
 
+++ gnome-control-center-3.4.2/panels/sound-nua/gvc-combo-box.c 2012-08-28 17:08:49.440516899 +0200
 
2981
+++ gnome-control-center-3.4.2/panels/sound-nua/gvc-combo-box.c 2012-10-03 16:40:00.037398188 +0200
2982
2982
@@ -0,0 +1,410 @@
2983
2983
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
2984
2984
+ *
3393
3393
Index: gnome-control-center-3.4.2/panels/sound-nua/gvc-combo-box.h
3394
3394
===================================================================
3395
3395
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
3396
 
+++ gnome-control-center-3.4.2/panels/sound-nua/gvc-combo-box.h 2012-08-28 17:08:49.440516899 +0200
 
3396
+++ gnome-control-center-3.4.2/panels/sound-nua/gvc-combo-box.h 2012-10-03 16:40:00.037398188 +0200
3397
3397
@@ -0,0 +1,66 @@
3398
3398
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
3399
3399
+ *
3464
3464
Index: gnome-control-center-3.4.2/panels/sound-nua/gvc-level-bar.c
3465
3465
===================================================================
3466
3466
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
3467
 
+++ gnome-control-center-3.4.2/panels/sound-nua/gvc-level-bar.c 2012-08-28 17:08:49.444516900 +0200
 
3467
+++ gnome-control-center-3.4.2/panels/sound-nua/gvc-level-bar.c 2012-10-03 16:40:00.037398188 +0200
3468
3468
@@ -0,0 +1,770 @@
3469
3469
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
3470
3470
+ *
4239
4239
Index: gnome-control-center-3.4.2/panels/sound-nua/gvc-level-bar.h
4240
4240
===================================================================
4241
4241
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
4242
 
+++ gnome-control-center-3.4.2/panels/sound-nua/gvc-level-bar.h 2012-08-28 17:08:49.444516900 +0200
 
4242
+++ gnome-control-center-3.4.2/panels/sound-nua/gvc-level-bar.h 2012-10-03 16:40:00.037398188 +0200
4243
4243
@@ -0,0 +1,75 @@
4244
4244
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
4245
4245
+ *
4319
4319
Index: gnome-control-center-3.4.2/panels/sound-nua/gvc-log.c
4320
4320
===================================================================
4321
4321
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
4322
 
+++ gnome-control-center-3.4.2/panels/sound-nua/gvc-log.c       2012-08-28 17:08:49.444516900 +0200
 
4322
+++ gnome-control-center-3.4.2/panels/sound-nua/gvc-log.c       2012-10-03 16:40:00.037398188 +0200
4323
4323
@@ -0,0 +1,64 @@
4324
4324
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
4325
4325
+ *
4388
4388
Index: gnome-control-center-3.4.2/panels/sound-nua/gvc-log.h
4389
4389
===================================================================
4390
4390
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
4391
 
+++ gnome-control-center-3.4.2/panels/sound-nua/gvc-log.h       2012-08-28 17:08:49.444516900 +0200
 
4391
+++ gnome-control-center-3.4.2/panels/sound-nua/gvc-log.h       2012-10-03 16:40:00.037398188 +0200
4392
4392
@@ -0,0 +1,35 @@
4393
4393
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
4394
4394
+ *
4428
4428
Index: gnome-control-center-3.4.2/panels/sound-nua/gvc-mixer-card-private.h
4429
4429
===================================================================
4430
4430
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
4431
 
+++ gnome-control-center-3.4.2/panels/sound-nua/gvc-mixer-card-private.h        2012-08-28 17:08:49.444516900 +0200
 
4431
+++ gnome-control-center-3.4.2/panels/sound-nua/gvc-mixer-card-private.h        2012-10-03 16:40:00.037398188 +0200
4432
4432
@@ -0,0 +1,35 @@
4433
4433
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
4434
4434
+ *
4468
4468
Index: gnome-control-center-3.4.2/panels/sound-nua/gvc-mixer-card.c
4469
4469
===================================================================
4470
4470
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
4471
 
+++ gnome-control-center-3.4.2/panels/sound-nua/gvc-mixer-card.c        2012-08-28 17:08:49.444516900 +0200
 
4471
+++ gnome-control-center-3.4.2/panels/sound-nua/gvc-mixer-card.c        2012-10-03 16:40:00.037398188 +0200
4472
4472
@@ -0,0 +1,550 @@
4473
4473
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
4474
4474
+ *
5023
5023
Index: gnome-control-center-3.4.2/panels/sound-nua/gvc-mixer-card.h
5024
5024
===================================================================
5025
5025
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
5026
 
+++ gnome-control-center-3.4.2/panels/sound-nua/gvc-mixer-card.h        2012-08-28 17:08:49.444516900 +0200
 
5026
+++ gnome-control-center-3.4.2/panels/sound-nua/gvc-mixer-card.h        2012-10-03 16:40:00.037398188 +0200
5027
5027
@@ -0,0 +1,109 @@
5028
5028
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
5029
5029
+ *
5137
5137
Index: gnome-control-center-3.4.2/panels/sound-nua/gvc-mixer-control-private.h
5138
5138
===================================================================
5139
5139
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
5140
 
+++ gnome-control-center-3.4.2/panels/sound-nua/gvc-mixer-control-private.h     2012-08-28 17:08:49.444516900 +0200
 
5140
+++ gnome-control-center-3.4.2/panels/sound-nua/gvc-mixer-control-private.h     2012-10-03 16:40:00.037398188 +0200
5141
5141
@@ -0,0 +1,35 @@
5142
5142
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
5143
5143
+ *
5177
5177
Index: gnome-control-center-3.4.2/panels/sound-nua/gvc-mixer-control.c
5178
5178
===================================================================
5179
5179
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
5180
 
+++ gnome-control-center-3.4.2/panels/sound-nua/gvc-mixer-control.c     2012-08-28 17:08:49.452516900 +0200
 
5180
+++ gnome-control-center-3.4.2/panels/sound-nua/gvc-mixer-control.c     2012-10-03 16:40:00.041398189 +0200
5181
5181
@@ -0,0 +1,3374 @@
5182
5182
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
5183
5183
+ *
8556
8556
Index: gnome-control-center-3.4.2/panels/sound-nua/gvc-mixer-control.h
8557
8557
===================================================================
8558
8558
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
8559
 
+++ gnome-control-center-3.4.2/panels/sound-nua/gvc-mixer-control.h     2012-08-28 17:08:49.452516900 +0200
 
8559
+++ gnome-control-center-3.4.2/panels/sound-nua/gvc-mixer-control.h     2012-10-03 16:40:00.041398189 +0200
8560
8560
@@ -0,0 +1,139 @@
8561
8561
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
8562
8562
+ *
8700
8700
Index: gnome-control-center-3.4.2/panels/sound-nua/gvc-mixer-dialog.c
8701
8701
===================================================================
8702
8702
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
8703
 
+++ gnome-control-center-3.4.2/panels/sound-nua/gvc-mixer-dialog.c      2012-08-28 17:08:49.452516900 +0200
8704
 
@@ -0,0 +1,2203 @@
 
8703
+++ gnome-control-center-3.4.2/panels/sound-nua/gvc-mixer-dialog.c      2012-10-03 16:44:59.977441776 +0200
 
8704
@@ -0,0 +1,2221 @@
8705
8705
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
8706
8706
+ *
8707
8707
+ * Copyright (C) 2008 William Jon McCann
10032
10032
+                         guint            id,
10033
10033
+                         GvcMixerDialog  *dialog)
10034
10034
+{
 
10035
+        gboolean          is_first_device;
 
10036
+        GtkTreeModel     *model;
 
10037
+        GtkTreeIter       iter;
10035
10038
+       GvcMixerUIDevice* out = NULL;
10036
10039
+       out = gvc_mixer_control_lookup_output_id (control, id);
10037
10040
+
10040
10043
+               return;
10041
10044
+       }
10042
10045
+
10043
 
+       add_output_ui_entry (dialog, out);
 
10046
+        model = gtk_tree_view_get_model (GTK_TREE_VIEW (dialog->priv->output_treeview));
 
10047
+        is_first_device = !gtk_tree_model_get_iter_first (model, &iter);
 
10048
+
 
10049
+        add_output_ui_entry (dialog, out);
 
10050
+        if (is_first_device)
 
10051
+                active_output_update (dialog, out);
10044
10052
+}
10045
10053
+
10046
10054
+static void
10079
10087
+                        GvcMixerDialog  *dialog)
10080
10088
+{
10081
10089
+       GvcMixerUIDevice* in = NULL;
 
10090
+        gboolean          is_first_device;
 
10091
+        GtkTreeModel     *model;
 
10092
+        GtkTreeIter       iter;
 
10093
+
10082
10094
+       in = gvc_mixer_control_lookup_input_id (control, id);
10083
10095
+
10084
10096
+       if (in == NULL) {
10085
10097
+               g_warning ("on_control_input_added - tried to fetch an input of id %u but got nothing", id);
10086
10098
+               return;
10087
10099
+       }
10088
 
+       add_input_ui_entry (dialog, in);
 
10100
+        model = gtk_tree_view_get_model (GTK_TREE_VIEW (dialog->priv->input_treeview));
 
10101
+        is_first_device = !gtk_tree_model_get_iter_first (model, &iter);
 
10102
+
 
10103
+        add_input_ui_entry (dialog, in);
 
10104
+        if (is_first_device)
 
10105
+                active_input_update (dialog, in);
 
10106
+
10089
10107
+}
10090
10108
+
10091
10109
+static void
10098
10116
+        GtkTreeIter   iter;
10099
10117
+        GtkTreeModel *model;
10100
10118
+
10101
 
+        GvcMixerUIDevice* out = NULL;
 
10119
+        GvcMixerUIDevice *out = NULL;
10102
10120
+        out = gvc_mixer_control_lookup_output_id (control, id);
10103
10121
+        
10104
10122
+        gint sink_stream_id;
10908
10926
Index: gnome-control-center-3.4.2/panels/sound-nua/gvc-mixer-dialog.h
10909
10927
===================================================================
10910
10928
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
10911
 
+++ gnome-control-center-3.4.2/panels/sound-nua/gvc-mixer-dialog.h      2012-08-28 17:08:49.456516899 +0200
 
10929
+++ gnome-control-center-3.4.2/panels/sound-nua/gvc-mixer-dialog.h      2012-10-03 16:40:00.045398190 +0200
10912
10930
@@ -0,0 +1,56 @@
10913
10931
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
10914
10932
+ *
10969
10987
Index: gnome-control-center-3.4.2/panels/sound-nua/gvc-mixer-event-role.c
10970
10988
===================================================================
10971
10989
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
10972
 
+++ gnome-control-center-3.4.2/panels/sound-nua/gvc-mixer-event-role.c  2012-08-28 17:08:49.456516899 +0200
 
10990
+++ gnome-control-center-3.4.2/panels/sound-nua/gvc-mixer-event-role.c  2012-10-03 16:40:00.045398190 +0200
10973
10991
@@ -0,0 +1,231 @@
10974
10992
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
10975
10993
+ *
11205
11223
Index: gnome-control-center-3.4.2/panels/sound-nua/gvc-mixer-event-role.h
11206
11224
===================================================================
11207
11225
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
11208
 
+++ gnome-control-center-3.4.2/panels/sound-nua/gvc-mixer-event-role.h  2012-08-28 17:08:49.456516899 +0200
 
11226
+++ gnome-control-center-3.4.2/panels/sound-nua/gvc-mixer-event-role.h  2012-10-03 16:40:00.045398190 +0200
11209
11227
@@ -0,0 +1,57 @@
11210
11228
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
11211
11229
+ *
11267
11285
Index: gnome-control-center-3.4.2/panels/sound-nua/gvc-mixer-sink-input.c
11268
11286
===================================================================
11269
11287
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
11270
 
+++ gnome-control-center-3.4.2/panels/sound-nua/gvc-mixer-sink-input.c  2012-08-28 17:08:49.456516899 +0200
 
11288
+++ gnome-control-center-3.4.2/panels/sound-nua/gvc-mixer-sink-input.c  2012-10-03 16:40:00.045398190 +0200
11271
11289
@@ -0,0 +1,166 @@
11272
11290
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
11273
11291
+ *
11438
11456
Index: gnome-control-center-3.4.2/panels/sound-nua/gvc-mixer-sink-input.h
11439
11457
===================================================================
11440
11458
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
11441
 
+++ gnome-control-center-3.4.2/panels/sound-nua/gvc-mixer-sink-input.h  2012-08-28 17:08:49.456516899 +0200
 
11459
+++ gnome-control-center-3.4.2/panels/sound-nua/gvc-mixer-sink-input.h  2012-10-03 16:40:00.045398190 +0200
11442
11460
@@ -0,0 +1,57 @@
11443
11461
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
11444
11462
+ *
11500
11518
Index: gnome-control-center-3.4.2/panels/sound-nua/gvc-mixer-sink.c
11501
11519
===================================================================
11502
11520
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
11503
 
+++ gnome-control-center-3.4.2/panels/sound-nua/gvc-mixer-sink.c        2012-08-28 17:08:49.456516899 +0200
 
11521
+++ gnome-control-center-3.4.2/panels/sound-nua/gvc-mixer-sink.c        2012-10-03 16:40:00.045398190 +0200
11504
11522
@@ -0,0 +1,196 @@
11505
11523
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
11506
11524
+ *
11701
11719
Index: gnome-control-center-3.4.2/panels/sound-nua/gvc-mixer-sink.h
11702
11720
===================================================================
11703
11721
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
11704
 
+++ gnome-control-center-3.4.2/panels/sound-nua/gvc-mixer-sink.h        2012-08-28 17:08:49.456516899 +0200
 
11722
+++ gnome-control-center-3.4.2/panels/sound-nua/gvc-mixer-sink.h        2012-10-03 16:40:00.045398190 +0200
11705
11723
@@ -0,0 +1,57 @@
11706
11724
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
11707
11725
+ *
11763
11781
Index: gnome-control-center-3.4.2/panels/sound-nua/gvc-mixer-source-output.c
11764
11782
===================================================================
11765
11783
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
11766
 
+++ gnome-control-center-3.4.2/panels/sound-nua/gvc-mixer-source-output.c       2012-08-28 17:08:49.456516899 +0200
 
11784
+++ gnome-control-center-3.4.2/panels/sound-nua/gvc-mixer-source-output.c       2012-10-03 16:40:00.045398190 +0200
11767
11785
@@ -0,0 +1,121 @@
11768
11786
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
11769
11787
+ *
11889
11907
Index: gnome-control-center-3.4.2/panels/sound-nua/gvc-mixer-source-output.h
11890
11908
===================================================================
11891
11909
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
11892
 
+++ gnome-control-center-3.4.2/panels/sound-nua/gvc-mixer-source-output.h       2012-08-28 17:08:49.456516899 +0200
 
11910
+++ gnome-control-center-3.4.2/panels/sound-nua/gvc-mixer-source-output.h       2012-10-03 16:40:00.045398190 +0200
11893
11911
@@ -0,0 +1,57 @@
11894
11912
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
11895
11913
+ *
11951
11969
Index: gnome-control-center-3.4.2/panels/sound-nua/gvc-mixer-source.c
11952
11970
===================================================================
11953
11971
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
11954
 
+++ gnome-control-center-3.4.2/panels/sound-nua/gvc-mixer-source.c      2012-08-28 17:08:49.460516899 +0200
 
11972
+++ gnome-control-center-3.4.2/panels/sound-nua/gvc-mixer-source.c      2012-10-03 16:40:00.045398190 +0200
11955
11973
@@ -0,0 +1,196 @@
11956
11974
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
11957
11975
+ *
12152
12170
Index: gnome-control-center-3.4.2/panels/sound-nua/gvc-mixer-source.h
12153
12171
===================================================================
12154
12172
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
12155
 
+++ gnome-control-center-3.4.2/panels/sound-nua/gvc-mixer-source.h      2012-08-28 17:08:49.460516899 +0200
 
12173
+++ gnome-control-center-3.4.2/panels/sound-nua/gvc-mixer-source.h      2012-10-03 16:40:00.045398190 +0200
12156
12174
@@ -0,0 +1,57 @@
12157
12175
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
12158
12176
+ *
12214
12232
Index: gnome-control-center-3.4.2/panels/sound-nua/gvc-mixer-stream-private.h
12215
12233
===================================================================
12216
12234
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
12217
 
+++ gnome-control-center-3.4.2/panels/sound-nua/gvc-mixer-stream-private.h      2012-08-28 17:08:49.460516899 +0200
 
12235
+++ gnome-control-center-3.4.2/panels/sound-nua/gvc-mixer-stream-private.h      2012-10-03 16:40:00.045398190 +0200
12218
12236
@@ -0,0 +1,34 @@
12219
12237
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
12220
12238
+ *
12253
12271
Index: gnome-control-center-3.4.2/panels/sound-nua/gvc-mixer-stream.c
12254
12272
===================================================================
12255
12273
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
12256
 
+++ gnome-control-center-3.4.2/panels/sound-nua/gvc-mixer-stream.c      2012-08-28 17:08:49.460516899 +0200
 
12274
+++ gnome-control-center-3.4.2/panels/sound-nua/gvc-mixer-stream.c      2012-10-03 16:40:00.049398190 +0200
12257
12275
@@ -0,0 +1,968 @@
12258
12276
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
12259
12277
+ *
13226
13244
Index: gnome-control-center-3.4.2/panels/sound-nua/gvc-mixer-stream.h
13227
13245
===================================================================
13228
13246
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
13229
 
+++ gnome-control-center-3.4.2/panels/sound-nua/gvc-mixer-stream.h      2012-08-28 17:08:49.460516899 +0200
 
13247
+++ gnome-control-center-3.4.2/panels/sound-nua/gvc-mixer-stream.h      2012-10-03 16:40:00.049398190 +0200
13230
13248
@@ -0,0 +1,128 @@
13231
13249
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
13232
13250
+ *
13359
13377
Index: gnome-control-center-3.4.2/panels/sound-nua/gvc-mixer-ui-device.c
13360
13378
===================================================================
13361
13379
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
13362
 
+++ gnome-control-center-3.4.2/panels/sound-nua/gvc-mixer-ui-device.c   2012-08-28 17:08:49.460516899 +0200
 
13380
+++ gnome-control-center-3.4.2/panels/sound-nua/gvc-mixer-ui-device.c   2012-10-03 16:40:00.049398190 +0200
13363
13381
@@ -0,0 +1,664 @@
13364
13382
+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 4; tab-width: 4 -*- */
13365
13383
+/*
14028
14046
Index: gnome-control-center-3.4.2/panels/sound-nua/gvc-mixer-ui-device.h
14029
14047
===================================================================
14030
14048
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
14031
 
+++ gnome-control-center-3.4.2/panels/sound-nua/gvc-mixer-ui-device.h   2012-08-28 17:08:49.464516900 +0200
 
14049
+++ gnome-control-center-3.4.2/panels/sound-nua/gvc-mixer-ui-device.h   2012-10-03 16:40:00.049398190 +0200
14032
14050
@@ -0,0 +1,76 @@
14033
14051
+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 4; tab-width: 4 -*- */
14034
14052
+/*
14109
14127
Index: gnome-control-center-3.4.2/panels/sound-nua/gvc-pulseaudio-fake.h
14110
14128
===================================================================
14111
14129
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
14112
 
+++ gnome-control-center-3.4.2/panels/sound-nua/gvc-pulseaudio-fake.h   2012-08-28 17:08:49.464516900 +0200
 
14130
+++ gnome-control-center-3.4.2/panels/sound-nua/gvc-pulseaudio-fake.h   2012-10-03 16:40:00.049398190 +0200
14113
14131
@@ -0,0 +1,34 @@
14114
14132
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
14115
14133
+ *
14148
14166
Index: gnome-control-center-3.4.2/panels/sound-nua/gvc-sound-theme-chooser.c
14149
14167
===================================================================
14150
14168
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
14151
 
+++ gnome-control-center-3.4.2/panels/sound-nua/gvc-sound-theme-chooser.c       2012-08-28 17:09:13.256518052 +0200
 
14169
+++ gnome-control-center-3.4.2/panels/sound-nua/gvc-sound-theme-chooser.c       2012-10-03 16:40:00.049398190 +0200
14152
14170
@@ -0,0 +1,833 @@
14153
14171
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
14154
14172
+ *
14986
15004
Index: gnome-control-center-3.4.2/panels/sound-nua/gvc-sound-theme-chooser.h
14987
15005
===================================================================
14988
15006
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
14989
 
+++ gnome-control-center-3.4.2/panels/sound-nua/gvc-sound-theme-chooser.h       2012-08-28 17:08:49.464516900 +0200
 
15007
+++ gnome-control-center-3.4.2/panels/sound-nua/gvc-sound-theme-chooser.h       2012-10-03 16:40:00.049398190 +0200
14990
15008
@@ -0,0 +1,54 @@
14991
15009
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
14992
15010
+ *
15045
15063
Index: gnome-control-center-3.4.2/panels/sound-nua/gvc-speaker-test.c
15046
15064
===================================================================
15047
15065
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
15048
 
+++ gnome-control-center-3.4.2/panels/sound-nua/gvc-speaker-test.c      2012-08-28 17:08:49.464516900 +0200
 
15066
+++ gnome-control-center-3.4.2/panels/sound-nua/gvc-speaker-test.c      2012-10-03 16:40:00.049398190 +0200
15049
15067
@@ -0,0 +1,531 @@
15050
15068
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
15051
15069
+ *
15581
15599
Index: gnome-control-center-3.4.2/panels/sound-nua/gvc-speaker-test.h
15582
15600
===================================================================
15583
15601
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
15584
 
+++ gnome-control-center-3.4.2/panels/sound-nua/gvc-speaker-test.h      2012-08-28 17:08:49.464516900 +0200
 
15602
+++ gnome-control-center-3.4.2/panels/sound-nua/gvc-speaker-test.h      2012-10-03 16:40:00.049398190 +0200
15585
15603
@@ -0,0 +1,57 @@
15586
15604
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
15587
15605
+ *
15643
15661
Index: gnome-control-center-3.4.2/panels/sound-nua/gvc-stream-status-icon.c
15644
15662
===================================================================
15645
15663
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
15646
 
+++ gnome-control-center-3.4.2/panels/sound-nua/gvc-stream-status-icon.c        2012-08-28 17:08:49.468516900 +0200
 
15664
+++ gnome-control-center-3.4.2/panels/sound-nua/gvc-stream-status-icon.c        2012-10-03 16:40:00.049398190 +0200
15647
15665
@@ -0,0 +1,780 @@
15648
15666
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
15649
15667
+ *
16428
16446
Index: gnome-control-center-3.4.2/panels/sound-nua/gvc-stream-status-icon.h
16429
16447
===================================================================
16430
16448
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
16431
 
+++ gnome-control-center-3.4.2/panels/sound-nua/gvc-stream-status-icon.h        2012-08-28 17:08:49.468516900 +0200
 
16449
+++ gnome-control-center-3.4.2/panels/sound-nua/gvc-stream-status-icon.h        2012-10-03 16:40:00.049398190 +0200
16432
16450
@@ -0,0 +1,63 @@
16433
16451
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
16434
16452
+ *
16496
16514
Index: gnome-control-center-3.4.2/panels/sound-nua/sound-theme-file-utils.c
16497
16515
===================================================================
16498
16516
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
16499
 
+++ gnome-control-center-3.4.2/panels/sound-nua/sound-theme-file-utils.c        2012-08-28 17:08:49.468516900 +0200
 
16517
+++ gnome-control-center-3.4.2/panels/sound-nua/sound-theme-file-utils.c        2012-10-03 16:40:00.053398191 +0200
16500
16518
@@ -0,0 +1,305 @@
16501
16519
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
16502
16520
+ * Copyright (C) 2008 Bastien Nocera <hadess@hadess.net>
16806
16824
Index: gnome-control-center-3.4.2/panels/sound-nua/sound-theme-file-utils.h
16807
16825
===================================================================
16808
16826
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
16809
 
+++ gnome-control-center-3.4.2/panels/sound-nua/sound-theme-file-utils.h        2012-08-28 17:08:49.468516900 +0200
 
16827
+++ gnome-control-center-3.4.2/panels/sound-nua/sound-theme-file-utils.h        2012-10-03 16:40:00.053398191 +0200
16810
16828
@@ -0,0 +1,37 @@
16811
16829
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
16812
16830
+ * Copyright (C) 2008 Bastien Nocera <hadess@hadess.net>
16847
16865
+#endif /* __SOUND_THEME_FILE_UTILS_HH__ */
16848
16866
Index: gnome-control-center-3.4.2/panels/sound/data/gnome-sound-panel.desktop.in.in
16849
16867
===================================================================
16850
 
--- gnome-control-center-3.4.2.orig/panels/sound/data/gnome-sound-panel.desktop.in.in   2012-03-05 15:04:55.000000000 +0100
16851
 
+++ gnome-control-center-3.4.2/panels/sound/data/gnome-sound-panel.desktop.in.in        2012-08-28 17:08:49.468516900 +0200
 
16868
--- gnome-control-center-3.4.2.orig/panels/sound/data/gnome-sound-panel.desktop.in.in   2012-10-03 16:39:56.797397745 +0200
 
16869
+++ gnome-control-center-3.4.2/panels/sound/data/gnome-sound-panel.desktop.in.in        2012-10-03 16:40:00.053398191 +0200
16852
16870
@@ -7,7 +7,7 @@
16853
16871
 Type=Application
16854
16872
 StartupNotify=true
16860
16878
 X-GNOME-Bugzilla-Component=sound
16861
16879
Index: gnome-control-center-3.4.2/panels/universal-access/cc-ua-panel.c
16862
16880
===================================================================
16863
 
--- gnome-control-center-3.4.2.orig/panels/universal-access/cc-ua-panel.c       2012-08-28 17:08:49.364516895 +0200
16864
 
+++ gnome-control-center-3.4.2/panels/universal-access/cc-ua-panel.c    2012-08-28 17:08:49.468516900 +0200
16865
 
@@ -589,7 +589,10 @@
 
16881
--- gnome-control-center-3.4.2.orig/panels/universal-access/cc-ua-panel.c       2012-10-03 16:39:56.797397745 +0200
 
16882
+++ gnome-control-center-3.4.2/panels/universal-access/cc-ua-panel.c    2012-10-03 16:40:00.053398191 +0200
 
16883
@@ -596,7 +596,10 @@
16866
16884
   CcShell *shell;
16867
16885
 
16868
16886
   shell = cc_panel_get_shell (CC_PANEL (panel));
16876
16894
 }
16877
16895
Index: gnome-control-center-3.4.2/shell/gnome-control-center.c
16878
16896
===================================================================
16879
 
--- gnome-control-center-3.4.2.orig/shell/gnome-control-center.c        2012-08-28 17:08:49.324516894 +0200
16880
 
+++ gnome-control-center-3.4.2/shell/gnome-control-center.c     2012-08-28 17:08:53.316517087 +0200
 
16897
--- gnome-control-center-3.4.2.orig/shell/gnome-control-center.c        2012-10-03 16:39:56.797397745 +0200
 
16898
+++ gnome-control-center-3.4.2/shell/gnome-control-center.c     2012-10-03 16:40:00.053398191 +0200
16881
16899
@@ -887,6 +887,10 @@
16882
16900
   GIcon *gicon;
16883
16901
   GnomeControlCenterPrivate *priv = GNOME_CONTROL_CENTER (shell)->priv;