diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2009-12-11 20:21:27 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2009-12-11 20:21:27 +0000 |
| commit | 10e41144596fc9ced40fc349d9ecd099b1c2ea19 (patch) | |
| tree | 88ab04e475ff5a4cd889cb082f5760b6e0bf5e4e /kdmlib | |
| parent | 4aed2c8219774f5d797760606b8489a92ddc5163 (diff) | |
| download | tdebase-10e41144596fc9ced40fc349d9ecd099b1c2ea19.tar.gz tdebase-10e41144596fc9ced40fc349d9ecd099b1c2ea19.zip | |
Initial import of Trinity 3.5.11 to kdebase
Extends krandrtray, adds iccconfig kcontrol module, adds run dialog autocomplete and lots of bugfixes
Will need to check for commit warnings and repair as encountered
Also needs full compile test
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1061475 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kdmlib')
| -rw-r--r-- | kdmlib/dmctl.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/kdmlib/dmctl.cpp b/kdmlib/dmctl.cpp index 4475ae1e7..cd20ee4ab 100644 --- a/kdmlib/dmctl.cpp +++ b/kdmlib/dmctl.cpp @@ -42,7 +42,7 @@ static const char *ctl, *dpy; DM::DM() : fd( -1 ) { - const char *ptr; + char *ptr; struct sockaddr_un sa; if (DMType == Dunno) { @@ -77,8 +77,8 @@ DM::DM() : fd( -1 ) } GDMAuthenticate(); } else { - if ((ptr = strchr( dpy, ':' ))) - ptr = strchr( ptr, '.' ); + if ((ptr = (char*)strchr( dpy, ':' ))) + ptr = (char*)strchr( ptr, '.' ); snprintf( sa.sun_path, sizeof(sa.sun_path), "%s/dmctl-%.*s/socket", ctl, ptr ? int(ptr - dpy) : 512, dpy ); |