[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: =?utf-8?q?=5Bkde-workspace=5D_/=3A_Merge_branch_=27master=27_of_?=
From: Ryan Rix <ry () n ! rix ! si>
Date: 2011-05-10 16:28:38
Message-ID: 20110510162838.39CFBA60A6 () git ! kde ! org
[Download RAW message or body]
Git commit 7a9c4cb28dda131cffd04f303ca176f7d3c77b6c by Ryan Rix.
Committed on 10/05/2011 at 18:28.
Pushed by ryanrix into branch 'master'.
Merge branch 'master' of git://anongit.kde.org/kde-workspace
I +7 -0 CMakeLists.txt
I +2 -0 freespacenotifier/freespacenotifier.notifyrc
I +1 -0 kcontrol/access/kaccess.notifyrc
I +1 -0 kcontrol/access/kcmaccess.desktop
I +1 -0 kcontrol/autostart/autostart.desktop
I +1 -0 kcontrol/bell/bell.desktop
I +1 -0 kcontrol/colors/colors.desktop
I +1 -0 kcontrol/desktoppaths/desktoppath.desktop
I +2 -0 kcontrol/fonts/fonts.desktop
I +2 -0 kcontrol/hardware/display/display.desktop
I +1 -0 kcontrol/hardware/joystick/joystick.desktop
I +2 -0 kcontrol/input/mouse.desktop
I +2 -0 kcontrol/keyboard/kcm_keyboard.desktop
I +1 -0 kcontrol/keyboard/keyboard.desktop
I +2 -0 kcontrol/keyboard/plasma_applet_keyboard.desktop
I +2 -0 kcontrol/keys/keys.desktop
I +1 -0 kcontrol/kfontinst/apps/installfont.desktop
I +2 -0 kcontrol/kfontinst/apps/kfontview.desktop
I +1 -0 kcontrol/kfontinst/dbus/fontinst.actions
I +1 -0 kcontrol/kfontinst/kcmfontinst/fontinst.desktop
I +1 -0 kcontrol/kfontinst/kio/fonts.desktop
I +1 -0 kcontrol/kfontinst/viewpart/kfontviewpart.desktop
I +2 -0 kcontrol/screensaver/screensaver.desktop
I +1 -0 kcontrol/style/style.desktop
I +1 -0 kcontrol/workspaceoptions/workspaceoptions.desktop
I +1 -0 kcontrol/xinerama/xinerama.desktop
I +0 -1 kdm/backend/session.c
I +15 -12 kdm/config.def
I +1 -0 kdm/kfrontend/sessions/9wm.desktop
I +1 -0 kdm/kfrontend/sessions/aewm++.desktop
I +1 -0 kdm/kfrontend/sessions/aewm.desktop
I +1 -0 kdm/kfrontend/sessions/afterstep.desktop
I +1 -0 kdm/kfrontend/sessions/gnome.desktop
I +1 -0 kdm/kfrontend/sessions/metacity.desktop
I +1 -0 kdm/kfrontend/sessions/openbox.desktop
I +8 -85 kdm/kfrontend/sessions/xfce4.desktop
I +0 -1 kdm/kfrontend/themes/CMakeLists.txt
I +1 -0 kdm/kfrontend/themes/circles/KdmGreeterTheme.desktop
I +0 -16 kdm/kfrontend/themes/ethais/CMakeLists.txt
I +0 -66 kdm/kfrontend/themes/ethais/KdmGreeterTheme.desktop
I +0 -150 kdm/kfrontend/themes/ethais/ethais.xml
I +- -- kdm/kfrontend/themes/ethais/lineedit_active.png
I +- -- kdm/kfrontend/themes/ethais/lineedit_normal.png
I +- -- kdm/kfrontend/themes/ethais/lock.png
I +- -- kdm/kfrontend/themes/ethais/login_active.png
I +- -- kdm/kfrontend/themes/ethais/login_normal.png
I +- -- kdm/kfrontend/themes/ethais/pw_icon.png
I +- -- kdm/kfrontend/themes/ethais/rectangle.png
I +- -- kdm/kfrontend/themes/ethais/rectangle_overlay.png
I +- -- kdm/kfrontend/themes/ethais/screenshot.png
I +- -- kdm/kfrontend/themes/ethais/session_normal.png
I +- -- kdm/kfrontend/themes/ethais/system_normal.png
I +- -- kdm/kfrontend/themes/ethais/user_icon.png
I +1 -1 kdm/kfrontend/themes/oxygen-air/oxygen-air.xml
I +1 -0 kdm/kfrontend/themes/oxygen/KdmGreeterTheme.desktop
I +3 -0 khotkeys/data/defaults.khotkeys
I +8 -0 khotkeys/data/kde32b1.khotkeys
I +13 -0 khotkeys/data/konqueror_gestures_kde321.khotkeys
I +1 -0 khotkeys/data/printscreen.khotkeys
I +1 -0 khotkeys/kcm_hotkeys/khotkeys.desktop
I +1 -0 kinfocenter/Categories/lostfoundcategory.desktop
I +1 -0 kinfocenter/Modules/info/scsi.desktop
I +1 -0 kinfocenter/Modules/infosummary/kcm_infosummary.desktop
I +1 -0 kinfocenter/Modules/memory/kcm_memory.desktop
I +1 -0 kinfocenter/Modules/opengl/opengl.desktop
I +3 -1 klipper/klipper.cpp
I +1 -0 klipper/klipperrc.desktop
I +1 -0 kmenuedit/kmenuedit.desktop
I +1 -0 krunner/lock/kscreenlocker.notifyrc
I +1 -0 kscreensaver/kblank_screensaver/kblank.desktop
I +2 -0 kscreensaver/krandom_screensaver/krandom.desktop
I +0 -4 ksmserver/startup.cpp
I +60 -0 ksplash/ksplashx/main.cpp
I +3 -1 ksplash/ksplashx/splash.cpp
I +1 -0 kstyles/highcontrast/highcontrast.themerc
I +0 -1 kstyles/oxygen/config/CMakeLists.txt
I +0 -24 kstyles/oxygen/config/oxygen-settings.desktop
I +0 -8 kstyles/oxygen/config/oxygenstyleconfig.cpp
I +0 -14 kstyles/oxygen/config/ui/oxygenstyleconfig.ui
I +22 -28 kstyles/oxygen/oxygen.kcfg
I +1 -0 kstyles/oxygen/oxygen.themerc
I +43 -112 kstyles/oxygen/oxygenstyle.cpp
I +113 -49 kstyles/oxygen/oxygenstylehelper.cpp
I +5 -1 kstyles/oxygen/oxygenstylehelper.h
I +1 -0 kstyles/themes/qtmotif.themerc
I +1 -0 kstyles/themes/qtwindowsxp.themerc
I +1 -0 ksysguard/example/ksysguard.notifyrc
I +2 -0 ksysguard/gui/ksysguard.desktop
I +1 -0 kwin/clients/laptop/laptop.desktop
I +1 -1 kwin/clients/oxygen/config/ui/oxygenconfigurationui.ui
I +1 -0 kwin/clients/oxygen/oxygenclient.desktop
I +1 -0 kwin/clients/tabstrip/tabstrip.desktop
I +1 -0 kwin/effects/_test/flame.desktop
I +4 -4 kwin/effects/blur/blur.cpp
I +1 -0 kwin/effects/blur/blur.desktop
I +1 -0 kwin/effects/blur/blur_config.desktop
I +4 -0 kwin/effects/boxswitch/boxswitch.cpp
I +1 -0 kwin/effects/explosion/explosion.desktop
I +1 -0 kwin/effects/glide/glide.desktop
I +1 -0 kwin/effects/glide/glide_config.desktop
I +1 -0 kwin/effects/invert/invert.desktop
I +1 -0 kwin/effects/invert/invert_config.desktop
I +1 -0 kwin/effects/login/login.desktop
I +1 -0 kwin/effects/logout/logout.desktop
I +1 -0 kwin/effects/magnifier/magnifier.desktop
I +1 -0 kwin/effects/magnifier/magnifier_config.desktop
I +6 -0 kwin/effects/outline/outline.desktop
I +1 -0 kwin/effects/screenshot/screenshot.desktop
I +1 -0 kwin/effects/sheet/sheet.desktop
I +1 -0 kwin/effects/slide/slide.desktop
I +1 -0 kwin/effects/zoom/zoom.desktop
I +1 -0 kwin/effects/zoom/zoom_config.desktop
I +51 -14 kwin/geometry.cpp
I +1 -0 kwin/kcmkwin/kwinoptions/kwinactions.desktop
I +1 -0 kwin/kcmkwin/kwinoptions/kwinadvanced.desktop
I +1 -0 kwin/kcmkwin/kwinoptions/kwinmoving.desktop
I +5 -3 kwin/kcmkwin/kwinrules/CMakeLists.txt
I +7 -2 kwin/kcmkwin/kwinrules/detectwidget.cpp
I +3 -2 kwin/kcmkwin/kwinrules/detectwidget.h
I +108 -83 kwin/kcmkwin/kwinrules/detectwidget.ui
I +67 -0 kwin/kcmkwin/kwinrules/ruleslist.cpp
I +2 -0 kwin/kcmkwin/kwinrules/ruleslist.h
I +127 -84 kwin/kcmkwin/kwinrules/ruleslist.ui
I +20 -10 kwin/kcmkwin/kwinrules/ruleswidget.cpp
I +1143 -986 kwin/kcmkwin/kwinrules/ruleswidgetbase.ui
I +57 -0 kwin/kcmkwin/kwinrules/yesnobox.h
I +1 -0 kwin/kcmkwin/kwintabbox/kwintabbox.desktop
I +3 -0 kwin/kwin.notifyrc
I +18 -3 kwin/libkwineffects/kwinglplatform.cpp
I +6 -0 kwin/libkwineffects/kwinglplatform.h
I +38 -42 kwin/main.cpp
I +1 -1 kwin/scene_opengl_glx.cpp
I +5 -1 kwin/scene_xrender.cpp
I +5 -0 kwin/workspace.cpp
I +4 -3 libs/oxygen/oxygenshadowconfiguration.cpp
I +0 -2 libs/plasmaclock/CMakeLists.txt
I +9 -0 libs/plasmaclock/calendar.cpp
I +1 -0 libs/plasmaclock/clockapplet.cpp
I +1 -0 plasma/desktop/applets/pager/plasma-pager-default.desktop
I +3 -0 plasma/desktop/applets/showActivityManager/plasma-applet-org.kde.showActivityManager.desktop \
I +1 -0 plasma/desktop/applets/tasks/plasma-tasks-default.desktop
I +13 -9 plasma/desktop/applets/tasks/tasks.cpp
I +1 -0 plasma/desktop/applets/windowlist/plasma-applet-windowlist.desktop \
I +1 -0 plasma/desktop/containments/desktop/plasma-containment-desktop.desktop \
I +1 -0 plasma/desktop/shell/CMakeLists.txt
I +3 -0 plasma/desktop/shell/data/layouts/org.kde.plasma-desktop.desktopIcons/metadata.desktop \
I +1 -0 plasma/desktop/shell/data/plasma-desktop.notifyrc
I +117 -0 plasma/desktop/shell/panelshadows.cpp
I +49 -0 plasma/desktop/shell/panelshadows.h
I +5 -154 plasma/desktop/shell/panelview.cpp
I +2 -10 plasma/desktop/shell/panelview.h
I +10 -0 plasma/desktop/shell/plasmaapp.cpp
I +4 -1 plasma/desktop/shell/plasmaapp.h
I +2 -2 plasma/generic/applets/battery/battery.cpp
I +1 -0 plasma/generic/applets/battery/plasma-battery-default.desktop
I +1 -0 plasma/generic/applets/calendar/plasma-applet-calendar.desktop
I +2 -0 plasma/generic/applets/devicenotifier/notifierdialog.cpp
I +1 -1 plasma/generic/applets/devicenotifier/test-predicate-openinwindow.desktop \
I +1 -0 plasma/generic/applets/icon/plasma-applet-icon.desktop
I +1 -0 plasma/generic/applets/notifications/plasma-applet-notifications.desktop \
I +3 -1 plasma/generic/applets/notifications/ui/stackdialog.cpp
I +1 -0 plasma/generic/applets/system-monitor/plasma-applet-sm_net.desktop \
I +1 -0 plasma/generic/applets/system-monitor/plasma-applet-system-monitor.desktop \
I +16 -10 plasma/generic/applets/systemtray/ui/applet.cpp
I +1 -0 plasma/generic/applets/webbrowser/plasma-applet-webbrowser.desktop \
I +0 -1 plasma/generic/containmentactions/applauncher/launch.cpp
I +1 -0 plasma/generic/containmentactions/paste/plasma-containmentactions-paste.desktop \
I +2 -8 plasma/generic/dataengines/CMakeLists.txt
I +0 -4 plasma/generic/dataengines/akonadi/CMakeLists.txt
I +0 -3 plasma/generic/dataengines/calendar/CMakeLists.txt
I +1 -0 plasma/generic/dataengines/calendar/plasma-dataengine-calendar.desktop \
I +1 -0 plasma/generic/dataengines/dict/plasma-dataengine-dict.desktop
I +1 -0 plasma/generic/dataengines/favicons/plasma-dataengine-favicons.desktop \
I +1 -0 plasma/generic/dataengines/network/plasma-dataengine-network.desktop \
I +7 -5 plasma/generic/dataengines/nowplaying/nowplayingengine.cpp
I +1 -0 plasma/generic/dataengines/nowplaying/plasma-dataengine-nowplaying.desktop \
I +11 -4 plasma/generic/dataengines/nowplaying/playerinterface/mpris/mpris.cpp \
I +1 -0 plasma/generic/dataengines/nowplaying/playerinterface/pollingwatcher.cpp \
I +1 -0 plasma/generic/dataengines/places/plasma-dataengine-places.desktop \
I +1 -0 plasma/generic/dataengines/powermanagement/plasma-dataengine-powermanagement.desktop \
I +0 -1 plasma/generic/dataengines/rss/CMakeLists.txt
I +1 -0 plasma/generic/dataengines/rss/plasma-dataengine-rss.desktop
I +0 -1 plasma/generic/dataengines/rss/rss.cpp
I +2 -0 plasma/generic/dataengines/share/backends/imgsusepasteorg/metadata.desktop \
I +1 -0 plasma/generic/dataengines/share/backends/kde/metadata.desktop
I +1 -0 plasma/generic/dataengines/soliddevice/plasma-dataengine-soliddevice.desktop \
I +1 -0 plasma/generic/dataengines/systemmonitor/plasma-dataengine-systemmonitor.desktop \
I +1 -0 plasma/generic/dataengines/time/plasma-dataengine-time.desktop
I +1 -0 plasma/generic/dataengines/weather/ions/CMakeLists.txt
I +16 -0 plasma/generic/dataengines/weather/ions/debianweather/CMakeLists.txt \
I +27 -0 plasma/generic/dataengines/weather/ions/debianweather/ion-debianweather.desktop \
I +293 -0 plasma/generic/dataengines/weather/ions/debianweather/iondebianweather.cpp \
I +89 -0 plasma/generic/dataengines/weather/ions/debianweather/iondebianweather.h \
I +1 -0 plasma/generic/dataengines/weather/plasma-dataengine-weather.desktop \
I +1 -0 plasma/generic/runners/activities/plasma-runner-activityrunner.desktop \
I +1 -0 plasma/generic/runners/bookmarks/plasma-runner-bookmarks.desktop
I +1 -0 plasma/generic/runners/calculator/plasma-runner-calculator.desktop \
I +1 -0 plasma/generic/runners/locations/plasma-runner-locations.desktop
I +2 -1 plasma/generic/runners/places/plasma-runner-places.desktop
I +1 -0 plasma/generic/runners/recentdocuments/recentdocuments.desktop
I +1 -0 plasma/generic/runners/services/plasma-runner-services.desktop
I +1 -0 plasma/generic/runners/shell/plasma-runner-shell.desktop
I +1 -0 plasma/generic/runners/solid/plasma-runner-solid.desktop
I +1 -0 plasma/generic/runners/webshortcuts/plasma-runner-webshortcuts.desktop \
I +1 -0 plasma/generic/runners/windows/plasma-runner-windows.desktop
I +1 -0 plasma/generic/scriptengines/google_gadgets/plasma-packagestructure-googlegadgets.desktop \
I +1 -0 plasma/generic/wallpapers/color/plasma-wallpaper-color.desktop
I +3 -0 plasma/generic/wallpapers/image/plasma-wallpaper-image.desktop
I +1 -0 plasma/netbook/applets/searchbox/plasma-applet-searchbox.desktop
I +1 -0 plasma/netbook/containments/sal/services/plasma-sal-bookmarks.desktop \
I +1 -0 plasma/netbook/containments/sal/services/plasma-sal-contacts.desktop \
I +1 -0 plasma/netbook/containments/sal/services/plasma-sal-development.desktop \
I +1 -0 plasma/netbook/containments/sal/services/plasma-sal-education.desktop \
I +1 -0 plasma/netbook/containments/sal/services/plasma-sal-games.desktop \
I +1 -0 plasma/netbook/containments/sal/services/plasma-sal-graphics.desktop \
I +1 -0 plasma/netbook/containments/sal/services/plasma-sal-internet.desktop \
I +1 -0 plasma/netbook/containments/sal/services/plasma-sal-multimedia.desktop \
I +1 -0 plasma/netbook/containments/sal/services/plasma-sal-office.desktop \
I +1 -0 plasma/netbook/containments/sal/services/plasma-sal-system.desktop \
I +1 -0 plasma/netbook/containments/sal/services/plasma-sal-utility.desktop \
I +1 -0 plasma/netbook/desktoptheme/air-netbook/metadata.desktop
I +1 -1 plasma/netbook/shell/main.cpp
I +1 -0 powerdevil/daemon/actions/bundled/powerdevilrunscriptaction.desktop \
I +1 -0 powerdevil/daemon/backends/upower/backlight_helper_actions.actions \
I +1 -0 powerdevil/daemon/powerdevil.desktop
I +2 -0 powerdevil/powerdevil.notifyrc
I +1 -1 solid/modemmanager-0.4/modeminterface.h
I +2 -0 solid/solid-actions-kcm/device-actions/solid-device-AudioInterface.desktop \
I +2 -0 solid/solid-actions-kcm/device-actions/solid-device-Battery.desktop \
I +1 -0 solid/solid-actions-kcm/device-actions/solid-device-Block.desktop \
I +1 -0 solid/solid-actions-kcm/device-actions/solid-device-Button.desktop \
I +1 -0 solid/solid-actions-kcm/device-actions/solid-device-DvbInterface.desktop \
I +1 -0 solid/solid-actions-kcm/device-actions/solid-device-NetworkInterface.desktop \
I +7 -0 solid/solid-actions-kcm/device-actions/solid-device-OpticalDisc.desktop \
I +1 -0 solid/solid-actions-kcm/device-actions/solid-device-OpticalDrive.desktop \
I +1 -0 solid/solid-actions-kcm/device-actions/solid-device-Processor.desktop \
I +1 -0 solid/solid-actions-kcm/device-actions/solid-device-SerialInterface.desktop \
I +1 -0 solid/solid-actions-kcm/device-actions/solid-device-StorageDrive.desktop \
I +4 -0 solid/solid-actions-kcm/device-actions/solid-device-StorageVolume.desktop \
I +2 -0 systemsettings/app/systemsettings.desktop
I +1 -0 systemsettings/categories/settings-accessibility.desktop
I +1 -0 systemsettings/categories/settings-audio-and-video.desktop
I +1 -0 systemsettings/categories/settings-bluetooth.desktop
I +1 -0 systemsettings/categories/settings-display.desktop
I +1 -0 systemsettings/categories/settings-hardware.desktop
I +1 -0 systemsettings/categories/settings-input-devices.desktop
I +1 -0 systemsettings/categories/settings-locale.desktop
I +1 -0 systemsettings/categories/settings-network-settings.desktop
I +1 -0 systemsettings/categories/settings-permissions.desktop
I +1 -0 systemsettings/categories/settings-personal-information.desktop
I +1 -0 systemsettings/categories/settings-power-management.desktop
I +1 -0 systemsettings/categories/settings-sharing.desktop
I +1 -0 systemsettings/categories/settings-system-administration.desktop
I +1 -0 systemsettings/icons/settings-icon-view.desktop
http://commits.kde.org/kde-workspace/7a9c4cb28dda131cffd04f303ca176f7d3c77b6c
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic