← Back to branch summary

~dylanmccall/indicator-sound/notifications-use-new-volume

« back to all changes in this revision

Viewing changes to src/indicator-sound.c

  • Committer: Conor Curran
  • Date: 2011-04-04 08:46:34 UTC
  • mfrom: (235.1.1 indicator-sound)
  • Revision ID: conor.curran@canonical.com-20110404084634-lgqxu210fntz7qav
ensure that there are no visual traces of the service crashing

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/indicator-sound.c
137
137
  
138
138
  IndicatorSoundPrivate* priv = INDICATOR_SOUND_GET_PRIVATE(self);
139
139
  priv->volume_widget = NULL;
 
140
  priv->voip_widget = NULL;
140
141
  priv->dbus_proxy = NULL;
141
142
  GList* t_list = NULL;
142
143
  priv->transport_widgets_list = t_list;
407
408
  g_return_val_if_fail(DBUSMENU_IS_GTKCLIENT(client), FALSE);
408
409
 
409
410
  io = g_object_get_data (G_OBJECT (client), "indicator");
 
411
  IndicatorSoundPrivate* priv = INDICATOR_SOUND_GET_PRIVATE(INDICATOR_SOUND (io));
 
412
 
 
413
  if (priv->volume_widget != NULL){ 
 
414
    volume_widget_tidy_up (priv->volume_widget);
 
415
    gtk_widget_destroy (priv->volume_widget);
 
416
    priv->volume_widget = NULL;
 
417
  }
410
418
  volume_widget = volume_widget_new (newitem, io);
411
 
  IndicatorSoundPrivate* priv = INDICATOR_SOUND_GET_PRIVATE(INDICATOR_SOUND (io));
412
419
  priv->volume_widget = volume_widget;
413
420
 
414
421
  GtkWidget* ido_slider_widget = volume_widget_get_ido_slider(VOLUME_WIDGET(priv->volume_widget));
452
459
  io = g_object_get_data (G_OBJECT (client), "indicator");
453
460
  IndicatorSoundPrivate* priv = INDICATOR_SOUND_GET_PRIVATE(INDICATOR_SOUND (io));
454
461
 
 
462
  if (priv->voip_widget != NULL){ 
 
463
    voip_input_widget_tidy_up (priv->voip_widget);
 
464
    gtk_widget_destroy (priv->voip_widget);
 
465
    priv->voip_widget = NULL;
 
466
  }
 
467
 
455
468
  voip_widget = voip_input_widget_new (newitem);
456
469
  priv->voip_widget = voip_widget;
457
470