← Back to branch summary

~cjcurran/indicator-session/redundant-max-users-limit

« back to all changes in this revision

Viewing changes to src/indicator-session.c

  • Committer: Conor Curran
  • Date: 2011-09-08 18:09:38 UTC
  • mfrom: (208.1.2 indicator-session)
  • Revision ID: conor.curran@canonical.com-20110908180938-mpl3u4h20hyarqx4
Tags: 0.3.5.0
various switches for the strings on the panel and on the switch item

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/indicator-session.c
539
539
  if (g_strcmp0(translate, "1") != 0) {
540
540
    no_name_in_lang = TRUE;
541
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);
542
547
 
543
548
  if (variant == NULL || g_variant_get_string(variant, NULL) == NULL ||
544
 
      g_variant_get_string(variant, NULL)[0] == '\0' || no_name_in_lang) {
545
 
    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…");
546
552
    set_ellipsize = FALSE;
547
553
  }
548
554
 
587
593
      gtk_label_set_ellipsize(label, PANGO_ELLIPSIZE_NONE);
588
594
    }
589
595
  }
590
 
 
591
596
        return;
592
597
}
593
598
 
698
703
static void
699
704
indicator_session_update_users_label (IndicatorSession* self, 
700
705
                                      const gchar* name)
701
 
{
702
 
  g_debug ("update users label");
703
 
  
 
706
{  
704
707
  if (name == NULL){
705
708
    gtk_widget_hide(GTK_WIDGET(self->users.label));
706
709
    return;
707
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);
708
716
  gtk_label_set_text (self->users.label, g_strdup(name));
709
 
  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
  }
710
723
}