diff options
author | a1346054 <36859588+a1346054@users.noreply.github.com> | 2022-08-27 14:01:30 +0000 |
---|---|---|
committer | a1346054 <36859588+a1346054@users.noreply.github.com> | 2022-09-01 14:55:04 +0000 |
commit | 4b21130a8d5c537dc56fca502bf06a1a0978517d (patch) | |
tree | a9006795a83c5233c6bd1499c70340fce70fd406 | |
parent | 233bfc81cd26db2c4f566ebf2a437c427f443855 (diff) | |
download | lightdm-gtk-greeter-git-4b21130a8d5c537dc56fca502bf06a1a0978517d.tar.gz |
Stop mixing tabs and spaces
-rw-r--r-- | README.md | 1 | ||||
-rw-r--r-- | data/sample-lightdm-gtk-greeter.css | 6 | ||||
-rw-r--r-- | src/greeter_menu_bar.xml | 4 | ||||
-rw-r--r-- | src/greeterbackground.c | 16 | ||||
-rw-r--r-- | src/greetermenubar.c | 32 | ||||
-rw-r--r-- | src/greetermenubar.h | 4 | ||||
-rw-r--r-- | src/lightdm-gtk-greeter.c | 28 |
7 files changed, 45 insertions, 46 deletions
@@ -55,4 +55,3 @@ Questions about LightDM and LightDM GTK Greeter should be asked on the [mailing - [Releases](https://github.com/xubuntu/lightdm-gtk-greeter/releases) - [Bug Reports](https://github.com/xubuntu/lightdm-gtk-greeter/issues) - [Translations](https://www.transifex.com/xubuntu/lightdm-gtk-greeter) - diff --git a/data/sample-lightdm-gtk-greeter.css b/data/sample-lightdm-gtk-greeter.css index 1ef1c38..42b125f 100644 --- a/data/sample-lightdm-gtk-greeter.css +++ b/data/sample-lightdm-gtk-greeter.css @@ -19,7 +19,7 @@ For more fine-grain control, you can also use the named widgets. Those are being /************************* * 2. Advanced theme * *************************/ - + /* the panel widget at the top */ #panel_window { background-color: alpha (black, 0.5); @@ -89,7 +89,7 @@ For more fine-grain control, you can also use the named widgets. Those are being #login_window GtkComboBox .button:active:hover:focus { padding: 0; background: none; - border-style: none; + border-style: none; box-shadow: none; } @@ -130,7 +130,7 @@ For more fine-grain control, you can also use the named widgets. Those are being ); color: @lightdm_fg_color; - + box-shadow: none; transition: all 150ms ease-out; } diff --git a/src/greeter_menu_bar.xml b/src/greeter_menu_bar.xml index a009c1a..aa3d378 100644 --- a/src/greeter_menu_bar.xml +++ b/src/greeter_menu_bar.xml @@ -1,7 +1,7 @@ -<glade-catalog name="greeter_menu_bar" domain="glade-3" +<glade-catalog name="greeter_menu_bar" domain="glade-3" depends="gtk+" version="1.0"> <glade-widget-classes> - <glade-widget-class title="Greeter MenuBar" name="GreeterMenuBar" + <glade-widget-class title="Greeter MenuBar" name="GreeterMenuBar" generic-name="GreeterMenuBar" parent="GtkMenuBar" icon-name="widget-gtk-window"/> </glade-widget-classes> diff --git a/src/greeterbackground.c b/src/greeterbackground.c index b1666d8..a3da135 100644 --- a/src/greeterbackground.c +++ b/src/greeterbackground.c @@ -139,13 +139,13 @@ static const Monitor INVALID_MONITOR_STRUCT = {0}; struct _GreeterBackground { - GObject parent_instance; - struct _GreeterBackgroundPrivate* priv; + GObject parent_instance; + struct _GreeterBackgroundPrivate* priv; }; struct _GreeterBackgroundClass { - GObjectClass parent_class; + GObjectClass parent_class; }; typedef struct _GreeterBackgroundPrivate GreeterBackgroundPrivate; @@ -166,11 +166,11 @@ struct _GreeterBackgroundPrivate /* Default config for unlisted monitors */ MonitorConfig* default_config; - /* Array of configured monitors for current screen */ + /* Array of configured monitors for current screen */ Monitor* monitors; gsize monitors_size; - /* Name => <Monitor*>, "Number" => <Monitor*> */ + /* Name => <Monitor*>, "Number" => <Monitor*> */ GHashTable* monitors_map; GList* active_monitors_config; @@ -327,7 +327,7 @@ static const MonitorConfig DEFAULT_MONITOR_CONFIG = static void greeter_background_class_init(GreeterBackgroundClass* klass) { - GObjectClass* gobject_class = G_OBJECT_CLASS(klass); + GObjectClass* gobject_class = G_OBJECT_CLASS(klass); background_signals[BACKGROUND_SIGNAL_ACTIVE_MONITOR_CHANGED] = g_signal_new("active-monitor-changed", @@ -376,7 +376,7 @@ greeter_background_new(GtkWidget* child) background = GREETER_BACKGROUND(g_object_new(greeter_background_get_type(), NULL)); background->priv->child = child; g_signal_connect(background->priv->child, "destroy", G_CALLBACK(greeter_background_child_destroyed_cb), background); - return background; + return background; } void @@ -643,7 +643,7 @@ greeter_background_connect(GreeterBackground* background, monitor_set_background(monitor, bg); background_unref(&bg); } - else + else monitor_set_background(monitor, monitor->background_configured); if(monitor->name) diff --git a/src/greetermenubar.c b/src/greetermenubar.c index 31e6041..6aa7136 100644 --- a/src/greetermenubar.c +++ b/src/greetermenubar.c @@ -19,8 +19,8 @@ G_DEFINE_TYPE(GreeterMenuBar, greeter_menu_bar, GTK_TYPE_MENU_BAR); static void greeter_menu_bar_class_init(GreeterMenuBarClass* klass) { - GtkWidgetClass* widget_class = GTK_WIDGET_CLASS(klass); - widget_class->size_allocate = greeter_menu_bar_size_allocate; + GtkWidgetClass* widget_class = GTK_WIDGET_CLASS(klass); + widget_class->size_allocate = greeter_menu_bar_size_allocate; } static void @@ -32,7 +32,7 @@ greeter_menu_bar_init(GreeterMenuBar* square) GtkWidget* greeter_menu_bar_new(void) { - return GTK_WIDGET(g_object_new(greeter_menu_bar_get_type(), NULL)); + return GTK_WIDGET(g_object_new(greeter_menu_bar_get_type(), NULL)); } static gint @@ -46,15 +46,15 @@ sort_minimal_size(gconstpointer a, gconstpointer b, GtkRequestedSize* sizes) static void greeter_menu_bar_size_allocate(GtkWidget* widget, GtkAllocation* allocation) { - GtkPackDirection pack_direction; - GList *item; - GList *shell_children; - GList *expand_nums = NULL; - guint visible_count = 0; - guint expand_count = 0; + GtkPackDirection pack_direction; + GList *item; + GList *shell_children; + GList *expand_nums = NULL; + guint visible_count = 0; + guint expand_count = 0; - g_return_if_fail(allocation != NULL); - g_return_if_fail(GREETER_IS_MENU_BAR(widget)); + g_return_if_fail(allocation != NULL); + g_return_if_fail(GREETER_IS_MENU_BAR(widget)); gtk_widget_set_allocation(widget, allocation); @@ -89,9 +89,9 @@ greeter_menu_bar_size_allocate(GtkWidget* widget, GtkAllocation* allocation) GtkShadowType shadow_type = GTK_SHADOW_OUT; GtkBorder border; gint toggle_size; - GtkRequestedSize* request; - gboolean ltr; - int size; + GtkRequestedSize* request; + gboolean ltr; + int size; gtk_style_context_get_padding(context, flags, &border); gtk_widget_style_get(widget, "shadow-type", &shadow_type, NULL); @@ -142,7 +142,7 @@ greeter_menu_bar_size_allocate(GtkWidget* widget, GtkAllocation* allocation) /* Distribution extra space for widgets with expand=True */ if(size > 0 && expand_nums) { - GList *first_item = NULL; + GList *first_item = NULL; gint needed_size = -1; gint max_size = 0; gint total_needed_size = 0; @@ -177,7 +177,7 @@ greeter_menu_bar_size_allocate(GtkWidget* widget, GtkAllocation* allocation) for(item = first_item; item; item = g_list_next(item)) { - gint dsize = 0; + gint dsize = 0; request = &requested_sizes[GPOINTER_TO_INT(item->data)]; dsize = needed_size - request->natural_size; diff --git a/src/greetermenubar.h b/src/greetermenubar.h index 333aff9..feb48a2 100644 --- a/src/greetermenubar.h +++ b/src/greetermenubar.h @@ -27,12 +27,12 @@ typedef struct _GreeterMenuBarClass GreeterMenuBarClass; struct _GreeterMenuBar { - GtkMenuBar parent_instance; + GtkMenuBar parent_instance; }; struct _GreeterMenuBarClass { - GtkMenuBarClass parent_class; + GtkMenuBarClass parent_class; }; GType greeter_menu_bar_get_type(void) G_GNUC_CONST; diff --git a/src/lightdm-gtk-greeter.c b/src/lightdm-gtk-greeter.c index 83c69e7..ad6e73e 100644 --- a/src/lightdm-gtk-greeter.c +++ b/src/lightdm-gtk-greeter.c @@ -1062,7 +1062,7 @@ set_session (const gchar *session) menu_iter = menu_items; if (menu_iter) - gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (menu_iter->data), TRUE); + gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (menu_iter->data), TRUE); } g_free (current_session); @@ -2152,19 +2152,19 @@ start_authentication (const gchar *username) lightdm_greeter_authenticate (greeter, NULL); #endif - if (lightdm_greeter_get_lock_hint (greeter)) - { - GList * items = lightdm_user_list_get_users (lightdm_user_list_get_instance ()); - for (GList * item = items; item; item = item->next) - { - LightDMUser *user = item->data; - if( lightdm_user_get_logged_in (user)) - { - gtk_entry_set_text (username_entry,lightdm_user_get_name(user)); - break; - } - } - } + if (lightdm_greeter_get_lock_hint (greeter)) + { + GList * items = lightdm_user_list_get_users (lightdm_user_list_get_instance ()); + for (GList * item = items; item; item = item->next) + { + LightDMUser *user = item->data; + if( lightdm_user_get_logged_in (user)) + { + gtk_entry_set_text (username_entry,lightdm_user_get_name(user)); + break; + } + } + } } else if (g_strcmp0 (username, "*guest") == 0) { |