"~text" -> "~~text"

2 files changed, 15 insertions, 6 deletions

diff --git a/src/greetermenubar.c b/src/greetermenubar.c
index d8dd1b9..a25c9c4 100644
--- a/src/greetermenubar.c
+++ b/src/greetermenubar.c
@@ -55,7 +55,7 @@ greeter_menu_bar_size_allocate(GtkWidget* widget, GtkAllocation* allocation)
     GtkPackDirection pack_direction = gtk_menu_bar_get_pack_direction(GTK_MENU_BAR(widget));
     if(pack_direction != GTK_PACK_DIRECTION_LTR && pack_direction != GTK_PACK_DIRECTION_RTL)
     {
-        g_warning("GreeterMenuBar: invalid pack-direction value");
+        g_warning("GreeterMenuBar: vertical pack-direction is not supported");
         return;
     }
 
@@ -132,6 +132,7 @@ greeter_menu_bar_size_allocate(GtkWidget* widget, GtkAllocation* allocation)
 
         size = gtk_distribute_natural_allocation(size, visible_count, requested_sizes);
 
+        /* Distribution extra space for widgets with expand=True */
         if(size > 0 && expand_nums)
         {
             expand_nums = g_list_sort_with_data(expand_nums, (GCompareDataFunc)sort_minimal_size,
@@ -141,6 +142,12 @@ greeter_menu_bar_size_allocate(GtkWidget* widget, GtkAllocation* allocation)
             gint max_size = requested_sizes[GPOINTER_TO_INT(first_item->data)].natural_size;
             gint total_needed_size = 0;
 
+
+            /* Free space that all widgets need to have the same (max_size) width
+             * [___max_width___][widget         ][widget____     ]
+             * total_needed_size := [] + [         ] + [     ]
+             * total_needed_size = [              ]
+             */
             for(item = g_list_next(expand_nums); item; item = g_list_next(item))
                 total_needed_size += max_size - requested_sizes[GPOINTER_TO_INT(item->data)].natural_size;
 
@@ -148,9 +155,11 @@ greeter_menu_bar_size_allocate(GtkWidget* widget, GtkAllocation* allocation)
             {
                 if(size >= total_needed_size)
                 {
+                    /* total_needed_size is enough for all remaining widgets */
                     needed_size = max_size + (size - total_needed_size)/expand_count;
                     break;
                 }
+                /* Removing current maximal widget from list */
                 total_needed_size -= max_size - requested_sizes[GPOINTER_TO_INT(item->data)].natural_size;
                 first_item = g_list_next(first_item);
                 if(first_item)
@@ -186,4 +195,4 @@ greeter_menu_bar_size_allocate(GtkWidget* widget, GtkAllocation* allocation)
     }
     g_list_free(shell_children);
 }
-#endif
\ No newline at end of file
+#endif
diff --git a/src/lightdm-gtk-greeter.c b/src/lightdm-gtk-greeter.c
index 0d8bfcd..d5c6a09 100644
--- a/src/lightdm-gtk-greeter.c
+++ b/src/lightdm-gtk-greeter.c
@@ -503,16 +503,16 @@ init_indicators (GKeyFile* config)
                 gtk_menu_item_set_label (iter_value, "");
                 gtk_widget_set_hexpand (iter_value, TRUE);
             }
-            else
+            else if (names[i][1] == '~')
             {
                 item_type = PANEL_ITEM_TEXT;
                 iter_value = gtk_separator_menu_item_new ();
-                gtk_menu_item_set_label (iter_value, &names[i][1]);
+                gtk_menu_item_set_label (iter_value, &names[i][2]);
             }
-            #else
+            #endif
             else
                 continue;
-            #endif
+
             g_object_set_data (G_OBJECT (iter_value), PANEL_ITEM_DATA_INDEX, GINT_TO_POINTER (i));
             panel_add_item (iter_value, i, item_type);
             continue;