← Back to branch summary

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

« back to all changes in this revision

Viewing changes to addressbook/gui/merging/eab-contact-merging.c

  • Committer: Package Import Robot
  • Author(s): Mathieu Trudel-Lapierre
  • Date: 2011-09-08 09:38:57 UTC
  • mfrom: (1.1.84 upstream)
  • Revision ID: package-import@ubuntu.com-20110908093857-6lfl04ke2ns3kx2o
Tags: 3.1.91-0ubuntu1
https://launchpad.net/bugs/843769
* New upstream release. (LP: #843769)
* debian/control: bump e-d-s Build-Depends to 3.1.91. 

Show diffs side-by-side

added added

removed removed

Lines of Context:
addressbook/gui/merging/eab-contact-merging.c
210
210
}
211
211
 
212
212
static void
213
 
doit (EContactMergingLookup *lookup, gboolean force_modify)
 
213
doit (EContactMergingLookup *lookup,
 
214
      gboolean force_modify)
214
215
{
215
216
        if (lookup->op == E_CONTACT_MERGING_ADD) {
216
217
                if (force_modify)
236
237
}
237
238
 
238
239
static void
239
 
dialog_map (GtkWidget *window, GdkEvent *event, GtkWidget *table)
 
240
dialog_map (GtkWidget *window,
 
241
            GdkEvent *event,
 
242
            GtkWidget *table)
240
243
{
241
244
        GtkAllocation allocation;
242
245
        gint h, w;
256
259
}
257
260
 
258
261
static void
259
 
dropdown_changed (GtkWidget *dropdown, dropdown_data *data)
 
262
dropdown_changed (GtkWidget *dropdown,
 
263
                  dropdown_data *data)
260
264
{
261
265
        gchar *str;
262
266
        str = gtk_combo_box_text_get_active_text (GTK_COMBO_BOX_TEXT (dropdown));
357
361
                                                use_field = E_CONTACT_EMAIL_2;
358
362
                                                break;
359
363
                                        }
360
 
                                        else/*Either the new contact has no email OR the email already exist in the duplicate contact*/
 
364
                                        else/*Either the new contact has no email OR the email already exist in the duplicate contact */
361
365
                                                continue;
362
366
                                case 2:
363
367
                                        /*New contact has email and it is equal to neither of the 2 emails in the duplicate contact*/
381
385
                                }
382
386
                                label = gtk_label_new (_("Email"));
383
387
                                hbox = gtk_hbox_new (FALSE, 0);
384
 
                                gtk_box_pack_start (GTK_BOX (hbox), (GtkWidget*) label, FALSE, FALSE, 0);
 
388
                                gtk_box_pack_start (GTK_BOX (hbox), (GtkWidget *) label, FALSE, FALSE, 0);
385
389
                                gtk_table_attach_defaults (table, (GtkWidget *) hbox, 0, 1, row, row + 1);
386
390
 
387
391
                                dropdown = gtk_combo_box_text_new ();
398
402
                                g_signal_connect (dropdown, "changed", G_CALLBACK(dropdown_changed), data);
399
403
 
400
404
                                hbox = gtk_hbox_new (FALSE, 0);
401
 
                                gtk_box_pack_start (GTK_BOX (hbox), (GtkWidget*) dropdown, FALSE, FALSE, 0);
 
405
                                gtk_box_pack_start (GTK_BOX (hbox), (GtkWidget *) dropdown, FALSE, FALSE, 0);
402
406
                                gtk_table_attach_defaults (table, (GtkWidget *) hbox, 1, 2, row, row + 1);
403
407
                                gtk_widget_show ((GtkWidget *) dropdown);
404
408
                                continue;
407
411
                                row++;
408
412
                                label = gtk_label_new (e_contact_pretty_name (field));
409
413
                                hbox = gtk_hbox_new (FALSE, 0);
410
 
                                gtk_box_pack_start (GTK_BOX (hbox), (GtkWidget*) label, FALSE, FALSE, 0);
 
414
                                gtk_box_pack_start (GTK_BOX (hbox), (GtkWidget *) label, FALSE, FALSE, 0);
411
415
                                gtk_table_attach_defaults (table, (GtkWidget *) hbox, 0, 1, row, row + 1);
412
416
 
413
417
                                label = gtk_label_new (string);
414
418
                                hbox = gtk_hbox_new (FALSE, 0);
415
 
                                gtk_box_pack_start (GTK_BOX (hbox), (GtkWidget*) label, FALSE, FALSE, 0);
416
 
                                gtk_table_attach_defaults (table, (GtkWidget*) hbox, 1, 2, row, row + 1);
 
419
                                gtk_box_pack_start (GTK_BOX (hbox), (GtkWidget *) label, FALSE, FALSE, 0);
 
420
                                gtk_table_attach_defaults (table, (GtkWidget *) hbox, 1, 2, row, row + 1);
417
421
                                continue;
418
422
                        }
419
423
 
422
426
                                row++;
423
427
                                label = gtk_label_new (e_contact_pretty_name (field));
424
428
                                hbox = gtk_hbox_new (FALSE, 0);
425
 
                                gtk_box_pack_start (GTK_BOX (hbox), (GtkWidget*) label, FALSE, FALSE, 0);
 
429
                                gtk_box_pack_start (GTK_BOX (hbox), (GtkWidget *) label, FALSE, FALSE, 0);
426
430
                                gtk_table_attach_defaults (table, (GtkWidget *) hbox, 0, 1, row, row + 1);
427
431
                                data = g_new0 (dropdown_data, 1);
428
432
                                dropdown = gtk_combo_box_text_new ();
443
447
 
444
448
                                g_signal_connect (dropdown, "changed", G_CALLBACK(dropdown_changed), data);
445
449
                                hbox = gtk_hbox_new (FALSE, 0);
446
 
                                gtk_box_pack_start (GTK_BOX (hbox), (GtkWidget*) dropdown, FALSE, FALSE, 0);
 
450
                                gtk_box_pack_start (GTK_BOX (hbox), (GtkWidget *) dropdown, FALSE, FALSE, 0);
447
451
                                gtk_table_attach_defaults (table, (GtkWidget *) hbox, 1, 2, row, row + 1);
448
452
                                gtk_widget_show_all ((GtkWidget *) dropdown);
449
453
                        }
475
479
}
476
480
 
477
481
static gboolean
478
 
check_if_same (EContact *contact, EContact *match)
 
482
check_if_same (EContact *contact,
 
483
               EContact *match)
479
484
{
480
485
        EContactField field;
481
486
        GList *email_attr_list;
487
492
                num_of_email = g_list_length (email_attr_list);
488
493
 
489
494
                if ((field == E_CONTACT_EMAIL_1 || field == E_CONTACT_EMAIL_2
490
 
                     || field == E_CONTACT_EMAIL_3 || field == E_CONTACT_EMAIL_4) && (num_of_email<4)) {
 
495
                     || field == E_CONTACT_EMAIL_3 || field == E_CONTACT_EMAIL_4) && (num_of_email < 4)) {
491
496
                        str = (gchar *) e_contact_get_const (contact, field);
492
497
                        switch (num_of_email)
493
498
                        {
522
527
}
523
528
 
524
529
static void
525
 
response (GtkWidget *dialog, gint response, EContactMergingLookup *lookup)
 
530
response (GtkWidget *dialog,
 
531
          gint response,
 
532
          EContactMergingLookup *lookup)
526
533
{
527
534
        static gint merge_response;
528
535
 
547
554
}
548
555
 
549
556
static void
550
 
match_query_callback (EContact *contact, EContact *match, EABContactMatchType type, gpointer closure)
 
557
match_query_callback (EContact *contact,
 
558
                      EContact *match,
 
559
                      EABContactMatchType type,
 
560
                      gpointer closure)
551
561
{
552
562
        EContactMergingLookup *lookup = closure;
553
563
        gint flag;
631
641
 
632
642
gboolean
633
643
eab_merging_book_add_contact (EBookClient *book_client,
634
 
                              EContact *contact,
635
 
                              EABMergingIdAsyncCallback cb,
636
 
                              gpointer closure)
 
644
                              EContact *contact,
 
645
                              EABMergingIdAsyncCallback cb,
 
646
                              gpointer closure)
637
647
{
638
648
        EContactMergingLookup *lookup;
639
649
 
654
664
 
655
665
gboolean
656
666
eab_merging_book_modify_contact (EBookClient *book_client,
657
 
                                 EContact *contact,
658
 
                                 EABMergingAsyncCallback cb,
659
 
                                 gpointer closure)
 
667
                                 EContact *contact,
 
668
                                 EABMergingAsyncCallback cb,
 
669
                                 gpointer closure)
660
670
{
661
671
        EContactMergingLookup *lookup;
662
672
 
677
687
 
678
688
gboolean
679
689
eab_merging_book_find_contact (EBookClient *book_client,
680
 
                               EContact *contact,
681
 
                               EABMergingContactAsyncCallback cb,
682
 
                               gpointer closure)
 
690
                               EContact *contact,
 
691
                               EABMergingContactAsyncCallback cb,
 
692
                               gpointer closure)
683
693
{
684
694
        EContactMergingLookup *lookup;
685
695