← Back to branch summary

~ubuntu-branches/ubuntu/precise/evolution/precise

« back to all changes in this revision

Viewing changes to addressbook/gui/widgets/e-addressbook-model.c

  • Committer: Bazaar Package Importer
  • Author(s): Mathieu Trudel-Lapierre
  • Date: 2011-06-24 00:27:53 UTC
  • mfrom: (1.1.80 upstream)
  • Revision ID: james.westby@ubuntu.com-20110624002753-2vh1vjavlya7r103
Tags: 3.1.2-0ubuntu1
* New upstream release 3.1.2.
* debian/control: adjust Build-Depends to match new upstream requirements for
  the new release.
* debian/control: update evolution and evolution-dev Depends to require the
  right versions of e-d-s (>= 3.1, << 3.2), and drop libunique-3.0-dev.
* debian/control,
  debian/evolution.install: remove groupwise-features from the plugin list,
  it's now split out into a separate module.
* debian/patches/03_lpi.patch: refreshed.

Show diffs side-by-side

added added

removed removed

Lines of Context:
addressbook/gui/widgets/e-addressbook-model.c
20
20
 *
21
21
 */
22
22
 
 
23
#ifdef HAVE_CONFIG_H
23
24
#include <config.h>
 
25
#endif
 
26
 
24
27
#include <string.h>
25
28
#include <glib/gi18n.h>
26
29
#include "e-addressbook-model.h"
392
395
                remove_book_view (model);
393
396
 
394
397
                if (model->priv->first_get_view) {
 
398
                        gboolean do_initial_query;
 
399
 
395
400
                        model->priv->first_get_view = FALSE;
396
401
 
397
 
                        if (e_book_check_static_capability (model->priv->book, "do-initial-query")) {
 
402
                        do_initial_query = e_book_check_static_capability (
 
403
                                model->priv->book, "do-initial-query");
 
404
 
 
405
                        if (do_initial_query) {
398
406
                                e_book_get_book_view_async (
399
407
                                        model->priv->book, model->priv->query,
400
408
                                        NULL, limit, book_view_loaded, model);
401
409
                        } else {
402
410
                                free_data (model);
403
411
 
404
 
                                g_signal_emit (model,
405
 
                                               signals[MODEL_CHANGED], 0);
406
 
                                g_signal_emit (model,
407
 
                                               signals[STOP_STATE_CHANGED], 0);
 
412
                                g_signal_emit (
 
413
                                        model, signals[MODEL_CHANGED], 0);
 
414
                                g_signal_emit (
 
415
                                        model, signals[STOP_STATE_CHANGED], 0);
408
416
                        }
409
417
                } else
410
418
                        e_book_get_book_view_async (
757
765
        g_signal_emit (model, signals[STATUS_MESSAGE], 0, message);
758
766
 
759
767
        if (!model->priv->remove_status_id)
760
 
                model->priv->remove_status_id = g_timeout_add_seconds (3, remove_status_cb, model);
 
768
                model->priv->remove_status_id =
 
769
                        g_timeout_add_seconds (3, remove_status_cb, model);
761
770
}
762
771
 
763
772
gboolean
904
913
{
905
914
        g_return_val_if_fail (E_IS_ADDRESSBOOK_MODEL (model), NULL);
906
915
 
 
916
        if (!model->priv->query)
 
917
                return NULL;
 
918
 
907
919
        return e_book_query_to_string (model->priv->query);
908
920
}
909
921
 
920
932
        else
921
933
                book_query = e_book_query_from_string (query);
922
934
 
 
935
        if (!book_query)
 
936
                return;
 
937
 
923
938
        if (model->priv->query != NULL) {
924
939
                gchar *old_query, *new_query;
925
940