~ubuntu-branches/ubuntu/precise/gnome-control-center/precise

« back to all changes in this revision

Viewing changes to debian/patches/96_sound_nua_panel.patch

  • Committer: Package Import Robot
  • Author(s): Sebastien Bacher
  • Date: 2012-03-30 12:34:31 UTC
  • Revision ID: package-import@ubuntu.com-20120330123431-0dj4s4qpkmj1jzbp
Tags: 1:3.4.0-0ubuntu3
* debian/patches/96_sound_nua_panel.patch:
  - change the a11y sound link to open soundnua under unity (lp: #963618)
* debian/patches/classic_use_sound_indicator.patch:
  - don't autostart the sound applet under GNOME classic sessions since 
    indicators are used (lp: #965288)
* debian/patches/04_new_appearance_settings.patch:
  - don't display a (null) background size when a solid color is used
    (lp: #944076)
  - set "default" string as translatable (lp: #968290)

Show diffs side-by-side

added added

removed removed

Lines of Context:
3
3
# The new design has been discussed upstream and work is ongoing to send
4
4
# changes back to GNOME
5
5
=== modified file 'configure.ac'
6
 
Index: gnome-control-center-3.3.91/configure.ac
 
6
Index: gnome-control-center-3.4.0/configure.ac
7
7
===================================================================
8
 
--- gnome-control-center-3.3.91.orig/configure.ac       2012-03-16 18:46:22.280915569 +0100
9
 
+++ gnome-control-center-3.3.91/configure.ac    2012-03-16 18:46:25.332915684 +0100
 
8
--- gnome-control-center-3.4.0.orig/configure.ac        2012-03-30 11:00:25.055494365 +0200
 
9
+++ gnome-control-center-3.4.0/configure.ac     2012-03-30 11:02:15.375499704 +0200
10
10
@@ -120,7 +120,8 @@
11
11
                   libcanberra-gtk3 >= $CANBERRA_REQUIRED_VERSION
12
12
                   libpulse >= $PA_REQUIRED_VERSION
27
27
 panels/sound/Makefile
28
28
 panels/sound/data/Makefile
29
29
 panels/sound/data/gnome-sound-panel.desktop.in
30
 
Index: gnome-control-center-3.3.91/panels/Makefile.am
 
30
Index: gnome-control-center-3.4.0/panels/Makefile.am
31
31
===================================================================
32
 
--- gnome-control-center-3.3.91.orig/panels/Makefile.am 2012-03-05 15:04:55.000000000 +0100
33
 
+++ gnome-control-center-3.3.91/panels/Makefile.am      2012-03-16 18:46:23.100915600 +0100
 
32
--- gnome-control-center-3.4.0.orig/panels/Makefile.am  2012-02-14 11:12:23.000000000 +0100
 
33
+++ gnome-control-center-3.4.0/panels/Makefile.am       2012-03-30 11:00:25.359494380 +0200
34
34
@@ -10,6 +10,7 @@
35
35
        region \
36
36
        info \
39
39
        keyboard \
40
40
        universal-access \
41
41
        user-accounts \
42
 
Index: gnome-control-center-3.3.91/panels/sound-nua/Makefile.am
 
42
Index: gnome-control-center-3.4.0/panels/sound-nua/Makefile.am
43
43
===================================================================
44
44
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
45
 
+++ gnome-control-center-3.3.91/panels/sound-nua/Makefile.am    2012-03-16 18:46:23.108915599 +0100
 
45
+++ gnome-control-center-3.4.0/panels/sound-nua/Makefile.am     2012-03-30 11:00:25.359494380 +0200
46
46
@@ -0,0 +1,93 @@
47
47
+SUBDIRS = data
48
48
+
137
137
+        Makefile.in
138
138
+
139
139
+-include $(top_srcdir)/git.mk
140
 
Index: gnome-control-center-3.3.91/panels/sound-nua/applet-main.c
 
140
Index: gnome-control-center-3.4.0/panels/sound-nua/applet-main.c
141
141
===================================================================
142
142
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
143
 
+++ gnome-control-center-3.3.91/panels/sound-nua/applet-main.c  2012-03-16 18:46:23.108915599 +0100
 
143
+++ gnome-control-center-3.4.0/panels/sound-nua/applet-main.c   2012-03-30 11:00:25.359494380 +0200
144
144
@@ -0,0 +1,110 @@
145
145
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
146
146
+ *
252
252
+
253
253
+        return 0;
254
254
+}
255
 
Index: gnome-control-center-3.3.91/panels/sound-nua/cc-sound-panel.c
 
255
Index: gnome-control-center-3.4.0/panels/sound-nua/cc-sound-panel.c
256
256
===================================================================
257
257
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
258
 
+++ gnome-control-center-3.3.91/panels/sound-nua/cc-sound-panel.c       2012-03-16 18:46:23.108915599 +0100
 
258
+++ gnome-control-center-3.4.0/panels/sound-nua/cc-sound-panel.c        2012-03-30 11:00:25.363494380 +0200
259
259
@@ -0,0 +1,141 @@
260
260
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
261
261
+ *
398
398
+{
399
399
+}
400
400
+
401
 
Index: gnome-control-center-3.3.91/panels/sound-nua/cc-sound-panel.h
 
401
Index: gnome-control-center-3.4.0/panels/sound-nua/cc-sound-panel.h
402
402
===================================================================
403
403
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
404
 
+++ gnome-control-center-3.3.91/panels/sound-nua/cc-sound-panel.h       2012-03-16 18:46:23.108915599 +0100
 
404
+++ gnome-control-center-3.4.0/panels/sound-nua/cc-sound-panel.h        2012-03-30 11:00:25.363494380 +0200
405
405
@@ -0,0 +1,60 @@
406
406
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
407
407
+ *
463
463
+
464
464
+#endif /* _CC_SOUND_PANEL_H */
465
465
+
466
 
Index: gnome-control-center-3.3.91/panels/sound-nua/data/Makefile.am
 
466
Index: gnome-control-center-3.4.0/panels/sound-nua/data/Makefile.am
467
467
===================================================================
468
468
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
469
 
+++ gnome-control-center-3.3.91/panels/sound-nua/data/Makefile.am       2012-03-16 18:46:23.112915600 +0100
 
469
+++ gnome-control-center-3.4.0/panels/sound-nua/data/Makefile.am        2012-03-30 11:00:25.367494380 +0200
470
470
@@ -0,0 +1,17 @@
471
471
+NULL =
472
472
+
485
485
+       $(NULL)
486
486
+
487
487
+-include $(top_srcdir)/git.mk
488
 
Index: gnome-control-center-3.3.91/panels/sound-nua/data/gnome-sound-nua-panel.desktop.in.in
 
488
Index: gnome-control-center-3.4.0/panels/sound-nua/data/gnome-sound-nua-panel.desktop.in.in
489
489
===================================================================
490
490
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
491
 
+++ gnome-control-center-3.3.91/panels/sound-nua/data/gnome-sound-nua-panel.desktop.in.in       2012-03-16 18:46:23.112915600 +0100
 
491
+++ gnome-control-center-3.4.0/panels/sound-nua/data/gnome-sound-nua-panel.desktop.in.in        2012-03-30 11:00:25.367494380 +0200
492
492
@@ -0,0 +1,17 @@
493
493
+[Desktop Entry]
494
494
+_Name=Sound
507
507
+X-GNOME-Settings-Panel=sound-nua
508
508
+# Translators: those are keywords for the sound control-center panel
509
509
+_Keywords=Card;Microphone;Volume;Fade;Balance;Bluetooth;Headset;
510
 
Index: gnome-control-center-3.3.91/panels/sound-nua/gvc-applet.c
 
510
Index: gnome-control-center-3.4.0/panels/sound-nua/gvc-applet.c
511
511
===================================================================
512
512
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
513
 
+++ gnome-control-center-3.3.91/panels/sound-nua/gvc-applet.c   2012-03-16 18:46:23.116915601 +0100
 
513
+++ gnome-control-center-3.4.0/panels/sound-nua/gvc-applet.c    2012-03-30 11:00:25.371494380 +0200
514
514
@@ -0,0 +1,305 @@
515
515
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
516
516
+ *
817
817
+
818
818
+        return GVC_APPLET (applet);
819
819
+}
820
 
Index: gnome-control-center-3.3.91/panels/sound-nua/gvc-applet.h
 
820
Index: gnome-control-center-3.4.0/panels/sound-nua/gvc-applet.h
821
821
===================================================================
822
822
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
823
 
+++ gnome-control-center-3.3.91/panels/sound-nua/gvc-applet.h   2012-03-16 18:46:23.116915601 +0100
 
823
+++ gnome-control-center-3.4.0/panels/sound-nua/gvc-applet.h    2012-03-30 11:00:25.371494380 +0200
824
824
@@ -0,0 +1,55 @@
825
825
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
826
826
+ *
877
877
+G_END_DECLS
878
878
+
879
879
+#endif /* __GVC_APPLET_H */
880
 
Index: gnome-control-center-3.3.91/panels/sound-nua/gvc-balance-bar.c
 
880
Index: gnome-control-center-3.4.0/panels/sound-nua/gvc-balance-bar.c
881
881
===================================================================
882
882
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
883
 
+++ gnome-control-center-3.3.91/panels/sound-nua/gvc-balance-bar.c      2012-03-16 18:46:23.148915602 +0100
 
883
+++ gnome-control-center-3.4.0/panels/sound-nua/gvc-balance-bar.c       2012-03-30 11:00:25.375494381 +0200
884
884
@@ -0,0 +1,556 @@
885
885
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
886
886
+ *
1438
1438
+
1439
1439
+        return GTK_WIDGET (bar);
1440
1440
+}
1441
 
Index: gnome-control-center-3.3.91/panels/sound-nua/gvc-balance-bar.h
 
1441
Index: gnome-control-center-3.4.0/panels/sound-nua/gvc-balance-bar.h
1442
1442
===================================================================
1443
1443
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
1444
 
+++ gnome-control-center-3.3.91/panels/sound-nua/gvc-balance-bar.h      2012-03-16 18:46:23.148915602 +0100
 
1444
+++ gnome-control-center-3.4.0/panels/sound-nua/gvc-balance-bar.h       2012-03-30 11:00:25.375494381 +0200
1445
1445
@@ -0,0 +1,70 @@
1446
1446
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
1447
1447
+ *
1513
1513
+G_END_DECLS
1514
1514
+
1515
1515
+#endif /* __GVC_BALANCE_BAR_H */
1516
 
Index: gnome-control-center-3.3.91/panels/sound-nua/gvc-channel-bar.c
 
1516
Index: gnome-control-center-3.4.0/panels/sound-nua/gvc-channel-bar.c
1517
1517
===================================================================
1518
1518
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
1519
 
+++ gnome-control-center-3.3.91/panels/sound-nua/gvc-channel-bar.c      2012-03-16 18:46:23.152915602 +0100
 
1519
+++ gnome-control-center-3.4.0/panels/sound-nua/gvc-channel-bar.c       2012-03-30 11:00:25.379494381 +0200
1520
1520
@@ -0,0 +1,963 @@
1521
1521
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
1522
1522
+ *
2481
2481
+                            NULL);
2482
2482
+        return GTK_WIDGET (bar);
2483
2483
+}
2484
 
Index: gnome-control-center-3.3.91/panels/sound-nua/gvc-channel-bar.h
 
2484
Index: gnome-control-center-3.4.0/panels/sound-nua/gvc-channel-bar.h
2485
2485
===================================================================
2486
2486
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
2487
 
+++ gnome-control-center-3.3.91/panels/sound-nua/gvc-channel-bar.h      2012-03-16 18:46:23.160915601 +0100
 
2487
+++ gnome-control-center-3.4.0/panels/sound-nua/gvc-channel-bar.h       2012-03-30 11:00:25.379494381 +0200
2488
2488
@@ -0,0 +1,89 @@
2489
2489
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
2490
2490
+ *
2575
2575
+G_END_DECLS
2576
2576
+
2577
2577
+#endif /* __GVC_CHANNEL_BAR_H */
2578
 
Index: gnome-control-center-3.3.91/panels/sound-nua/gvc-channel-map-private.h
 
2578
Index: gnome-control-center-3.4.0/panels/sound-nua/gvc-channel-map-private.h
2579
2579
===================================================================
2580
2580
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
2581
 
+++ gnome-control-center-3.3.91/panels/sound-nua/gvc-channel-map-private.h      2012-03-16 18:46:23.160915601 +0100
 
2581
+++ gnome-control-center-3.4.0/panels/sound-nua/gvc-channel-map-private.h       2012-03-30 11:00:25.379494381 +0200
2582
2582
@@ -0,0 +1,39 @@
2583
2583
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
2584
2584
+ *
2619
2619
+G_END_DECLS
2620
2620
+
2621
2621
+#endif /* __GVC_CHANNEL_MAP_PRIVATE_H */
2622
 
Index: gnome-control-center-3.3.91/panels/sound-nua/gvc-channel-map.c
 
2622
Index: gnome-control-center-3.4.0/panels/sound-nua/gvc-channel-map.c
2623
2623
===================================================================
2624
2624
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
2625
 
+++ gnome-control-center-3.3.91/panels/sound-nua/gvc-channel-map.c      2012-03-16 18:46:23.160915601 +0100
 
2625
+++ gnome-control-center-3.4.0/panels/sound-nua/gvc-channel-map.c       2012-03-30 11:00:25.379494381 +0200
2626
2626
@@ -0,0 +1,254 @@
2627
2627
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
2628
2628
+ *
2878
2878
+
2879
2879
+        return GVC_CHANNEL_MAP (map);
2880
2880
+}
2881
 
Index: gnome-control-center-3.3.91/panels/sound-nua/gvc-channel-map.h
 
2881
Index: gnome-control-center-3.4.0/panels/sound-nua/gvc-channel-map.h
2882
2882
===================================================================
2883
2883
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
2884
 
+++ gnome-control-center-3.3.91/panels/sound-nua/gvc-channel-map.h      2012-03-16 18:46:23.164915601 +0100
 
2884
+++ gnome-control-center-3.4.0/panels/sound-nua/gvc-channel-map.h       2012-03-30 11:00:25.383494381 +0200
2885
2885
@@ -0,0 +1,73 @@
2886
2886
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
2887
2887
+ *
2956
2956
+G_END_DECLS
2957
2957
+
2958
2958
+#endif /* __GVC_CHANNEL_MAP_H */
2959
 
Index: gnome-control-center-3.3.91/panels/sound-nua/gvc-combo-box.c
 
2959
Index: gnome-control-center-3.4.0/panels/sound-nua/gvc-combo-box.c
2960
2960
===================================================================
2961
2961
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
2962
 
+++ gnome-control-center-3.3.91/panels/sound-nua/gvc-combo-box.c        2012-03-16 18:46:23.164915601 +0100
 
2962
+++ gnome-control-center-3.4.0/panels/sound-nua/gvc-combo-box.c 2012-03-30 11:00:25.383494381 +0200
2963
2963
@@ -0,0 +1,410 @@
2964
2964
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
2965
2965
+ *
3371
3371
+        return GTK_WIDGET (combo_box);
3372
3372
+}
3373
3373
+
3374
 
Index: gnome-control-center-3.3.91/panels/sound-nua/gvc-combo-box.h
 
3374
Index: gnome-control-center-3.4.0/panels/sound-nua/gvc-combo-box.h
3375
3375
===================================================================
3376
3376
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
3377
 
+++ gnome-control-center-3.3.91/panels/sound-nua/gvc-combo-box.h        2012-03-16 18:46:23.164915601 +0100
 
3377
+++ gnome-control-center-3.4.0/panels/sound-nua/gvc-combo-box.h 2012-03-30 11:00:25.383494381 +0200
3378
3378
@@ -0,0 +1,66 @@
3379
3379
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
3380
3380
+ *
3442
3442
+G_END_DECLS
3443
3443
+
3444
3444
+#endif /* __GVC_COMBO_BOX_H */
3445
 
Index: gnome-control-center-3.3.91/panels/sound-nua/gvc-level-bar.c
 
3445
Index: gnome-control-center-3.4.0/panels/sound-nua/gvc-level-bar.c
3446
3446
===================================================================
3447
3447
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
3448
 
+++ gnome-control-center-3.3.91/panels/sound-nua/gvc-level-bar.c        2012-03-16 18:46:23.168915602 +0100
 
3448
+++ gnome-control-center-3.4.0/panels/sound-nua/gvc-level-bar.c 2012-03-30 11:00:25.387494381 +0200
3449
3449
@@ -0,0 +1,770 @@
3450
3450
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
3451
3451
+ *
4217
4217
+                            NULL);
4218
4218
+        return GTK_WIDGET (bar);
4219
4219
+}
4220
 
Index: gnome-control-center-3.3.91/panels/sound-nua/gvc-level-bar.h
 
4220
Index: gnome-control-center-3.4.0/panels/sound-nua/gvc-level-bar.h
4221
4221
===================================================================
4222
4222
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
4223
 
+++ gnome-control-center-3.3.91/panels/sound-nua/gvc-level-bar.h        2012-03-16 18:46:23.168915602 +0100
 
4223
+++ gnome-control-center-3.4.0/panels/sound-nua/gvc-level-bar.h 2012-03-30 11:00:25.387494381 +0200
4224
4224
@@ -0,0 +1,75 @@
4225
4225
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
4226
4226
+ *
4297
4297
+G_END_DECLS
4298
4298
+
4299
4299
+#endif /* __GVC_LEVEL_BAR_H */
4300
 
Index: gnome-control-center-3.3.91/panels/sound-nua/gvc-log.c
 
4300
Index: gnome-control-center-3.4.0/panels/sound-nua/gvc-log.c
4301
4301
===================================================================
4302
4302
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
4303
 
+++ gnome-control-center-3.3.91/panels/sound-nua/gvc-log.c      2012-03-16 18:46:23.168915602 +0100
 
4303
+++ gnome-control-center-3.4.0/panels/sound-nua/gvc-log.c       2012-03-30 11:00:25.387494381 +0200
4304
4304
@@ -0,0 +1,64 @@
4305
4305
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
4306
4306
+ *
4366
4366
+                log_levels &= ~ (G_LOG_LEVEL_DEBUG | G_LOG_LEVEL_INFO);
4367
4367
+        }
4368
4368
+}
4369
 
Index: gnome-control-center-3.3.91/panels/sound-nua/gvc-log.h
 
4369
Index: gnome-control-center-3.4.0/panels/sound-nua/gvc-log.h
4370
4370
===================================================================
4371
4371
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
4372
 
+++ gnome-control-center-3.3.91/panels/sound-nua/gvc-log.h      2012-03-16 18:46:23.168915602 +0100
 
4372
+++ gnome-control-center-3.4.0/panels/sound-nua/gvc-log.h       2012-03-30 11:00:25.387494381 +0200
4373
4373
@@ -0,0 +1,35 @@
4374
4374
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
4375
4375
+ *
4406
4406
+G_END_DECLS
4407
4407
+
4408
4408
+#endif /* __GVC_LOG_H */
4409
 
Index: gnome-control-center-3.3.91/panels/sound-nua/gvc-mixer-card-private.h
 
4409
Index: gnome-control-center-3.4.0/panels/sound-nua/gvc-mixer-card-private.h
4410
4410
===================================================================
4411
4411
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
4412
 
+++ gnome-control-center-3.3.91/panels/sound-nua/gvc-mixer-card-private.h       2012-03-16 18:46:23.172915602 +0100
 
4412
+++ gnome-control-center-3.4.0/panels/sound-nua/gvc-mixer-card-private.h        2012-03-30 11:00:25.391494381 +0200
4413
4413
@@ -0,0 +1,35 @@
4414
4414
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
4415
4415
+ *
4446
4446
+G_END_DECLS
4447
4447
+
4448
4448
+#endif /* __GVC_MIXER_CARD_PRIVATE_H */
4449
 
Index: gnome-control-center-3.3.91/panels/sound-nua/gvc-mixer-card.c
 
4449
Index: gnome-control-center-3.4.0/panels/sound-nua/gvc-mixer-card.c
4450
4450
===================================================================
4451
4451
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
4452
 
+++ gnome-control-center-3.3.91/panels/sound-nua/gvc-mixer-card.c       2012-03-16 18:46:23.172915602 +0100
 
4452
+++ gnome-control-center-3.4.0/panels/sound-nua/gvc-mixer-card.c        2012-03-30 11:00:25.391494381 +0200
4453
4453
@@ -0,0 +1,549 @@
4454
4454
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
4455
4455
+ *
5000
5000
+        G_OBJECT_CLASS (gvc_mixer_card_parent_class)->finalize (object);
5001
5001
+}
5002
5002
+
5003
 
Index: gnome-control-center-3.3.91/panels/sound-nua/gvc-mixer-card.h
 
5003
Index: gnome-control-center-3.4.0/panels/sound-nua/gvc-mixer-card.h
5004
5004
===================================================================
5005
5005
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
5006
 
+++ gnome-control-center-3.3.91/panels/sound-nua/gvc-mixer-card.h       2012-03-16 18:46:23.172915602 +0100
 
5006
+++ gnome-control-center-3.4.0/panels/sound-nua/gvc-mixer-card.h        2012-03-30 11:00:25.391494381 +0200
5007
5007
@@ -0,0 +1,108 @@
5008
5008
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
5009
5009
+ *
5113
5113
+G_END_DECLS
5114
5114
+
5115
5115
+#endif /* __GVC_MIXER_CARD_H */
5116
 
Index: gnome-control-center-3.3.91/panels/sound-nua/gvc-mixer-control-private.h
 
5116
Index: gnome-control-center-3.4.0/panels/sound-nua/gvc-mixer-control-private.h
5117
5117
===================================================================
5118
5118
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
5119
 
+++ gnome-control-center-3.3.91/panels/sound-nua/gvc-mixer-control-private.h    2012-03-16 18:46:23.176915602 +0100
 
5119
+++ gnome-control-center-3.4.0/panels/sound-nua/gvc-mixer-control-private.h     2012-03-30 11:00:25.399494382 +0200
5120
5120
@@ -0,0 +1,35 @@
5121
5121
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
5122
5122
+ *
5153
5153
+G_END_DECLS
5154
5154
+
5155
5155
+#endif /* __GVC_MIXER_CONTROL_PRIVATE_H */
5156
 
Index: gnome-control-center-3.3.91/panels/sound-nua/gvc-mixer-control.c
 
5156
Index: gnome-control-center-3.4.0/panels/sound-nua/gvc-mixer-control.c
5157
5157
===================================================================
5158
5158
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
5159
 
+++ gnome-control-center-3.3.91/panels/sound-nua/gvc-mixer-control.c    2012-03-16 18:46:23.184915602 +0100
 
5159
+++ gnome-control-center-3.4.0/panels/sound-nua/gvc-mixer-control.c     2012-03-30 11:00:25.407494382 +0200
5160
5160
@@ -0,0 +1,3408 @@
5161
5161
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
5162
5162
+ *
8566
8566
+{
8567
8567
+       return (gdouble) PA_VOLUME_UI_MAX;
8568
8568
+}
8569
 
Index: gnome-control-center-3.3.91/panels/sound-nua/gvc-mixer-control.h
 
8569
Index: gnome-control-center-3.4.0/panels/sound-nua/gvc-mixer-control.h
8570
8570
===================================================================
8571
8571
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
8572
 
+++ gnome-control-center-3.3.91/panels/sound-nua/gvc-mixer-control.h    2012-03-16 18:46:23.184915602 +0100
 
8572
+++ gnome-control-center-3.4.0/panels/sound-nua/gvc-mixer-control.h     2012-03-30 11:00:25.411494382 +0200
8573
8573
@@ -0,0 +1,139 @@
8574
8574
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
8575
8575
+ *
8710
8710
+G_END_DECLS
8711
8711
+
8712
8712
+#endif /* __GVC_MIXER_CONTROL_H */
8713
 
Index: gnome-control-center-3.3.91/panels/sound-nua/gvc-mixer-dialog.c
 
8713
Index: gnome-control-center-3.4.0/panels/sound-nua/gvc-mixer-dialog.c
8714
8714
===================================================================
8715
8715
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
8716
 
+++ gnome-control-center-3.3.91/panels/sound-nua/gvc-mixer-dialog.c     2012-03-16 18:48:30.632920452 +0100
 
8716
+++ gnome-control-center-3.4.0/panels/sound-nua/gvc-mixer-dialog.c      2012-03-30 11:00:25.415494383 +0200
8717
8717
@@ -0,0 +1,2179 @@
8718
8718
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
8719
8719
+ *
10894
10894
+
10895
10895
+        return TRUE;
10896
10896
+}
10897
 
Index: gnome-control-center-3.3.91/panels/sound-nua/gvc-mixer-dialog.h
 
10897
Index: gnome-control-center-3.4.0/panels/sound-nua/gvc-mixer-dialog.h
10898
10898
===================================================================
10899
10899
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
10900
 
+++ gnome-control-center-3.3.91/panels/sound-nua/gvc-mixer-dialog.h     2012-03-16 18:46:23.208915604 +0100
 
10900
+++ gnome-control-center-3.4.0/panels/sound-nua/gvc-mixer-dialog.h      2012-03-30 11:00:25.419494383 +0200
10901
10901
@@ -0,0 +1,56 @@
10902
10902
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
10903
10903
+ *
10955
10955
+G_END_DECLS
10956
10956
+
10957
10957
+#endif /* __GVC_MIXER_DIALOG_H */
10958
 
Index: gnome-control-center-3.3.91/panels/sound-nua/gvc-mixer-event-role.c
 
10958
Index: gnome-control-center-3.4.0/panels/sound-nua/gvc-mixer-event-role.c
10959
10959
===================================================================
10960
10960
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
10961
 
+++ gnome-control-center-3.3.91/panels/sound-nua/gvc-mixer-event-role.c 2012-03-16 18:46:23.216915603 +0100
 
10961
+++ gnome-control-center-3.4.0/panels/sound-nua/gvc-mixer-event-role.c  2012-03-30 11:00:25.419494383 +0200
10962
10962
@@ -0,0 +1,231 @@
10963
10963
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
10964
10964
+ *
11191
11191
+
11192
11192
+        return GVC_MIXER_STREAM (object);
11193
11193
+}
11194
 
Index: gnome-control-center-3.3.91/panels/sound-nua/gvc-mixer-event-role.h
 
11194
Index: gnome-control-center-3.4.0/panels/sound-nua/gvc-mixer-event-role.h
11195
11195
===================================================================
11196
11196
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
11197
 
+++ gnome-control-center-3.3.91/panels/sound-nua/gvc-mixer-event-role.h 2012-03-16 18:46:23.220915604 +0100
 
11197
+++ gnome-control-center-3.4.0/panels/sound-nua/gvc-mixer-event-role.h  2012-03-30 11:00:25.419494383 +0200
11198
11198
@@ -0,0 +1,57 @@
11199
11199
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
11200
11200
+ *
11253
11253
+G_END_DECLS
11254
11254
+
11255
11255
+#endif /* __GVC_MIXER_EVENT_ROLE_H */
11256
 
Index: gnome-control-center-3.3.91/panels/sound-nua/gvc-mixer-sink-input.c
 
11256
Index: gnome-control-center-3.4.0/panels/sound-nua/gvc-mixer-sink-input.c
11257
11257
===================================================================
11258
11258
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
11259
 
+++ gnome-control-center-3.3.91/panels/sound-nua/gvc-mixer-sink-input.c 2012-03-16 18:46:23.224915604 +0100
 
11259
+++ gnome-control-center-3.4.0/panels/sound-nua/gvc-mixer-sink-input.c  2012-03-30 11:00:25.423494383 +0200
11260
11260
@@ -0,0 +1,166 @@
11261
11261
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
11262
11262
+ *
11424
11424
+
11425
11425
+        return GVC_MIXER_STREAM (object);
11426
11426
+}
11427
 
Index: gnome-control-center-3.3.91/panels/sound-nua/gvc-mixer-sink-input.h
 
11427
Index: gnome-control-center-3.4.0/panels/sound-nua/gvc-mixer-sink-input.h
11428
11428
===================================================================
11429
11429
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
11430
 
+++ gnome-control-center-3.3.91/panels/sound-nua/gvc-mixer-sink-input.h 2012-03-16 18:46:23.228915604 +0100
 
11430
+++ gnome-control-center-3.4.0/panels/sound-nua/gvc-mixer-sink-input.h  2012-03-30 11:00:25.427494383 +0200
11431
11431
@@ -0,0 +1,57 @@
11432
11432
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
11433
11433
+ *
11486
11486
+G_END_DECLS
11487
11487
+
11488
11488
+#endif /* __GVC_MIXER_SINK_INPUT_H */
11489
 
Index: gnome-control-center-3.3.91/panels/sound-nua/gvc-mixer-sink.c
 
11489
Index: gnome-control-center-3.4.0/panels/sound-nua/gvc-mixer-sink.c
11490
11490
===================================================================
11491
11491
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
11492
 
+++ gnome-control-center-3.3.91/panels/sound-nua/gvc-mixer-sink.c       2012-03-16 18:46:23.240915604 +0100
 
11492
+++ gnome-control-center-3.4.0/panels/sound-nua/gvc-mixer-sink.c        2012-03-30 11:00:25.427494383 +0200
11493
11493
@@ -0,0 +1,196 @@
11494
11494
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
11495
11495
+ *
11687
11687
+
11688
11688
+        return GVC_MIXER_STREAM (object);
11689
11689
+}
11690
 
Index: gnome-control-center-3.3.91/panels/sound-nua/gvc-mixer-sink.h
 
11690
Index: gnome-control-center-3.4.0/panels/sound-nua/gvc-mixer-sink.h
11691
11691
===================================================================
11692
11692
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
11693
 
+++ gnome-control-center-3.3.91/panels/sound-nua/gvc-mixer-sink.h       2012-03-16 18:46:23.276915607 +0100
 
11693
+++ gnome-control-center-3.4.0/panels/sound-nua/gvc-mixer-sink.h        2012-03-30 11:00:25.431494383 +0200
11694
11694
@@ -0,0 +1,57 @@
11695
11695
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
11696
11696
+ *
11749
11749
+G_END_DECLS
11750
11750
+
11751
11751
+#endif /* __GVC_MIXER_SINK_H */
11752
 
Index: gnome-control-center-3.3.91/panels/sound-nua/gvc-mixer-source-output.c
 
11752
Index: gnome-control-center-3.4.0/panels/sound-nua/gvc-mixer-source-output.c
11753
11753
===================================================================
11754
11754
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
11755
 
+++ gnome-control-center-3.3.91/panels/sound-nua/gvc-mixer-source-output.c      2012-03-16 18:46:23.280915607 +0100
 
11755
+++ gnome-control-center-3.4.0/panels/sound-nua/gvc-mixer-source-output.c       2012-03-30 11:00:25.435494384 +0200
11756
11756
@@ -0,0 +1,121 @@
11757
11757
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
11758
11758
+ *
11875
11875
+
11876
11876
+        return GVC_MIXER_STREAM (object);
11877
11877
+}
11878
 
Index: gnome-control-center-3.3.91/panels/sound-nua/gvc-mixer-source-output.h
 
11878
Index: gnome-control-center-3.4.0/panels/sound-nua/gvc-mixer-source-output.h
11879
11879
===================================================================
11880
11880
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
11881
 
+++ gnome-control-center-3.3.91/panels/sound-nua/gvc-mixer-source-output.h      2012-03-16 18:46:23.316915607 +0100
 
11881
+++ gnome-control-center-3.4.0/panels/sound-nua/gvc-mixer-source-output.h       2012-03-30 11:00:25.435494384 +0200
11882
11882
@@ -0,0 +1,57 @@
11883
11883
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
11884
11884
+ *
11937
11937
+G_END_DECLS
11938
11938
+
11939
11939
+#endif /* __GVC_MIXER_SOURCE_OUTPUT_H */
11940
 
Index: gnome-control-center-3.3.91/panels/sound-nua/gvc-mixer-source.c
 
11940
Index: gnome-control-center-3.4.0/panels/sound-nua/gvc-mixer-source.c
11941
11941
===================================================================
11942
11942
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
11943
 
+++ gnome-control-center-3.3.91/panels/sound-nua/gvc-mixer-source.c     2012-03-16 18:46:23.320915607 +0100
 
11943
+++ gnome-control-center-3.4.0/panels/sound-nua/gvc-mixer-source.c      2012-03-30 11:00:25.439494385 +0200
11944
11944
@@ -0,0 +1,196 @@
11945
11945
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
11946
11946
+ *
12138
12138
+
12139
12139
+        return GVC_MIXER_STREAM (object);
12140
12140
+}
12141
 
Index: gnome-control-center-3.3.91/panels/sound-nua/gvc-mixer-source.h
 
12141
Index: gnome-control-center-3.4.0/panels/sound-nua/gvc-mixer-source.h
12142
12142
===================================================================
12143
12143
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
12144
 
+++ gnome-control-center-3.3.91/panels/sound-nua/gvc-mixer-source.h     2012-03-16 18:46:23.320915607 +0100
 
12144
+++ gnome-control-center-3.4.0/panels/sound-nua/gvc-mixer-source.h      2012-03-30 11:00:25.439494385 +0200
12145
12145
@@ -0,0 +1,57 @@
12146
12146
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
12147
12147
+ *
12200
12200
+G_END_DECLS
12201
12201
+
12202
12202
+#endif /* __GVC_MIXER_SOURCE_H */
12203
 
Index: gnome-control-center-3.3.91/panels/sound-nua/gvc-mixer-stream-private.h
 
12203
Index: gnome-control-center-3.4.0/panels/sound-nua/gvc-mixer-stream-private.h
12204
12204
===================================================================
12205
12205
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
12206
 
+++ gnome-control-center-3.3.91/panels/sound-nua/gvc-mixer-stream-private.h     2012-03-16 18:46:23.324915608 +0100
 
12206
+++ gnome-control-center-3.4.0/panels/sound-nua/gvc-mixer-stream-private.h      2012-03-30 11:00:25.439494385 +0200
12207
12207
@@ -0,0 +1,34 @@
12208
12208
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
12209
12209
+ *
12239
12239
+G_END_DECLS
12240
12240
+
12241
12241
+#endif /* __GVC_MIXER_STREAM_PRIVATE_H */
12242
 
Index: gnome-control-center-3.3.91/panels/sound-nua/gvc-mixer-stream.c
 
12242
Index: gnome-control-center-3.4.0/panels/sound-nua/gvc-mixer-stream.c
12243
12243
===================================================================
12244
12244
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
12245
 
+++ gnome-control-center-3.3.91/panels/sound-nua/gvc-mixer-stream.c     2012-03-16 18:46:23.328915609 +0100
 
12245
+++ gnome-control-center-3.4.0/panels/sound-nua/gvc-mixer-stream.c      2012-03-30 11:00:25.443494385 +0200
12246
12246
@@ -0,0 +1,968 @@
12247
12247
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
12248
12248
+ *
13212
13212
+
13213
13213
+        G_OBJECT_CLASS (gvc_mixer_stream_parent_class)->finalize (object);
13214
13214
+}
13215
 
Index: gnome-control-center-3.3.91/panels/sound-nua/gvc-mixer-stream.h
 
13215
Index: gnome-control-center-3.4.0/panels/sound-nua/gvc-mixer-stream.h
13216
13216
===================================================================
13217
13217
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
13218
 
+++ gnome-control-center-3.3.91/panels/sound-nua/gvc-mixer-stream.h     2012-03-16 18:46:23.344915608 +0100
 
13218
+++ gnome-control-center-3.4.0/panels/sound-nua/gvc-mixer-stream.h      2012-03-30 11:00:25.447494385 +0200
13219
13219
@@ -0,0 +1,128 @@
13220
13220
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
13221
13221
+ *
13345
13345
+G_END_DECLS
13346
13346
+
13347
13347
+#endif /* __GVC_MIXER_STREAM_H */
13348
 
Index: gnome-control-center-3.3.91/panels/sound-nua/gvc-mixer-ui-device.c
 
13348
Index: gnome-control-center-3.4.0/panels/sound-nua/gvc-mixer-ui-device.c
13349
13349
===================================================================
13350
13350
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
13351
 
+++ gnome-control-center-3.3.91/panels/sound-nua/gvc-mixer-ui-device.c  2012-03-16 18:48:30.632920452 +0100
 
13351
+++ gnome-control-center-3.4.0/panels/sound-nua/gvc-mixer-ui-device.c   2012-03-30 11:00:25.447494385 +0200
13352
13352
@@ -0,0 +1,649 @@
13353
13353
+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 4; tab-width: 4 -*- */
13354
13354
+/*
13999
13999
+       return dev->priv->type == UiDeviceOutput;       
14000
14000
+}
14001
14001
+
14002
 
Index: gnome-control-center-3.3.91/panels/sound-nua/gvc-mixer-ui-device.h
 
14002
Index: gnome-control-center-3.4.0/panels/sound-nua/gvc-mixer-ui-device.h
14003
14003
===================================================================
14004
14004
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
14005
 
+++ gnome-control-center-3.3.91/panels/sound-nua/gvc-mixer-ui-device.h  2012-03-16 18:48:30.632920452 +0100
 
14005
+++ gnome-control-center-3.4.0/panels/sound-nua/gvc-mixer-ui-device.h   2012-03-30 11:00:25.451494384 +0200
14006
14006
@@ -0,0 +1,74 @@
14007
14007
+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 4; tab-width: 4 -*- */
14008
14008
+/*
14078
14078
+G_END_DECLS
14079
14079
+
14080
14080
+#endif /* _GVC_MIXER_UI_DEVICE_H_ */
14081
 
Index: gnome-control-center-3.3.91/panels/sound-nua/gvc-pulseaudio-fake.h
 
14081
Index: gnome-control-center-3.4.0/panels/sound-nua/gvc-pulseaudio-fake.h
14082
14082
===================================================================
14083
14083
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
14084
 
+++ gnome-control-center-3.3.91/panels/sound-nua/gvc-pulseaudio-fake.h  2012-03-16 18:46:23.348915608 +0100
 
14084
+++ gnome-control-center-3.4.0/panels/sound-nua/gvc-pulseaudio-fake.h   2012-03-30 11:00:25.467494385 +0200
14085
14085
@@ -0,0 +1,34 @@
14086
14086
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
14087
14087
+ *
14117
14117
+#endif /* WITH_INTROSPECTION */
14118
14118
+
14119
14119
+#endif /* __GVC_PULSEAUDIO_FAKE_H */
14120
 
Index: gnome-control-center-3.3.91/panels/sound-nua/gvc-sound-theme-chooser.c
 
14120
Index: gnome-control-center-3.4.0/panels/sound-nua/gvc-sound-theme-chooser.c
14121
14121
===================================================================
14122
14122
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
14123
 
+++ gnome-control-center-3.3.91/panels/sound-nua/gvc-sound-theme-chooser.c      2012-03-16 18:46:23.352915609 +0100
 
14123
+++ gnome-control-center-3.4.0/panels/sound-nua/gvc-sound-theme-chooser.c       2012-03-30 11:00:25.471494385 +0200
14124
14124
@@ -0,0 +1,856 @@
14125
14125
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
14126
14126
+ *
14978
14978
+                                NULL);
14979
14979
+        return GTK_WIDGET (chooser);
14980
14980
+}
14981
 
Index: gnome-control-center-3.3.91/panels/sound-nua/gvc-sound-theme-chooser.h
 
14981
Index: gnome-control-center-3.4.0/panels/sound-nua/gvc-sound-theme-chooser.h
14982
14982
===================================================================
14983
14983
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
14984
 
+++ gnome-control-center-3.3.91/panels/sound-nua/gvc-sound-theme-chooser.h      2012-03-16 18:46:23.352915609 +0100
 
14984
+++ gnome-control-center-3.4.0/panels/sound-nua/gvc-sound-theme-chooser.h       2012-03-30 11:00:25.471494385 +0200
14985
14985
@@ -0,0 +1,54 @@
14986
14986
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
14987
14987
+ *
15037
15037
+G_END_DECLS
15038
15038
+
15039
15039
+#endif /* __GVC_SOUND_THEME_CHOOSER_H */
15040
 
Index: gnome-control-center-3.3.91/panels/sound-nua/gvc-speaker-test.c
 
15040
Index: gnome-control-center-3.4.0/panels/sound-nua/gvc-speaker-test.c
15041
15041
===================================================================
15042
15042
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
15043
 
+++ gnome-control-center-3.3.91/panels/sound-nua/gvc-speaker-test.c     2012-03-16 18:46:23.356915609 +0100
 
15043
+++ gnome-control-center-3.4.0/panels/sound-nua/gvc-speaker-test.c      2012-03-30 11:00:25.471494385 +0200
15044
15044
@@ -0,0 +1,531 @@
15045
15045
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
15046
15046
+ *
15573
15573
+        return GTK_WIDGET (speaker_test);
15574
15574
+}
15575
15575
+
15576
 
Index: gnome-control-center-3.3.91/panels/sound-nua/gvc-speaker-test.h
 
15576
Index: gnome-control-center-3.4.0/panels/sound-nua/gvc-speaker-test.h
15577
15577
===================================================================
15578
15578
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
15579
 
+++ gnome-control-center-3.3.91/panels/sound-nua/gvc-speaker-test.h     2012-03-16 18:46:23.360915609 +0100
 
15579
+++ gnome-control-center-3.4.0/panels/sound-nua/gvc-speaker-test.h      2012-03-30 11:00:25.471494385 +0200
15580
15580
@@ -0,0 +1,57 @@
15581
15581
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
15582
15582
+ *
15635
15635
+G_END_DECLS
15636
15636
+
15637
15637
+#endif /* __GVC_SPEAKER_TEST_H */
15638
 
Index: gnome-control-center-3.3.91/panels/sound-nua/gvc-stream-status-icon.c
 
15638
Index: gnome-control-center-3.4.0/panels/sound-nua/gvc-stream-status-icon.c
15639
15639
===================================================================
15640
15640
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
15641
 
+++ gnome-control-center-3.3.91/panels/sound-nua/gvc-stream-status-icon.c       2012-03-16 18:46:23.364915609 +0100
 
15641
+++ gnome-control-center-3.4.0/panels/sound-nua/gvc-stream-status-icon.c        2012-03-30 11:00:25.475494385 +0200
15642
15642
@@ -0,0 +1,780 @@
15643
15643
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
15644
15644
+ *
16420
16420
+                             NULL);
16421
16421
+        return GVC_STREAM_STATUS_ICON (icon);
16422
16422
+}
16423
 
Index: gnome-control-center-3.3.91/panels/sound-nua/gvc-stream-status-icon.h
 
16423
Index: gnome-control-center-3.4.0/panels/sound-nua/gvc-stream-status-icon.h
16424
16424
===================================================================
16425
16425
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
16426
 
+++ gnome-control-center-3.3.91/panels/sound-nua/gvc-stream-status-icon.h       2012-03-16 18:46:23.368915609 +0100
 
16426
+++ gnome-control-center-3.4.0/panels/sound-nua/gvc-stream-status-icon.h        2012-03-30 11:00:25.479494386 +0200
16427
16427
@@ -0,0 +1,63 @@
16428
16428
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
16429
16429
+ *
16488
16488
+G_END_DECLS
16489
16489
+
16490
16490
+#endif /* __GVC_STREAM_STATUS_ICON_H */
16491
 
Index: gnome-control-center-3.3.91/panels/sound-nua/sound-theme-file-utils.c
 
16491
Index: gnome-control-center-3.4.0/panels/sound-nua/sound-theme-file-utils.c
16492
16492
===================================================================
16493
16493
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
16494
 
+++ gnome-control-center-3.3.91/panels/sound-nua/sound-theme-file-utils.c       2012-03-16 18:46:23.368915609 +0100
 
16494
+++ gnome-control-center-3.4.0/panels/sound-nua/sound-theme-file-utils.c        2012-03-30 11:00:25.483494386 +0200
16495
16495
@@ -0,0 +1,305 @@
16496
16496
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
16497
16497
+ * Copyright (C) 2008 Bastien Nocera <hadess@hadess.net>
16798
16798
+
16799
16799
+        custom_theme_update_time ();
16800
16800
+}
16801
 
Index: gnome-control-center-3.3.91/panels/sound-nua/sound-theme-file-utils.h
 
16801
Index: gnome-control-center-3.4.0/panels/sound-nua/sound-theme-file-utils.h
16802
16802
===================================================================
16803
16803
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
16804
 
+++ gnome-control-center-3.3.91/panels/sound-nua/sound-theme-file-utils.h       2012-03-16 18:46:23.372915609 +0100
 
16804
+++ gnome-control-center-3.4.0/panels/sound-nua/sound-theme-file-utils.h        2012-03-30 11:00:25.487494386 +0200
16805
16805
@@ -0,0 +1,37 @@
16806
16806
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
16807
16807
+ * Copyright (C) 2008 Bastien Nocera <hadess@hadess.net>
16840
16840
+void custom_theme_update_time (void);
16841
16841
+
16842
16842
+#endif /* __SOUND_THEME_FILE_UTILS_HH__ */
16843
 
Index: gnome-control-center-3.3.91/panels/sound/data/gnome-sound-panel.desktop.in.in
 
16843
Index: gnome-control-center-3.4.0/panels/sound/data/gnome-sound-panel.desktop.in.in
16844
16844
===================================================================
16845
 
--- gnome-control-center-3.3.91.orig/panels/sound/data/gnome-sound-panel.desktop.in.in  2012-03-05 15:04:55.000000000 +0100
16846
 
+++ gnome-control-center-3.3.91/panels/sound/data/gnome-sound-panel.desktop.in.in       2012-03-16 18:46:23.372915609 +0100
 
16845
--- gnome-control-center-3.4.0.orig/panels/sound/data/gnome-sound-panel.desktop.in.in   2012-02-14 11:13:17.000000000 +0100
 
16846
+++ gnome-control-center-3.4.0/panels/sound/data/gnome-sound-panel.desktop.in.in        2012-03-30 11:00:25.487494386 +0200
16847
16847
@@ -7,7 +7,7 @@
16848
16848
 Type=Application
16849
16849
 StartupNotify=true
16853
16853
 X-GNOME-Bugzilla-Bugzilla=GNOME
16854
16854
 X-GNOME-Bugzilla-Product=gnome-control-center
16855
16855
 X-GNOME-Bugzilla-Component=sound
 
16856
Index: gnome-control-center-3.4.0/panels/universal-access/cc-ua-panel.c
 
16857
===================================================================
 
16858
--- gnome-control-center-3.4.0.orig/panels/universal-access/cc-ua-panel.c       2012-03-30 11:02:14.783499676 +0200
 
16859
+++ gnome-control-center-3.4.0/panels/universal-access/cc-ua-panel.c    2012-03-30 11:04:24.819505969 +0200
 
16860
@@ -589,7 +589,10 @@
 
16861
   CcShell *shell;
 
16862
 
 
16863
   shell = cc_panel_get_shell (CC_PANEL (panel));
 
16864
-  cc_shell_set_active_panel_from_id (shell, "sound", NULL, NULL);
 
16865
+  if (g_strcmp0 (g_getenv ("XDG_CURRENT_DESKTOP"), "Unity") == 0)
 
16866
+    cc_shell_set_active_panel_from_id (shell, "sound-nua", NULL, NULL);
 
16867
+  else
 
16868
+    cc_shell_set_active_panel_from_id (shell, "sound", NULL, NULL);
 
16869
 
 
16870
   return TRUE;
 
16871
 }