← Back to branch summary

~ubuntu-branches/ubuntu/gutsy/ekiga/gutsy

« back to all changes in this revision

Viewing changes to lib/gmcontacts/gmcontacts-eds.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Daniel Holbach
  • Date: 2006-02-13 22:43:18 UTC
  • mfrom: (1.1.1 upstream)
  • Revision ID: james.westby@ubuntu.com-20060213224318-1dn5o31239l0e3hg
Tags: 1.99.1-0ubuntu1
* [Kilian Krause <kilian@debian.org>]
  - New upstream release (2.0 BETA 2).
  - Name changed from GnomeMeeting to Ekiga.
* [Daniel Holbach]:
  - adjusted versions.
  - debian/control.in:
    - added liblaunchpad-integration-dev.
  - debian/patches/01_lpi.dpatch,
    debian/patches/02_autoconf.dpatch:
    - re-added, updated.

Show diffs side-by-side

added added

removed removed

Lines of Context:
lib/gmcontacts/gmcontacts-eds.cpp
267
267
    e_source_set_relative_uri (source, e_source_peek_uid (source));
268
268
    e_source_set_group (source, source_group);
269
269
    addressbook->name = NULL;
270
 
    addressbook->url = e_source_get_uri (source); 
 
270
    addressbook->url = e_source_get_uri (source);
271
271
    addressbook->aid = g_strdup (e_source_peek_uid (source));
272
272
    addressbook->call_attribute = NULL;
273
273
  }
330
330
          elmt = gm_addressbook_new ();
331
331
 
332
332
          elmt->name = g_strdup (e_source_peek_name (E_SOURCE (j->data)));
 
333
          if (elmt->aid)
 
334
            g_free (elmt->aid);
333
335
          elmt->aid = g_strdup (aid); 
 
336
          if (elmt->url)
 
337
            g_free (elmt->url);
334
338
          elmt->url = g_strdup (uri); 
335
339
 
336
340
          addressbooks = g_slist_append (addressbooks, (gpointer) elmt);
428
432
          while (l) {
429
433
 
430
434
            contact = gmcontact_new ();
 
435
            if (contact->uid)
 
436
              g_free (contact->uid);
431
437
 
432
438
            contact->uid =  
433
439
              g_strdup ((const gchar *) e_contact_get_const (E_CONTACT (l->data), 
460
466
                         && strcmp (contact->speeddial, "")))
461
467
                 || !speeddial))
462
468
              contacts = g_slist_append (contacts, (gpointer) contact);
 
469
            else
 
470
              gmcontact_delete (contact);
463
471
 
464
472
            l = g_list_next (l);
465
473
          }
508
516
  e_source_set_relative_uri (source, e_source_peek_uid (source));
509
517
  e_source_set_group (source, source_group);
510
518
 
511
 
  if (addressbook->aid) {
512
 
    
 
519
  if (addressbook->aid) 
513
520
    g_free (addressbook->aid);
514
 
  }
515
521
  addressbook->aid = g_strdup (e_source_peek_uid (E_SOURCE (source)));
 
522
 
 
523
  if (addressbook->url)
 
524
    g_free (addressbook->url);
516
525
  addressbook->url = e_source_get_uri (source);
517
526
 
518
527
  e_source_group_add_source (source_group, source, -1); 
646
655
        g_list_free (l);
647
656
      }
648
657
    }
 
658
 
649
659
  }
650
660
 
651
661