← Back to branch summary

~darkxst/ubuntu/saucy/gnome-shell/upstart_log

« back to all changes in this revision

Viewing changes to src/gvc/gvc-mixer-sink.c

  • Committer: Package Import Robot
  • Author(s): Jeremy Bicha
  • Date: 2013-05-31 12:01:12 UTC
  • mfrom: (1.1.49) (19.1.36 experimental)
  • Revision ID: package-import@ubuntu.com-20130531120112-ew91khxf051x9i2r
Tags: 3.8.2-1ubuntu1
https://launchpad.net/bugs/1185869
https://launchpad.net/bugs/1185721
https://launchpad.net/bugs/1064584
* Merge with Debian (LP: #1185869, #1185721). Remaining changes:
  - debian/control.in:
    + Build-depend on libsystemd-login-dev & libsystemd-daemon-dev
    + Depend on gdm instead of gdm3
    + Don't recommend gnome-session-fallback
  - debian/patches/40_change-pam-name-to-match-gdm.patch:
  - debian/patches/revert-suspend-break.patch:
    + Disabled, not needed on Ubuntu
  - debian/patches/ubuntu-lightdm-user-switching.patch:
    + Allow user switching when using LightDM. Thanks Gerhard Stein
      for rebasing against gnome-shell 3.8!
  - debian/patches/ubuntu_lock_on_suspend.patch
    + Respect Ubuntu's lock-on-suspend setting.
      Disabled until it can be rewritten.
  - debian/patches/git_relock_screen_after_crash.patch:
    + Add Upstream fix for unlocked session after crash (LP: #1064584)
* Note that the new GNOME Classic mode (which requires installing
  gnome-shell-extensions) won't work until gnome-session 3.8 is
  available in Ubuntu

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/gvc/gvc-mixer-sink.c
111
111
gvc_mixer_sink_change_port (GvcMixerStream *stream,
112
112
                            const char     *port)
113
113
{
114
 
#if PA_MICRO > 15
115
114
        pa_operation *o;
116
115
        guint         index;
117
116
        pa_context   *context;
133
132
        pa_operation_unref(o);
134
133
 
135
134
        return TRUE;
136
 
#else
137
 
        return FALSE;
138
 
#endif /* PA_MICRO > 15 */
139
135
}
140
136
 
141
137
static void
177
173
 * gvc_mixer_sink_new: (skip)
178
174
 * @context:
179
175
 * @index:
180
 
 * @map:
 
176
 * @channel_map:
181
177
 *
182
178
 * Returns:
183
179
 */