← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/indicator-session/oneiric-proposed

« back to all changes in this revision

Viewing changes to src/indicator-session.c

  • Committer: Package Import Robot
  • Author(s): Sebastien Bacher
  • Date: 2011-09-09 11:18:26 UTC
  • mfrom: (1.1.40 upstream)
  • Revision ID: package-import@ubuntu.com-20110909111826-5cu458yxgnu4k3nu
Tags: 0.3.5.0-0ubuntu1
https://launchpad.net/bugs/842946
https://launchpad.net/bugs/835084
https://launchpad.net/bugs/840660
https://launchpad.net/bugs/844272
https://launchpad.net/bugs/812728
* New upstream release:
  - fix the updates menu items randomly working (lp: #842946)
  - "Guest Session should not show if guest session was disabled in 
     the display manager" (lp: #835084)
  - segfault fix (lp: #840660)
  - don't display temporary guest user generated username (lp: #844272)
  - respect "show-real-name-on-panel" to hide the username (lp: #812728)

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/indicator-session.c
507
507
                             &self->users);       
508
508
    }
509
509
  }
510
 
  else if (g_strcmp0(signal_name, "RestartRequired") == 0) {
 
510
  else if (g_strcmp0(signal_name, "RestartRequired") == 0) {    
511
511
    if (greeter_mode == TRUE){
512
512
      self->devices.image = indicator_image_helper (GREETER_ICON_RESTART);
513
513
    }
514
514
    else{
 
515
      g_debug ("reboot required");
515
516
      self->devices.image = indicator_image_helper (ICON_RESTART);      
516
517
    }
517
518
  }  
538
539
  if (g_strcmp0(translate, "1") != 0) {
539
540
    no_name_in_lang = TRUE;
540
541
  }
 
542
  
 
543
  GSettings* settings = g_settings_new ("com.canonical.indicator.session");
 
544
  gboolean use_username = g_settings_get_boolean (settings,
 
545
                                                  "use-username-in-switch-item");    
 
546
  g_object_unref (settings);
541
547
 
542
548
  if (variant == NULL || g_variant_get_string(variant, NULL) == NULL ||
543
 
      g_variant_get_string(variant, NULL)[0] == '\0' || no_name_in_lang) {
544
 
    finalstring = _("Switch User…");
 
549
      g_variant_get_string(variant, NULL)[0] == '\0' || no_name_in_lang 
 
550
      || use_username == FALSE) {
 
551
    finalstring = _("Switch User Account…");
545
552
    set_ellipsize = FALSE;
546
553
  }
547
554
 
586
593
      gtk_label_set_ellipsize(label, PANGO_ELLIPSIZE_NONE);
587
594
    }
588
595
  }
589
 
 
590
596
        return;
591
597
}
592
598
 
697
703
static void
698
704
indicator_session_update_users_label (IndicatorSession* self, 
699
705
                                      const gchar* name)
700
 
{
701
 
  g_debug ("update users label");
702
 
  
 
706
{  
703
707
  if (name == NULL){
704
708
    gtk_widget_hide(GTK_WIDGET(self->users.label));
705
709
    return;
706
710
  }  
 
711
 
 
712
  GSettings* settings = g_settings_new ("com.canonical.indicator.session");
 
713
  gboolean use_name = g_settings_get_boolean (settings,
 
714
                                              "show-real-name-on-panel");    
 
715
  g_object_unref (settings);
707
716
  gtk_label_set_text (self->users.label, g_strdup(name));
708
 
  gtk_widget_show(GTK_WIDGET(self->users.label));
 
717
  if (use_name){ 
 
718
    gtk_widget_show(GTK_WIDGET(self->users.label));
 
719
  }
 
720
  else{
 
721
    gtk_widget_hide(GTK_WIDGET(self->users.label));
 
722
  }
709
723
}