Skip to content

Commit 0ff67cf

Browse files
committed
Application: Remove unnecessary command_line override
1 parent f24e6d5 commit 0ff67cf

File tree

1 file changed

+4
-13
lines changed

1 file changed

+4
-13
lines changed

src/Application.vala

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -23,15 +23,16 @@ namespace Cherrypick {
2323
public class Application : Gtk.Application {
2424
private Window? window;
2525
private Xdp.Portal portal;
26+
private static bool is_immediately_pick = false;
2627

2728
private OptionEntry[] CMD_OPTION_ENTRIES = {
28-
{"immediately-pick", 'p', OptionFlags.NONE, OptionArg.NONE, null, _("Immediately pick a colour and copy it to clipboard"), null}
29+
{"immediately-pick", 'p', OptionFlags.NONE, OptionArg.NONE, ref is_immediately_pick, _("Immediately pick a colour and copy it to clipboard"), null}
2930
};
3031

3132
public Application () {
3233
Object (
3334
application_id: "io.github.ellie_commons.cherrypick",
34-
flags: ApplicationFlags.HANDLES_COMMAND_LINE
35+
flags: ApplicationFlags.FLAGS_NONE
3536
);
3637
}
3738

@@ -96,23 +97,13 @@ namespace Cherrypick {
9697
} else {
9798
window.present ();
9899
}
99-
}
100-
101-
public override int command_line (ApplicationCommandLine command) {
102100

103101
/* Opens and immediately starts picking color if the --immediately-pick
104102
flag is passed when launching from the command line. This could
105103
be helpful for the user to set up keybindings and stuff */
106-
var options = command.get_options_dict ();
107-
if (options.contains ("immediately-pick")) {
104+
if (Application.is_immediately_pick) {
108105
immediately_pick ();
109-
110106
}
111-
112-
//FIXME: Prevent window from showing if we do an immediate pick
113-
//Quit or anything that makes Activate not do a window, end up in Picking failing
114-
activate ();
115-
return 0;
116107
}
117108

118109
private void immediately_pick () {

0 commit comments

Comments
 (0)