lp://staging/~rohangarg/telepathy-kde/ktp-kded-module
- Get this branch:
- bzr branch lp://staging/~rohangarg/telepathy-kde/ktp-kded-module
Branch merges
Branch information
Recent revisions
- 155. By Martin Klapetek
-
Merge branch 'kde-telepathy-0.5'
Conflicts:
config/kcm_ktp_ integration_ module. desktop
error-handler.cpp
kded_ktp_integration_ module. desktop - 154. By David Edmundson <email address hidden>
-
Supress all errors unless we are connected to the network
BUG: 303498
REVIEW: 107654Conflicts:
error-handler.cpp - 152. By Peter Amidon <email address hidden>
-
Fixed the auto-offline checkbox to correctly not allow tristate.
The auto-offline checkbox will now not allow tristate settings when
the user has selected 'never ask me again' or checked/unchecked the
checkbox (that is when dont_check_for_plasmoid is true). It is only in
tristate before that happens when the checkbox will show up every time
the user exits. - 151. By Peter Amidon <email address hidden>
-
Fixed the on-quit go offline? dialog box to always write to file.
Updated the on-quit go offline? dialog box to allow re-invocation when
it is set to never prompt again -- useful for when the go offline
checkbox is reset to manual. It previously didn't write to the file
when the user selected stay online -- because of this if the user
selects never ask me again and then go offline, then they get the
dialog back again through the new checkbox, and say stay online never
ask again, it doesn't use the correct choice. - 149. By David Edmundson <email address hidden>
-
Merge branch 'error_
handler_ name_tidy' REVIEW: 107306
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)