Skip to content

Commit 16cf990

Browse files
JosephMccclefebvre
authored andcommitted
Convert the network auth dialog to a clutter dialog
1 parent d368157 commit 16cf990

File tree

11 files changed

+1810
-8
lines changed

11 files changed

+1810
-8
lines changed

debian/control

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ Build-Depends:
2929
libpolkit-agent-1-dev (>= 0.100),
3030
libpulse-dev,
3131
librsvg2-dev,
32+
libsecret-1-dev,
3233
libstartup-notification0-dev (>= 0.11),
3334
libxapp-dev (>= 2.6.0),
3435
meson,

js/misc/config.js.in

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,5 @@
44
var PACKAGE_NAME = '@PACKAGE_NAME@';
55
/* The version of this package */
66
var PACKAGE_VERSION = '@PACKAGE_VERSION@';
7+
/* 1 if networkmanager is available, 0 otherwise */
8+
var HAVE_NETWORKMANAGER = @HAVE_NETWORKMANAGER@;

js/ui/main.js

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,7 @@ const PointerTracker = imports.misc.pointerTracker;
9090

9191
const SoundManager = imports.ui.soundManager;
9292
const BackgroundManager = imports.ui.backgroundManager;
93+
const Config = imports.misc.config;
9394
const SlideshowManager = imports.ui.slideshowManager;
9495
var AppletManager = imports.ui.appletManager;
9596
const SearchProviderManager = imports.ui.searchProviderManager;
@@ -107,6 +108,7 @@ const KeyringPrompt = imports.ui.keyringPrompt;
107108
const RunDialog = imports.ui.runDialog;
108109
const Layout = imports.ui.layout;
109110
const LookingGlass = imports.ui.lookingGlass;
111+
const NetworkAgent = imports.ui.networkAgent;
110112
const NotificationDaemon = imports.ui.notificationDaemon;
111113
const WindowAttentionHandler = imports.ui.windowAttentionHandler;
112114
const CinnamonDBus = imports.ui.cinnamonDBus;
@@ -163,6 +165,7 @@ var xdndHandler = null;
163165
var statusIconDispatcher = null;
164166
var virtualKeyboard = null;
165167
var layoutManager = null;
168+
var networkAgent = null;
166169
var monitorLabeler = null;
167170
var themeManager = null;
168171
var keybindingManager = null;
@@ -419,6 +422,9 @@ function start() {
419422
windowAttentionHandler = new WindowAttentionHandler.WindowAttentionHandler();
420423
placesManager = new PlacesManager.PlacesManager();
421424

425+
if (Config.HAVE_NETWORKMANAGER)
426+
networkAgent = new NetworkAgent.NetworkAgent();
427+
422428
magnifier = new Magnifier.Magnifier();
423429
locatePointer = new LocatePointer.locatePointer();
424430

0 commit comments

Comments
 (0)