← Back to branch summary

~ubuntu-branches/ubuntu/maverick/evolution-data-server/maverick-proposed

« back to all changes in this revision

Viewing changes to libedataserverui/e-source-selector-dialog.c

  • Committer: Bazaar Package Importer
  • Author(s): Didier Roche
  • Date: 2010-05-17 17:02:06 UTC
  • mfrom: (1.1.79 upstream) (1.6.12 experimental)
  • Revision ID: james.westby@ubuntu.com-20100517170206-4ufr52vwrhh26yh0
Tags: 2.30.1-1ubuntu1
https://launchpad.net/bugs/42199
https://launchpad.net/bugs/229669
https://launchpad.net/bugs/173703
https://launchpad.net/bugs/360344
https://launchpad.net/bugs/508494
* Merge from debian experimental. Remaining change:
  (LP: #42199, #229669, #173703, #360344, #508494)
  + debian/control:
    - add Vcs-Bzr tag
    - don't use libgnome
    - Use Breaks instead of Conflicts against evolution 2.25 and earlier.
  + debian/evolution-data-server.install,
    debian/patches/45_libcamel_providers_version.patch:
    - use the upstream versioning, not a Debian-specific one 
  + debian/libedata-book1.2-dev.install, debian/libebackend-1.2-dev.install,
    debian/libcamel1.2-dev.install, debian/libedataserverui1.2-dev.install:
    - install html documentation
  + debian/rules:
    - don't build documentation it's shipped with the tarball

Show diffs side-by-side

added added

removed removed

Lines of Context:
libedataserverui/e-source-selector-dialog.c
129
129
        if (priv->selected_source)
130
130
                g_object_unref (priv->selected_source);
131
131
        priv->selected_source = e_source_selector_peek_primary_selection (selector);
 
132
 
 
133
        /* FIXME: add an API to "except-source" or to get the ESourceSelector from outside */
 
134
        if (priv->selected_source) {
 
135
                ESource *except_source = g_object_get_data (G_OBJECT (dialog), "except-source");
 
136
 
 
137
                if (except_source) {
 
138
                        const gchar *except_uid, *selected_uid;
 
139
 
 
140
                        except_uid = e_source_peek_uid (except_source);
 
141
                        selected_uid = e_source_peek_uid (priv->selected_source);
 
142
 
 
143
                        if (except_uid && selected_uid && g_str_equal (except_uid, selected_uid))
 
144
                                priv->selected_source = NULL;
 
145
                }
 
146
        }
 
147
 
132
148
        if (priv->selected_source) {
133
149
                g_object_ref (priv->selected_source);
134
150
                gtk_dialog_set_response_sensitive (GTK_DIALOG (dialog), GTK_RESPONSE_OK, TRUE);
198
214
 *
199
215
 * Create a new source selector dialog for the given @list.
200
216
 *
201
 
 * Return value: The newly created widget.
 
217
 * Returns: The newly created widget.
202
218
 */
203
219
GtkWidget *
204
220
e_source_selector_dialog_new (GtkWindow *parent, ESourceList *source_list)
218
234
 *
219
235
 * Selects default source in the dialog.
220
236
 *
221
 
 * Return value: Whether found any default source.
 
237
 * Returns: Whether found any default source.
 
238
 *
 
239
 * Since: 2.28
222
240
 **/
223
241
gboolean
224
242
e_source_selector_dialog_select_default_source (ESourceSelectorDialog *dialog)
264
282
 *
265
283
 * Peek the currently selected source in the given @dialog.
266
284
 *
267
 
 * Return value: the selected ESource.
 
285
 * Returns: the selected ESource.
268
286
 */
269
287
ESource *
270
288
e_source_selector_dialog_peek_primary_selection (ESourceSelectorDialog *dialog)