← Back to branch summary

~kelemeng/indicator-sound/bug957517

« back to all changes in this revision

Viewing changes to src/indicator-sound.c

  • Committer: Charles Kerr
  • Date: 2012-03-16 15:59:17 UTC
  • mfrom: (308.1.1 indicator-sound)
  • Revision ID: charles.kerr@canonical.com-20120316155917-ib4b97135lrw0vlm
don't abort isound via g_error() if it can't connect to the bus. lp:~cjcurran/indicator-sound/use_g_critical_instead_of_g_error

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/indicator-sound.c
299
299
    node_info = g_dbus_node_info_new_for_xml ( _sound_service,
300
300
                                                &error );
301
301
    if (error != NULL) {
302
 
      g_warning( "Failed to get create interface info from xml: %s",
303
 
                 error->message );
 
302
      g_critical ( "Failed to get create interface info from xml: %s",
 
303
                  error->message );
304
304
      g_error_free(error);
305
305
      return;
306
306
    }
310
310
    interface_info = g_dbus_node_info_lookup_interface (node_info,
311
311
                                                        INDICATOR_SOUND_DBUS_INTERFACE);
312
312
    if (interface_info == NULL) {
313
 
      g_error("Unable to find interface '" INDICATOR_SOUND_DBUS_INTERFACE "'");
 
313
      g_critical ("Unable to find interface '" INDICATOR_SOUND_DBUS_INTERFACE "'");
314
314
    }
315
315
  }
316
316
  
339
339
  priv->dbus_proxy = g_dbus_proxy_new_finish(res, &error);
340
340
 
341
341
  if (error != NULL) {
342
 
    g_warning("Failed to get dbus proxy: %s", error->message);
 
342
    g_critical ("Failed to get dbus proxy: %s", error->message);
343
343
    g_error_free(error);
344
344
    return;
345
345
  }