← Back to branch summary

~bilalakhtar/unity/software-center-integration-for-o

« back to all changes in this revision

Viewing changes to plugins/unityshell/src/LauncherEntryRemoteModel.cpp

  • Committer: Bilal Akhtar
  • Date: 2012-01-15 14:03:49 UTC
  • mfrom: (1346.2.488 unity)
  • Revision ID: bilalakhtar@ubuntu.com-20120115140349-mht4dke0occbsyra
Merge from trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugins/unityshell/src/LauncherEntryRemoteModel.cpp
86
86
  {
87
87
    g_dbus_connection_signal_unsubscribe(_conn,
88
88
                                         _launcher_entry_dbus_signal_id);
89
 
    _launcher_entry_dbus_signal_id = 0;
 
89
  }
 
90
  if (_dbus_name_owner_changed_signal_id && _conn)
 
91
  {
 
92
    g_dbus_connection_signal_unsubscribe(_conn,
 
93
                                         _dbus_name_owner_changed_signal_id);
90
94
  }
91
95
 
92
96
  if (_conn)
320
324
 
321
325
  self = static_cast<LauncherEntryRemoteModel*>(user_data);
322
326
 
323
 
  if (parameters == NULL)
 
327
  if (parameters == NULL || self->_entries_by_uri == NULL)
324
328
    return;
325
329
 
326
330
  g_variant_get(parameters, "(sss)", &name, &before, &after);