← Back to branch summary

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

« back to all changes in this revision

Viewing changes to libedataserverui/e-tree-model-generator.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-tree-model-generator.c
142
142
                        tree_model_generator->priv->root_nodes =
143
143
                                build_node_map (tree_model_generator, NULL, NULL, -1);
144
144
 
145
 
                        g_signal_connect_swapped (tree_model_generator->priv->child_model, "row-changed",
146
 
                                                  G_CALLBACK (child_row_changed), tree_model_generator);
147
 
                        g_signal_connect_swapped (tree_model_generator->priv->child_model, "row-deleted",
148
 
                                                  G_CALLBACK (child_row_deleted), tree_model_generator);
149
 
                        g_signal_connect_swapped (tree_model_generator->priv->child_model, "row-inserted",
150
 
                                                  G_CALLBACK (child_row_inserted), tree_model_generator);
 
145
                        g_signal_connect_swapped (
 
146
                                tree_model_generator->priv->child_model, "row-changed",
 
147
                                G_CALLBACK (child_row_changed), tree_model_generator);
 
148
                        g_signal_connect_swapped (
 
149
                                tree_model_generator->priv->child_model, "row-deleted",
 
150
                                G_CALLBACK (child_row_deleted), tree_model_generator);
 
151
                        g_signal_connect_swapped (
 
152
                                tree_model_generator->priv->child_model, "row-inserted",
 
153
                                G_CALLBACK (child_row_inserted), tree_model_generator);
151
154
                        break;
152
155
 
153
156
                default:
182
185
        ETreeModelGenerator *tree_model_generator = E_TREE_MODEL_GENERATOR (object);
183
186
 
184
187
        if (tree_model_generator->priv->child_model) {
185
 
                g_signal_handlers_disconnect_matched (tree_model_generator->priv->child_model,
186
 
                                                      G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL,
187
 
                                                      tree_model_generator);
 
188
                g_signal_handlers_disconnect_matched (
 
189
                        tree_model_generator->priv->child_model,
 
190
                        G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL,
 
191
                        tree_model_generator);
188
192
                g_object_unref (tree_model_generator->priv->child_model);
189
193
        }
190
194
 
521
525
        if (group->len - 1 - index > 0) {
522
526
                gint i;
523
527
 
524
 
                memmove ((Node *) group->data + index + 1,
525
 
                         (Node *) group->data + index,
526
 
                         (group->len - 1 - index) * sizeof (Node));
 
528
                memmove (
 
529
                        (Node *) group->data + index + 1,
 
530
                        (Node *) group->data + index,
 
531
                        (group->len - 1 - index) * sizeof (Node));
527
532
 
528
533
                /* Update parent pointers */
529
534
                for (i = index + 1; i < group->len; i++) {
548
553
        node->n_generated  = 0;
549
554
        node->child_nodes  = NULL;
550
555
 
551
 
        ETMG_DEBUG (g_print ("Created node at offset %d, parent_group = %p, parent_index = %d\n",
552
 
                             index, node->parent_group, node->parent_index));
 
556
        ETMG_DEBUG (
 
557
                g_print ("Created node at offset %d, parent_group = %p, parent_index = %d\n",
 
558
                index, node->parent_group, node->parent_index));
553
559
 
554
560
        return node;
555
561
}
565
571
 
566
572
        for (i = 0; i < group->len; i++) {
567
573
                Node *node = &g_array_index (group, Node, i);
568
 
                g_print ("  %04d: pgroup=%p, pindex=%d, n_generated=%d, child_nodes=%p\n",
569
 
                         i, node->parent_group, node->parent_index, node->n_generated, node->child_nodes);
 
574
                g_print (
 
575
                        "  %04d: pgroup=%p, pindex=%d, n_generated=%d, child_nodes=%p\n",
 
576
                        i, node->parent_group, node->parent_index, node->n_generated, node->child_nodes);
570
577
        }
571
578
}
572
579
 
742
749
{
743
750
        g_return_val_if_fail (GTK_IS_TREE_MODEL (child_model), NULL);
744
751
 
745
 
        return E_TREE_MODEL_GENERATOR (g_object_new (E_TYPE_TREE_MODEL_GENERATOR,
746
 
                                                     "child-model", child_model, NULL));
 
752
        return E_TREE_MODEL_GENERATOR (
 
753
                g_object_new (E_TYPE_TREE_MODEL_GENERATOR,
 
754
                "child-model", child_model, NULL));
747
755
}
748
756
 
749
757
/**
1321
1329
        g_return_if_fail (E_IS_TREE_MODEL_GENERATOR (tree_model));
1322
1330
        g_return_if_fail (ITER_IS_VALID (tree_model_generator, iter));
1323
1331
 
1324
 
        e_tree_model_generator_convert_iter_to_child_iter (tree_model_generator, &child_iter,
1325
 
                                                           &permutation_n, iter);
 
1332
        e_tree_model_generator_convert_iter_to_child_iter (
 
1333
                tree_model_generator, &child_iter,
 
1334
                &permutation_n, iter);
1326
1335
 
1327
1336
        if (tree_model_generator->priv->modify_func) {
1328
1337
                tree_model_generator->priv->modify_func (tree_model_generator->priv->child_model,