Merge lp:~sil2100/unity-2d/revert_and_fix into lp:unity-2d

[Łukasz Zemczak]

Revert 1109 and 1095 due to non-compliance with SRU criteria. Fixed some changelog mistakes.

Reverting two commits as pointed out by Didier. Also, fixed some changelog mistakes made.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1145
http://s-jenkins:8080/job/unity-2d-ci/27/
Executed test runs:
    SUCCESS: http://s-jenkins:8080/job/unity-2d-ci/./distribution=precise,flavor=amd64/27/console
    SUCCESS: http://s-jenkins:8080/job/unity-2d-ci/./distribution=precise,flavor=i386/27/console

review: Approve (continuous-integration)

[lp:~sil2100/unity-2d/revert_and_fix]

1146. By Łukasz Zemczak on 2012-10-30

More fixes for the changelog

=== modified file 'debian/changelog'
--- debian/changelog	2012-10-02 11:00:12 +0000
+++ debian/changelog	2012-10-30 10:21:23 +0000
@@ -1,31 +1,26 @@
 unity-2d (5.14.0-0ubuntu1) UNRELEASED; urgency=low
 
-  [ Francis Ginther ]
-  * Update build dependency to the renamed libgeis-dev (LP: #1046392)
-
-  [ Łukasz 'sil2100' Zemczak ]
   * New upstream release:
-    - Translation template is not generated during the build (LP: #933468)
     - Unity 2D doesn't load 24 bit icons (LP: #977262)
-    - [Launcher] [Multi-monitor] Removing a non running app tile from a launcher should remove it from all (LP: #988739)
-    - Panel Titlebar double click is emitted for any mouse button (LP: #73649)
+    - [Launcher] [Multi-monitor] Removing a non running app tile from a 
+      launcher should remove it from all (LP: #988739)
+    - Panel Titlebar double click is emitted for any mouse button (LP: #736491)
     - Launcher does not hide if shown while dragging a file (LP: #1002308)
     - icon isn't reset when clearing the search query (LP: #973225)
     - Issue when ejecting busy device from the Unity 2D Shell (LP: #997786)
     - Sticky edges don't work in RTL (LP: #984092)
-    - pips are not correctly updated when plugin in a second monitor (LP: #1003943)
+    - pips are not correctly updated when plugin in a second monitor 
+      (LP: #1003943)
     - [dash] Unable to maximize (LP: #918648)
-    - all panels have same window focus on multiple monitors unity2d (LP: #930147)
-    - clicking on top panel should raise maximized windows (LP: #731761)
+    - all panels have same window focus on multiple monitors unity2d 
+      (LP: #930147)
     - Dash will not open files under Greek folders (LP: #1002710)
     - Launcher does not respond to changes in icon theme (LP: #605475)
     - [panel] Invisible items in systray (LP: #703389)
     - [panel] Ignores "enabled" property on top-level menus (LP: #850017)
-    - dropdown boxes on sites stop working (LP: #1010466)
-    - Update dependency on the renamed libgeis (LP: #1046392)
-    - No image for dash icon (LP: #1056108)
+  * Reverted some quantal-specific commits which are no longer relevant
 
- -- Francis Ginther <[e-mail]>  Tue, 04 Sep 2012 14:39:28 -0500
+ -- Łukasz 'sil2100' Zemczak <[e-mail]>  Tue, 30 Oct 2012 09:59:49 +0100
 
 unity-2d (5.12.0-0ubuntu1.2) precise-updates; urgency=low
 

=== modified file 'panel/applets/appname/appnameapplet.cpp'
--- panel/applets/appname/appnameapplet.cpp	2012-05-25 09:12:26 +0000
+++ panel/applets/appname/appnameapplet.cpp	2012-10-30 10:21:23 +0000
@@ -400,12 +400,6 @@
 
 void AppNameApplet::mousePressEvent(QMouseEvent* event) {
     if (event->button() == Qt::LeftButton) {
-        if (!d->m_label->geometry().contains(event->pos()) || !d->m_label->isVisible()) {
-            // Clicked outside the label and outside the menus
-            // focus the top most maximized window
-            d->m_windowHelper->focusTopMostMaximizedWindowOnScreen();
-        }
-
         d->m_dragStartPosition = event->pos();
         d->m_dragInProgress = true;
     } else {

=== modified file 'panel/applets/appname/windowhelper.cpp'
--- panel/applets/appname/windowhelper.cpp	2012-06-13 14:11:37 +0000
+++ panel/applets/appname/windowhelper.cpp	2012-10-30 10:21:23 +0000
@@ -178,32 +178,6 @@
     return true;
 }
 
-void WindowHelper::focusTopMostMaximizedWindowOnScreen() const
-{
-    WnckWindow *topMostMaximizedWindowOnScreen = NULL;
-    GList *stack = wnck_screen_get_windows_stacked(wnck_screen_get_default());
-    GList *cur = stack;
-    while (cur) {
-        WnckWindow *window = (WnckWindow*) cur->data;
-
-        if (window != NULL) {
-            if (wnck_window_is_maximized(window)) {
-                // Check the window screen
-                int x, y, width, height;
-                wnck_window_get_geometry(window, &x, &y, &width, &height);
-                if (QApplication::desktop()->screenNumber(QRect(x, y, width, height).center()) == d->screen()) {
-                    topMostMaximizedWindowOnScreen = window;
-                }
-            }
-        }
-        cur = g_list_next(cur);
-    }
-
-    if (topMostMaximizedWindowOnScreen) {
-        wnck_window_activate(topMostMaximizedWindowOnScreen, CurrentTime);
-    }
-}
-
 void WindowHelper::close()
 {
     if (DashClient::instance()->activeInScreen(d->screen())) {

=== modified file 'panel/applets/appname/windowhelper.h'
--- panel/applets/appname/windowhelper.h	2012-05-25 09:12:26 +0000
+++ panel/applets/appname/windowhelper.h	2012-10-30 10:21:23 +0000
@@ -44,8 +44,6 @@
     bool isMaximized() const;
     bool isMostlyOnScreen(int screen) const;
 
-    void focusTopMostMaximizedWindowOnScreen() const;
-
 public Q_SLOTS:
     void close();
     void minimize();

=== modified file 'po/CMakeLists.txt'
--- po/CMakeLists.txt	2012-04-13 08:26:38 +0000
+++ po/CMakeLists.txt	2012-10-30 10:21:23 +0000
@@ -50,7 +50,7 @@
 
 create_translation_targets(${GETTEXT_PACKAGE}.pot ${PO_FILES})
 
-add_custom_target(${GETTEXT_PACKAGE}.pot ALL
+add_custom_target(${GETTEXT_PACKAGE}.pot
     COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/update-unity-2d-pot
     )
 

=== modified file 'po/update-unity-2d-pot'
--- po/update-unity-2d-pot	2012-04-13 08:26:48 +0000
+++ po/update-unity-2d-pot	2012-10-30 10:21:23 +0000
@@ -10,7 +10,7 @@
 trap 'rm -f "$GETTEXT_FILES"' EXIT
 cd ..
 find \( -name '*.cpp' -o -name '*.qml' \) \
-    -a ! \( -path './debian/*' -o -path './build/*' -o -path './obj-*-linux-gnu/*' -o -path './.bzr/*'  -o -path './libunity-2d-private/tests/*' \) | sort \
+    -a ! \( -path './debian/*' -o -path './build/*' -o -path './obj-*-linux-gnu/*' -o -path './.bzr/*'  -o -path './libunity-2d-private/tests/*' \) \
 > $GETTEXT_FILES
 
 # Generate pot from our list