← Back to branch summary

~ubuntu-branches/ubuntu/saucy/evolution-data-server/saucy

« back to all changes in this revision

Viewing changes to libedataserverui/e-categories-selector.c

  • Committer: Package Import Robot
  • Author(s): Chris Coulson
  • Date: 2012-10-08 12:58:16 UTC
  • mfrom: (181.1.7 quantal)
  • Revision ID: package-import@ubuntu.com-20121008125816-i3n76e8c0m64e7xp
Tags: 3.6.0-0ubuntu2
https://launchpad.net/bugs/1038047
https://launchpad.net/bugs/1038047
* Fix LP: #1038047 part 1 - Don't abort in e_source_registry_new* when a
  problem occurs connecting to the Dbus service
  - add debian/patches/dont-abort-in-e_source_registry_new.patch
  - update debian/patches/series
* Fix LP: #1038047 part 2 - libedataserver depends on
  evolution-data-server-common to ensure that the GSettings schemas are
  present
  - update debian/control

Show diffs side-by-side

added added

removed removed

Lines of Context:
libedataserverui/e-categories-selector.c
137
137
                gchar *category;
138
138
                gboolean active;
139
139
 
140
 
                gtk_tree_model_get (model, &iter,
 
140
                gtk_tree_model_get (
 
141
                        model, &iter,
141
142
                        COLUMN_ACTIVE, &active,
142
143
                        COLUMN_CATEGORY, &category, -1);
143
144
 
465
466
                        gchar *category_name;
466
467
                        gboolean found;
467
468
 
468
 
                        gtk_tree_model_get (model, &iter,
 
469
                        gtk_tree_model_get (
 
470
                                model, &iter,
469
471
                                COLUMN_CATEGORY, &category_name,
470
472
                                -1);
471
473
                        found = (g_hash_table_lookup (
516
518
                gchar *category;
517
519
 
518
520
                gtk_tree_model_get_iter (model, &iter, path);
519
 
                gtk_tree_model_get (model, &iter,
 
521
                gtk_tree_model_get (
 
522
                        model, &iter,
520
523
                        COLUMN_CATEGORY, &category, -1);
521
524
                gtk_list_store_remove (GTK_LIST_STORE (model), &iter);
522
525
                e_categories_remove (category);
568
571
                gchar *category;
569
572
 
570
573
                gtk_tree_model_get_iter (model, &iter, path);
571
 
                gtk_tree_model_get (model, &iter,
 
574
                gtk_tree_model_get (
 
575
                        model, &iter,
572
576
                        COLUMN_CATEGORY, &category, -1);
573
577
                if (str->len == 0)
574
578
                        g_string_assign (str, category);