← Back to branch summary

~prateek.karandikar/ubuntu/precise/pidgin/add_quicklist

« back to all changes in this revision

Viewing changes to pidgin/plugins/vvconfig.c

  • Committer: Bazaar Package Importer
  • Author(s): Micah Gersten
  • Date: 2011-04-11 03:27:22 UTC
  • mfrom: (2.3.17 sid)
  • Revision ID: james.westby@ubuntu.com-20110411032722-farsw08i6ouj5dnd
Tags: 1:2.7.11-1ubuntu1
https://launchpad.net/bugs/757146
* Merge from Debian unstable (LP: #757146), remaining changes:
  + debian/control:
    - Add libtool and liblaunchpad-integration-dev build depends
    - Bump standards version
    - Relax binary depends on pidgin versions
    - Add pidgin-libnotify as Recommends for pidgin binary
    - Fix description of pidgin binary
    - Don't have libpurple-bin depend on libpurple0
  + debian/libpurple0.symbols: add epoch to appropriate symbols
  + Add debian/patches:
    - 02_lpi.patch
    - 04_let_crasher_for_apport.patch
    - 05_default_to_irc_ubuntu_com.patch
    - 10_docklet_default_off.patch
    - 11_buddy_list_really_show.patch
    - 13_sounds_and_timers.patch
    - 60_1024x600_gtkpounce.c.patch
    - 60_1024x600_gtkprefs.c.patch
  + debian/prefs.xml: add notification prefs
  + debian/rules:
    - Add translation domain to desktop file with gettext
    - Add the launcher for pidgin

* Add configure check for launchpad integration attached to the gtk check since 
  upstream dropped the startup notification check which is where this check was 
  previously
  - update debian/patches/02_lpi.patch

Show diffs side-by-side

added added

removed removed

Lines of Context:
pidgin/plugins/vvconfig.c
82
82
        GstPropertyProbe *probe;
83
83
        const GParamSpec *pspec;
84
84
 
85
 
        if (!strcmp(element_name, "<custom>")) {
86
 
                ret = g_list_prepend(ret, NULL);
87
 
                ret = g_list_prepend(ret, (gpointer)_("Default"));
88
 
                ret = g_list_prepend(ret, "");
89
 
                return ret;
90
 
        }
91
 
 
92
85
        ret = g_list_prepend(ret, (gpointer)_("Default"));
93
86
        ret = g_list_prepend(ret, "");
94
87
 
95
 
        if (*element_name == '\0') {
96
 
                ret = g_list_prepend(ret, NULL);
97
 
                ret = g_list_reverse(ret);
98
 
                return ret;
 
88
        if (!strcmp(element_name, "<custom>") || (*element_name == '\0')) {
 
89
                return g_list_reverse(ret);
99
90
        }
100
91
 
101
92
        element = gst_element_factory_make(element_name, "test");
120
111
                array = gst_property_probe_probe_and_get_values (probe, pspec);
121
112
                if (array == NULL) {
122
113
                        purple_debug_info("vvconfig", "'%s' has no devices\n", element_name);
123
 
                        ret = g_list_prepend(ret, NULL);
124
 
                        ret = g_list_reverse(ret);
125
 
                        return ret;
 
114
                        return g_list_reverse(ret);
126
115
                }
127
 
                        
 
116
 
128
117
                for (n=0; n < array->n_values; ++n) {
129
118
                        GValue *device;
130
119
                        const gchar *name;
152
141
                }
153
142
        }
154
143
        gst_object_unref(element);
155
 
        
156
 
        ret = g_list_prepend(ret, NULL);
157
 
        ret = g_list_reverse(ret);
158
144
 
159
 
        return ret;
 
145
        return g_list_reverse(ret);
160
146
}
161
147
 
162
148
static GList *
173
159
                        ret = g_list_prepend(ret, (gpointer)plugins[0]);
174
160
                }
175
161
        }
176
 
        ret = g_list_prepend(ret, NULL);
177
162
        ret = g_list_reverse(ret);
178
163
        return ret;
179
164
}
236
221
        pref = g_strdup(name);
237
222
        strcpy(pref + strlen(pref) - strlen("plugin"), "device");
238
223
        devices = get_element_devices(value);
239
 
        if (g_list_find(devices, purple_prefs_get_string(pref)) == NULL)
 
224
        if (g_list_find_custom(devices, purple_prefs_get_string(pref),
 
225
                        (GCompareFunc)strcmp) == NULL)
240
226
                purple_prefs_set_string(pref, g_list_next(devices)->data);
241
227
        widget = pidgin_prefs_dropdown_from_list(parent,
242
228
                        label, PURPLE_PREF_STRING,
273
259
 
274
260
        /* Setup device preference */
275
261
        devices = get_element_devices(purple_prefs_get_string(plugin_pref));
276
 
        if (g_list_find(devices, purple_prefs_get_string(device_pref)) == NULL)
 
262
        if (g_list_find_custom(devices, purple_prefs_get_string(device_pref),
 
263
                        (GCompareFunc) strcmp) == NULL)
277
264
                purple_prefs_set_string(device_pref, g_list_next(devices)->data);
278
265
        widget = pidgin_prefs_dropdown_from_list(vbox, device_label,
279
266
                        PURPLE_PREF_STRING, device_pref, devices);
526
513
                GtkWidget *hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_BORDER);
527
514
                GtkWidget *config_frame = get_plugin_config_frame(NULL);
528
515
                GtkWidget *close = gtk_button_new_from_stock(GTK_STOCK_CLOSE);
529
 
                
 
516
 
530
517
                gtk_container_add(GTK_CONTAINER(vbox), config_frame);
531
518
                gtk_container_add(GTK_CONTAINER(vbox), hbox);
532
519
                window = pidgin_create_window(_("Voice/Video Settings"),
533
520
                        PIDGIN_HIG_BORDER, NULL, TRUE);
534
 
                g_signal_connect(G_OBJECT(window), "destroy", 
 
521
                g_signal_connect(G_OBJECT(window), "destroy",
535
522
                        G_CALLBACK(config_destroy), NULL);
536
523
                g_signal_connect(G_OBJECT(close), "clicked",
537
524
                    G_CALLBACK(config_close), NULL);