← Back to branch summary

~ps-jenkins/unity-settings-daemon/ubuntu-vivid-proposed

« back to all changes in this revision

Viewing changes to plugins/media-keys/gvc/gvc-mixer-control.c

  • Committer: David Henningsson
  • Date: 2014-02-15 08:33:21 UTC
  • mto: This revision was merged to the branch mainline in revision 4014.
  • Revision ID: david.henningsson@canonical.com-20140215083321-3p4zdc5nybs487eb
Add what-did-you-plug-in dialog functionality

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugins/media-keys/gvc/gvc-mixer-control.c
114
114
        INPUT_ADDED,
115
115
        OUTPUT_REMOVED,
116
116
        INPUT_REMOVED,
 
117
        CARD_INFO,
117
118
        LAST_SIGNAL
118
119
};
119
120
 
2150
2151
                }
2151
2152
        }
2152
2153
        g_signal_emit (G_OBJECT (control),
 
2154
                       signals[CARD_INFO],
 
2155
                       0,
 
2156
                       info);
 
2157
        g_signal_emit (G_OBJECT (control),
2153
2158
                       signals[CARD_ADDED],
2154
2159
                       0,
2155
2160
                       info->index);
3206
3211
                              NULL, NULL,
3207
3212
                              g_cclosure_marshal_VOID__UINT,
3208
3213
                              G_TYPE_NONE, 1, G_TYPE_UINT);
 
3214
        signals [CARD_INFO] =
 
3215
                g_signal_new ("card-info",
 
3216
                              G_TYPE_FROM_CLASS (klass),
 
3217
                              G_SIGNAL_RUN_LAST,
 
3218
                              0,
 
3219
                              NULL, NULL,
 
3220
                              g_cclosure_marshal_VOID__POINTER,
 
3221
                              G_TYPE_NONE, 1, G_TYPE_POINTER);
3209
3222
        signals [CARD_ADDED] =
3210
3223
                g_signal_new ("card-added",
3211
3224
                              G_TYPE_FROM_CLASS (klass),