Skip to content

Remove outdated indicator names #731

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lenemter merged 1 commit into from
Sep 18, 2026
Merged

Remove outdated indicator names #731

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions lib/Indicator.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,19 +19,14 @@

public abstract class Wingpanel.Indicator : GLib.Object {
public const string APP_LAUNCHER = "app-launcher";
public const string SESSION = "session";
public const string DATETIME = "datetime";
public const string NETWORK = "network";
public const string MESSAGES = "messages";
public const string SOUND = "sound";
public const string POWER = "power";
public const string SYNC = "sync";
public const string PRINTER = "printer";
public const string BLUETOOTH = "bluetooth";
public const string KEYBOARD = "keyboard";
public const string NIGHT_LIGHT = "nightlight";
public const string PRIVACY = "privacy";
public const string ACCESSIBILITY = "a11y";
public const string QUICKSETTINGS = "quick-settings";

/**
Expand Down
34 changes: 11 additions & 23 deletions src/Widgets/IndicatorEntry.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,7 @@
*/

public class Wingpanel.Widgets.IndicatorEntry : Granite.Bin {
private const string UNKNOWN_INDICATOR = "xxx-unknown";
private const string AYATANA_INDICATOR = "xxx-ayatana";
private const int UNKNOWN_INDICATOR_ORDER = 0;

public Indicator base_indicator { get; construct; }
public Services.PopoverManager popover_manager { get; construct; }
Expand Down Expand Up @@ -56,21 +55,15 @@ public class Wingpanel.Widgets.IndicatorEntry : Granite.Bin {
}

static construct {
indicator_order[AYATANA_INDICATOR] = 0;
indicator_order[UNKNOWN_INDICATOR] = 1;
indicator_order[Indicator.ACCESSIBILITY] = 2;
indicator_order[Indicator.NIGHT_LIGHT] = 3;
indicator_order[Indicator.PRIVACY] = 4;
indicator_order[Indicator.KEYBOARD] = 5;
indicator_order[Indicator.SOUND] = 6;
indicator_order[Indicator.NETWORK] = 7;
indicator_order[Indicator.BLUETOOTH] = 8;
indicator_order[Indicator.PRINTER] = 9;
indicator_order[Indicator.SYNC] = 10;
indicator_order[Indicator.POWER] = 11;
indicator_order[Indicator.MESSAGES] = 12;
indicator_order[Indicator.QUICKSETTINGS] = 13;
indicator_order[Indicator.SESSION] = 14;
// 0 is reserved for UNKNOWN_INDICATOR_ORDER
indicator_order[Indicator.NIGHT_LIGHT] = 1;
indicator_order[Indicator.KEYBOARD] = 2;
indicator_order[Indicator.SOUND] = 3;
indicator_order[Indicator.NETWORK] = 4;
indicator_order[Indicator.BLUETOOTH] = 5;
indicator_order[Indicator.POWER] = 6;
indicator_order[Indicator.MESSAGES] = 7;
indicator_order[Indicator.QUICKSETTINGS] = 8;
}

class construct {
Expand Down Expand Up @@ -170,15 +163,10 @@ public class Wingpanel.Widgets.IndicatorEntry : Granite.Bin {
}

private static int get_order (Wingpanel.Widgets.IndicatorEntry node) {
/* ayatana application indicators on the left of the native indicators */
if (node.base_indicator.code_name.has_prefix ("ayatana-")) {
return indicator_order[AYATANA_INDICATOR];
}

if (indicator_order.has_key (node.base_indicator.code_name)) {
return indicator_order[node.base_indicator.code_name];
}

return indicator_order[UNKNOWN_INDICATOR];
return UNKNOWN_INDICATOR_ORDER;
}
}
Loading