← Back to branch summary

~ubuntu-branches/ubuntu/maverick/telepathy-glib/maverick

« back to all changes in this revision

Viewing changes to telepathy-glib/handle-repo-dynamic.c

  • Committer: Bazaar Package Importer
  • Author(s): Simon McVittie
  • Date: 2010-05-10 17:59:54 UTC
  • mfrom: (1.6.1 upstream) (27.1.3 sid)
  • Revision ID: james.westby@ubuntu.com-20100510175954-bxvqq3xx0sy4itmp
Tags: 0.11.5-1
New upstream version with new API/ABI

Show diffs side-by-side

added added

removed removed

Lines of Context:
telepathy-glib/handle-repo-dynamic.c
48
48
#include <telepathy-glib/dbus.h>
49
49
#include <telepathy-glib/heap.h>
50
50
#include <telepathy-glib/handle-repo-internal.h>
 
51
#include <telepathy-glib/util.h>
 
52
 
 
53
#define DEBUG_FLAG TP_DEBUG_HANDLES
 
54
#include "telepathy-glib/debug-internal.h"
51
55
 
52
56
/**
53
57
 * TpDynamicHandleRepoNormalizeFunc:
281
285
{
282
286
  TpDynamicHandleRepo *repo = user_data;
283
287
 
284
 
  if (new_owner == NULL || new_owner[0] == '\0')
 
288
  if (tp_str_empty (new_owner))
285
289
    {
286
290
      tp_dbus_daemon_cancel_name_owner_watch (dbus_daemon, name,
287
291
          handles_name_owner_changed_cb, repo);
302
306
  self->bus_daemon = tp_dbus_daemon_dup (NULL);
303
307
 
304
308
  if (self->bus_daemon == NULL)
305
 
    g_error ("Unable to connect to starter bus");
 
309
    ERROR ("Unable to connect to starter bus");
306
310
 
307
311
  return;
308
312
}
640
644
 
641
645
  if (!client_name || *client_name == '\0')
642
646
    {
643
 
      g_critical ("%s: called with invalid client name", G_STRFUNC);
 
647
      CRITICAL ("called with invalid client name");
644
648
      g_set_error (error, TP_ERRORS, TP_ERROR_INVALID_ARGUMENT,
645
649
          "invalid client name");
646
650
      return FALSE;
682
686
 
683
687
  if (!client_name || *client_name == '\0')
684
688
    {
685
 
      g_critical ("%s: called with invalid client name", G_STRFUNC);
 
689
      CRITICAL ("called with invalid client name");
686
690
      g_set_error (error, TP_ERRORS, TP_ERROR_INVALID_ARGUMENT,
687
691
          "invalid client name");
688
692
      return FALSE;