← 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-name-selector-entry.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-name-selector-entry.c
480
480
 
481
481
/**
482
482
 * ens_util_populate_user_query_fields:
 
483
 *
483
484
 * Populates list of user query fields to string usable in query string.
484
485
 * Returned pointer is either newly allocated string, supposed to be freed with g_free,
485
486
 * or NULL if no fields defined.
 
487
 *
 
488
 * Since: 2.24
486
489
 **/
487
490
gchar *
488
491
ens_util_populate_user_query_fields (GSList *user_query_fields, const gchar *cue_str, const gchar *encoded_cue_str)
2486
2489
                        show_menu = TRUE;
2487
2490
                        g_object_set_data (G_OBJECT (menu_item), "order", GINT_TO_POINTER (i));
2488
2491
 
2489
 
                        if ( i == email_num && len > 1 ) {
 
2492
                        if (i == email_num && len > 1) {
2490
2493
                                gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (menu_item), TRUE);
2491
2494
                                g_signal_connect_swapped (menu_item, "activate", G_CALLBACK (popup_activate_email),
2492
2495
                                                          name_selector_entry);
2739
2742
 *
2740
2743
 * Creates a new #ENameSelectorEntry.
2741
2744
 *
2742
 
 * Return value: A new #ENameSelectorEntry.
 
2745
 * Returns: A new #ENameSelectorEntry.
2743
2746
 **/
2744
2747
ENameSelectorEntry *
2745
2748
e_name_selector_entry_new (void)
2753
2756
 *
2754
2757
 * Gets the #EContactStore being used by @name_selector_entry.
2755
2758
 *
2756
 
 * Return value: An #EContactStore.
 
2759
 * Returns: An #EContactStore.
2757
2760
 **/
2758
2761
EContactStore *
2759
2762
e_name_selector_entry_peek_contact_store (ENameSelectorEntry *name_selector_entry)
2795
2798
 *
2796
2799
 * Gets the #EDestinationStore being used to store @name_selector_entry's destinations.
2797
2800
 *
2798
 
 * Return value: An #EDestinationStore.
 
2801
 * Returns: An #EDestinationStore.
2799
2802
 **/
2800
2803
EDestinationStore *
2801
2804
e_name_selector_entry_peek_destination_store (ENameSelectorEntry *name_selector_entry)