← Back to branch summary

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

« back to all changes in this revision

Viewing changes to telepathy-glib/base-connection.c

  • Committer: Bazaar Package Importer
  • Author(s): Simon McVittie
  • Date: 2010-05-25 16:57:39 UTC
  • mfrom: (1.6.2 upstream) (30.1.1 experimental)
  • Revision ID: james.westby@ubuntu.com-20100525165739-kted5mhm904f8lwj
Tags: 0.11.6-1
* New upstream version
  - requires gtk-doc 1.15
  - requires gobject-introspection 0.6.11
  - new ABI, API
* Merge from experimental
  - add gir1.0-telepathyglib-0.12 binary package

Show diffs side-by-side

added added

removed removed

Lines of Context:
telepathy-glib/base-connection.c
2706
2706
                                               GHashTable *details,
2707
2707
                                               TpConnectionStatusReason reason)
2708
2708
{
2709
 
  GHashTable *dup = NULL;
 
2709
  GHashTable *dup_ = NULL;
2710
2710
 
2711
2711
  g_return_if_fail (TP_IS_BASE_CONNECTION (self));
2712
2712
  g_return_if_fail (tp_dbus_check_valid_interface_name (error_name, NULL));
2713
2713
 
2714
2714
  if (details == NULL)
2715
2715
    {
2716
 
      dup = g_hash_table_new (g_str_hash, g_str_equal);
2717
 
      details = dup;
 
2716
      dup_ = g_hash_table_new (g_str_hash, g_str_equal);
 
2717
      details = dup_;
2718
2718
    }
2719
2719
 
2720
2720
  tp_svc_connection_emit_connection_error (self, error_name, details);
2721
2721
  tp_base_connection_change_status (self, TP_CONNECTION_STATUS_DISCONNECTED,
2722
2722
      reason);
2723
2723
 
2724
 
  if (dup != NULL)
2725
 
    g_hash_table_destroy (dup);
 
2724
  if (dup_ != NULL)
 
2725
    g_hash_table_destroy (dup_);
2726
2726
}
2727
2727
 
2728
2728
/**