/srv/irclogs.ubuntu.com/2012/08/10/#ubuntu-unity.txt

=== marcavis_ is now known as marcavis
=== james is now known as Guest15651
=== mdeslaur_ is now known as mdeslaur
johann_Someone can tell me how to get the source code of unity04:16
MCR1sil2100: Hi :)07:18
MCR1sil2100: Are there problems with Unity landings or why is it jamming ?07:19
MCR1sil2100: Could you also approve this branch ? : https://code.launchpad.net/~brandontschaefer/unity/improve-keyboard-shortcut-overlay-wording/+merge/11907107:21
sil2100MCR1: unity is still in freeze, I hope to unfreeze it today07:21
sil2100Starting next week we'll try to use a different release approach07:22
sil2100So it won't be a problem hopefull07:22
sil2100*hopefully07:22
MCR1sil2100: It would be important to have this ^^ in trunk, so I could start working on the elimination of the hardcoded shortcuts that would probably also touch the same code...07:23
didrockssil2100: we will probably need a compiz snapshot next Monday/Tuesday FYI once the gsettings g-c-c part is landed FYI07:23
didrocks(just to keep you up to date)07:23
didrockssil2100: there will be a need of two cherry-picks in the unity codebase07:24
MCR1didrocks: Hi :) My plan is to convert all hardcoded Unity keys to Compiz keys and integrate those that are currently hardcoded to the Unity plug-in. Is thos a good plan and is there something special I should take care of ?07:28
MCR1*this a good plan07:28
didrocksMCR1: this is great, you will need to coordinate later on with sam to ensure those are exposed in g-c-c (there are a hardcoded list for that) and how to make those optionals for people not having unity07:29
didrocksMCR1: just remember that Feature freeze is 2 weeks away, so approx only one week to get things integrated :)07:30
MCR1didrocks: Ok, I hope I can get this done (weekend is reserved for that task) - I'll try to coordinate stuff with Sam, probably he needs to help me anyway... ;)07:31
MCR1didrocks: One thing that came to my mind is how Unity-2d will handle stuff if those hardcoded shortcuts are converted for example...07:32
didrocksno more unity-2d starting next week07:32
didrocksso don't bother :)07:33
MCR1didrocks: Oh, ok. One thing less to worry about then, although it works quite nice...07:33
MCR1duflu: Hi :) If feature-freeze is near, I would be very happy if we could get the most important "lost" plug-ins merged before the freeze. We do not need to activate those in GLES, or do we (afaik trip for example is simply deactivated in GLES) ?07:46
sil2100mhr3: hello! Will you find a free few moments of your time for releasing tarballs for bamf, libunity and the lenses (files, apps, music) in an hour or so ;)?07:47
mhr3sil2100, did we have any changes to lenses?07:47
dufluMCR1: Sorry, am in a mad rush getting the important features completed. The new plugins come after that07:47
sil2100mhr3: just the vala update, true... so maybe I'll just distropatch those07:48
sil2100mhr3: so only bamf and libunity for now ;)07:48
mhr3oh right, that's actually worth a release07:48
mhr3sil2100, we just finished standup, so i guess it's ok if i do them right away07:49
didrocksmhr3: sit! :)07:50
mhr3didrocks, grrrrrrrr07:50
MCR1duflu: I hope and wish your mad rush is successful and does end before feature freeze ;) - I stop disturbing you now :-X07:52
sil2100mhr3: I'll just check one more autopilot test and we're ready for release07:53
mhr3meh, it's not like there could a bug in libunity :P07:53
sil2100True, but still! ;) Better safe then sorry ;p07:53
mhr3i'll wait with bamf though :D07:54
didrockssil2100: don't believe him, don't believe him!07:54
mhr3didrocks, ssshushhh07:54
* mhr3 shakes fist at the half broken build system in trunk libunity07:56
didrocksmhr3: if it's only half broken, it's fine, take the other half!07:56
mhr3didrocks, right, half of the source files should do, right? :)07:57
didrockssure, you write useless code, let's cut it down! :)07:57
mhr3didrocks, it's a sign of project maturity though, you know that libreoffice has like 20% of code that's unused?07:58
didrocksmhr3: yeah, I heard about that, it's scary that we have that much code around, and still not real good way to instrumente the code to detect dead part07:59
sil2100...;) I'm scared when I listen to you guys ;p08:00
sil2100Arrgh08:02
sil2100hm, I need JohnLea!08:02
sil2100Since either something changed by design, or we have a small regression08:02
mhr3sil2100, in?08:03
sil2100mhr3: in switcher - it's probably unity-only though08:03
sil2100mhr3: checking how it looks in 6.008:04
mhr3sil2100, tarball for dee as well?08:05
mhr3seems like there's wasn't one for quite a while08:05
sil2100mhr3: hell, why not? If you only feel like it ;)08:07
mhr3sil2100, what version are we doing now?08:16
mhr36.2?08:16
mhr3or 6.4?08:16
sil21006.208:18
sil2100Ah, no, it seems to work - no regression here08:20
didrockssil2100: btw, do not forget to have a google doc with the results of manual tests and autopilot ones :)08:28
sil2100didrocks: it's already done ;)08:28
mhr3sil2100, so green to push the tarballs?08:34
mhr3quick! hide! kamstrup's here08:35
kamstrupmhr3: hey!08:35
kamstrupwhat ever you do - I DISAPPROVE!08:35
kamstrup;-)08:35
mhr3kamstrup, hey, hey! i see holiday has good effect on you :)08:35
kamstrupi know, right?!08:37
sil2100mhr3: GREENZ08:55
mhr3eeek, i have to create 6.0 series for all the lenses :/09:08
gordsucks to be yoou09:10
mhr3sil2100, disted, milestoned, uploaded, tagged, pushed09:18
sil2100mhr3: awesooome! I'll release for unity in nux in a moment09:18
sil2100s/in/and09:18
=== yofel_ is now known as yofel
mhr3sil2100, oh dear, i forgot about bamf09:58
mhr3Trevinho, you here?09:58
Trevinhomhr3: yep10:02
mhr3Trevinho, still no big changes in bamf for the major bump?10:03
Trevinhomhr3: no :(10:03
mhr361st release of 0.2 series then? :/10:04
sil2100...;)10:04
sil2100didrocks: in the changelog, should I also put changes from trunk that weren't assigned to any bugs?10:08
sil2100Or only the ones with bugs?10:08
didrockssil2100: only those with bugs are enough, it's long enough already :)10:09
didrockssil2100: btw, IIRC, there are some merges with contains "UIFe" in the bug title (not sure before this release, but some are proposed now)10:09
didrockssil2100: if it's the case, you can remove the "UIFe" part :)10:09
sil2100didrocks: could you later on run unify again to generate the changelog for unity ;p ?10:10
sil2100didrocks: since for nux and the rest I do manually, since those are small10:11
sil2100But unity, phew10:11
didrockssil2100: sure, tell me once you are ready :)10:11
sil2100\o/ thank you!10:12
mhr3sil2100, uploaded bamf10:12
sil2100mhr3: excellent, thanks!10:12
sil2100didrocks: for unify, all other unity projects (nux, bamf) should have unity upstream in their bugs as well, right?10:13
didrockssil2100: yeah, as usual :)10:13
sil2100didrocks: last thing, since I forgot - do I need to set the milestone to 6.2 for unity on those as well? For instance, for nux?10:14
didrockssil2100: on the unity upstream task, yeah10:14
=== zya-afk is now known as zyga
sil2100didrocks: can I publish the new unity tarball, or do you need to do it yourself for unify to work?11:07
=== andy_ is now known as andyrock
didrockssil2100: no, you can publish it11:16
didrockssil2100: just don't close the milestone11:16
sil2100didrocks: so, I should tick 'keep the 6.2. milestone active'?11:19
didrocksexactly11:22
=== dandrader is now known as dandrader|afk
=== mdeslaur_ is now known as mdeslaur
=== dandrader|afk is now known as dandrader
sil2100didrocks: I sent an e-mail with branches and all the release details11:53
didrockssil2100: "I checked lintian warnings - had to silence some for unity, but besides that no *new* ones seem to have appeared. "11:59
didrockscan you detail please?11:59
didrocksalso,should I run unify now as you are telling you are waiting on the changelog?11:59
didrocks(ok on unify, running now)12:00
didrockssil2100: unfreeze should be done by mmrazik12:00
sil2100didrocks: I know ;) Will ask him once I get  your ACK12:14
sil2100didrocks: no *new* lintian errors, since I remember getting this one before: E: unity-common: python-script-but-no-python-dep usr/lib/unity/makebootchart.py12:15
sil2100For unity ;p12:15
sil2100But since it's like not a main script, I think that's ok?12:15
didrockssil2100: all in one commit :/12:16
didrocksdon't remember about the one commit per act I really insisted on12:16
didrocksthat makes the review painful12:16
sil2100ah, shit, sorry about that - in unity it's like that because I first did merge-upstream ...12:17
sil2100Could have started from the override branch already12:17
didrockssil2100: just remember that for next time :)12:17
* sil2100 writes that down this time12:18
sil2100My desk is actually getting very messy with all these notes12:18
=== _salem is now known as salem_
didrocksConflicting tags:12:37
didrocks    upstream-3.2.012:37
didrockshum, interesting12:37
didrocksin nux12:38
didrockssil2100: you should use unify btw12:38
didrockssil2100: you miss bugs12:38
sil2100:(12:38
sil2100So I missed one...12:39
sil2100Actually I though I had them all, hmm12:39
didrocks3 in nux12:39
sil2100Which ones?12:39
didrocks    - Support for automation (LP: #685199)12:40
didrocks    - add alpha function on a NuxBaseWindow (LP: #718827)12:40
didrocks    - Timestamp field on the event structure is always 0 (LP: #735645)12:40
sil2100Ok, those completely I missed, need to check why12:40
didrocksI get 20 conflicting tags on unity12:42
didrockshave you done anything special?12:42
didrocksor is bzr going crazy?12:42
sil2100hm, no? 20 conflicting tags? That's a bit too much for a 'mistake'12:42
didrockssil2100: no, you made something weird12:43
didrocksyour bzr branch is based on revision 2512:43
didrocksand you remerged everything from that12:43
sil2100Which one? lp:ubuntu/unity ?12:43
didrocksright12:43
=== zyga is now known as zyga-afk
sil2100All I did was bzr branch lp:ubuntu/unity freshly today12:43
didrockshence conflicting tags all over your branch when pulling on ubuntu/unity12:43
didrockssil2100: look at your revision12:44
didrocksyou start at rev 2512:44
sil2100And did a bzr merge-upstream12:44
didrocksor something is really weird in bzr-gtk12:44
didrocks    revno: 55.813.24 [merge]12:44
didrocksshould rather be revno: 74612:44
sil2100revno: 747 [merge]12:45
sil2100committer: Łukasz 'sil2100' Zemczak <lukasz.zemczak@canonical.com>12:45
didrocksyeah, this is your upper commit12:45
sil2100This is what bzr log |less gives me12:45
sil2100revno: 74612:45
sil2100tags: 6.0.0-0ubuntu612:45
sil2100This is the one I based on12:45
didrocksnow, look at the first nested entry12:45
didrocksbzr log -n 112:45
didrocks-n 2 sorry12:45
didrocks    revno: 55.813.24 [merge]12:45
didrocksthis is your merge-upstream12:45
didrockssame issue with nux btw12:46
didrocksyou started from     revno: 159.3.40 [merge]12:46
sil2100Wait, so what did I do wrong?12:46
sil2100I did exactly this:12:46
didrockswell, tell me you did do :)12:46
sil2100bzr branch lp:unity12:46
sil2100bzr branch lp:ubuntu/unity ubuntu12:46
sil2100cd ubuntu12:46
sil2100bzr merge-upstream ../unity-6.2.0.blabla ../unity --version=6.2.0 -r -112:47
sil2100# changelog editing12:47
didrockslet me try that with nux12:47
sil2100debcommit12:47
sil2100And that's all I did12:47
sil2100Everything fresh from 0 today12:47
didrockswell, the log shows that something is wrong, isn't it?12:47
didrocksbtw, when you did merge-upstream, I think it bailed on conflicting tags12:47
didrocksso you should have noticed that something went wrong (also, look at the logs)12:48
didrocksso let me redo this for nux12:48
didrocksand see if it's a merge-upstream issue12:48
sil2100hmmm, maybe it's something broken on my system?12:49
sil2100Since I'm doing what I was always doing12:49
didrocksnux is fine, no tag conflict12:50
didrockslet me try unity12:50
didrocksdid you uncommit at some point?12:50
sil2100hm, in the past you mean?12:51
didrockslike, for the last release?12:51
sil2100hm, I don't remember :/ I don't think so though12:52
didrockssil2100: ok, anyway, the history is good, let me "force" bzr for the tagging issue12:53
sil2100didrocks: sorry about that, whatever might have caused it :(12:53
didrockssil2100: I have unfortunately no idea of what the actual cause is TBH :/12:53
didrocksmaybe something in bzr in quantal12:54
didrocksok, forced :)12:54
didrockssil2100: on another note…12:54
didrocksnux broke its abi12:54
didrocksso, in the build-dep, you need to dep on latest nux as we are pushing everything at the same time12:55
didrocks(doing it now)12:55
sil2100Thank you!12:55
didrocksthe abi system will then do the right think to dep on the right version :)12:55
sil2100Ok, need to attend a meeting now, brb12:55
didrocksmhr3: does u-l-a, u-l-f or u-l-m needs latest libunity API addition?13:02
mhr3didrocks, latest being?13:03
mhr394?13:03
mhr3but actually, no13:04
* mhr3 remembers that the latest changes are only proposed so far13:04
didrocksmhr3: great, thanks :)13:07
didrockssil2100: geis: the build-dep has been bumped in nux to 2.2.1013:11
didrocksthink about doing a diff in configure.ac (again :p)13:11
didrockssil2100: oh oh, and we ship the script for transitionning to gsettings13:15
didrockssil2100: we shouldn't yet13:15
didrocksas compiz is not there13:15
didrocksso you have those changes shipped and not in the changelog as well13:17
=== zyga-afk is now known as zyga
sil2100didrocks: we ship it already? Wait ;)13:22
* sil2100 didn't see it13:22
didrockssil2100: yeah, you did13:23
sil2100didrocks: I don't see any script though13:23
sil2100didrocks: where is it?13:23
didrockssil2100: you do have debian/unity.migrations in your branch, right?13:24
didrockslet me see, maybe me and some cruft around13:24
sil2100didrocks: but that's yours13:24
didrocksrev 75013:24
didrocksyeah, but it's your branch as well, right?13:24
sil2100bzr blame unity.migrations13:24
sil2100736 didier. | tools/migration-scripts/01_unity_change_dconf_path13:24
didrocksindeed13:25
didrocksbut it's in the branch you ship, right?13:25
sil2100Yes, but it was already in lp:ubuntu/unity13:25
didrocksyes because we were supposed to land the gsettings branch first13:25
didrockswhich didn't happen13:25
sil2100Ah, shit ;)13:25
didrocksso we need to revert that13:25
didrocksno worry, doing it13:25
didrocksjust to tell you: look at everything13:25
didrockslitterally, everthing :)13:25
didrockseverything*13:25
didrockssil2100: speaking of migration13:26
didrockssil2100: as you are not around next week13:26
didrockssil2100: the script is in trunk, right?13:26
didrocksthere is nothing you didn't add?13:26
didrocks(for both compiz and unity)13:26
sil2100didrocks: yes :)13:28
sil2100All seems merged in13:28
didrockssil2100: excellent, thanks! I'll maybe add more keys due to the g-c-c keybindings migration, but good to know everything is good to go on your side13:29
didrockssil2100: finishing with the lenses right now, the rest seems good :)13:29
seb128sil2100, hey13:30
sil2100didrocks: I'll double-check with Timo about gsettings in a moment13:31
seb128sil2100, do you plan to update dee? it was not listed on your ubuntu-release@ email13:31
sil2100didrocks: thanks!13:31
sil2100seb128: yes, I missed it in the mail :(13:31
seb128ok, no worry13:31
seb128I was just checking you did notice it13:31
didrockssil2100: ok, all looks good here, after some dogfooding :)13:33
didrockssil2100: I'll only upload on Monday though, still not found of Friday afternoon uploads, you can go on vacation with a light heart, well done!13:34
didrocksmhr3: FYI ^13:34
didrocksmmrazik: you can unfreeze the unity stack I guess :)13:34
sil2100didrocks: thank you! :)13:35
mhr3didrocks, cool13:35
didrockssil2100: thanks to you :)13:36
sil2100didrocks: unfreezing then!13:36
didrockssweet :)13:37
=== james is now known as Guest53826
=== dandrader is now known as dandrader|afk
jaytaokosil2100: didrocks: thanks for the release13:55
didrocksjaytaoko: yw ;)13:55
sil2100jaytaoko: yw - thanks for the help ;)13:58
=== dandrader|afk is now known as dandrader
seb128sil2100, didrocks: any reason to not upload to proposed? nobody should run proposed or those who do can only blame themself14:28
seb128speaking about unity 6.2, I saw the "will be uploaded on monday"14:28
=== andy__ is now known as andyrock
didrocksseb128: not really, but I hope there will be no "copy to release in the wild"14:29
didrocksif you are confident, I can do it14:29
seb128didrocks, I'm confident, nobody is here during W.E and I will announce it in the release meeting14:30
didrocksok, doing then14:30
seb128didrocks, thanks14:32
seb128BRING THE CRACK14:32
seb128sil2100, your phone number is in the directory right? and you have your phone with you at night, w.e and holidays?14:32
* seb128 hides14:32
didrocksseb128: just for your pleasure!14:32
sil2100Erm...14:32
* sil2100 throws away his phone through the window14:33
sil2100I have no phone14:33
seb128lol14:33
sil2100Sorry14:33
sil2100;)14:33
didrocksseb128: I have his address!14:34
sil2100Need to run!14:35
didrockssil2100: you won't run fast enough, why do you think I'm training everyday? :)14:36
sil2100I'm doomed!14:43
sil2100;)14:43
sil2100mhr3: how busy are you? ;)14:57
mhr3sil2100, ehm, moderately busy? :)14:58
=== dandrader is now known as dandrader|lunch
didrockssil2100: you need to ensure that -proposed is added to the merger I guess15:26
didrockssil2100: mmrazik and his team should do that, I don't remember if I added it back last time15:27
didrocks(as the packaging needs latest nux)15:27
sil2100didrocks: ok, will ping him about that15:28
didrocksthanks :)15:28
nmarquesanyone can help me with a build issue (unity 6.2.0) ? (http://fpaste.org/tMI3/)16:13
=== dandrader|lunch is now known as dandrader
MCR1bschaefer: Hi :) +1 for re-proposing and fixing conflicts for improve-keyboard-shortcut-overlay-wording.16:30
MCR1Does someone know why the Jenkins unity-automerger failed to merge so many branches ? The console output https://jenkins.qa.ubuntu.com/job/automerge-unity/1021/console does not really help, but I noticed that many other branches also failed to merge...16:34
nmarquesis unity and nux ready for gcc47 ?16:51
bschaeferMCR1, you're welcome, and im not sure....I think it's being looked at16:54
MCR1bschaefer: thx16:55
MCR1nmarques: I am compiling on Quantal, so I guess the answer is yes16:56
nmarquesMCR1, I'm having here a strange issue around, preventing me from building it16:58
MCR1nmarques: oh, maybe it is the same issue jenkins has ? I did not try lately - what is your error ?16:59
nmarques[   16s] CMake Error at CMakeLists.txt:178 (add_subdirectory):16:59
nmarques[   16s]   add_subdirectory called with incorrect number of arguments16:59
nmarquesstrangely somehow it inserts a line in CMakeLists.txt with: add_subdirectory()17:00
nmarquesand it doesnt build :)17:00
MCR1nmarques: I will try to confírm, wait a minute.17:00
MCR1nmarques: nux compiled17:05
nmarquesnux also builds here fine :)17:06
MCR1nmarques: test_launcher.cpp fails17:09
nmarquesI'm not building the tests and documentation :)17:12
MCR1nmarques: maybe this is a good idea, but here now also BFBLauncherIcon.cpp fails :(, might be my cmake config though17:14
nmarquesMCR1, mine doesn't even start to build :) it fails on the initial config fase17:15
nmarqueshttp://fpaste.org/tMI3/17:15
MCR1http://pastebin.com/SZTgxgFD17:16
bschaefernmarques, sorry, i haven't seen that error before...17:18
bschaeferMCR1, for that error you need libgeis17:18
bschaeferMCR1, and you need to autogen nux with this --enable-gestures17:18
nmarquesbschaefer, CMakeLists.txt gets a 'add_subdirectory()'17:18
MCR1bschaefer: Ah, thx17:18
nmarquesbschaefer, and it blows, maybe a missing dependency (though they all seem to be there)17:19
bschaefernmarques, but I don't get that error, so saying its the make file is odd...17:19
bschaeferare you trying to build unity on fedora?17:19
nmarquesopensuse17:20
nmarques:)17:20
MCR1bschaefer: Do I have to get libgeis from source and compile it also, or is libgeis-dev enough ?17:21
bschaefernmarques, hmm well im not sure why you're getting that config error :(17:21
bschaeferMCR1, if you're on P then yes17:21
bschaeferP = 12.0417:22
bschaeferQ = 12.1017:22
MCR1Q17:22
nmarquesbschaefer, do you know where is the log file from the config? I'm not fluent with cmake17:22
nmarquesbschaefer, maybe the answer lies there :)17:22
bschaefernmarques, im not really either :( sadly...17:22
bschaeferMCR1, yeah that should be good then17:22
MCR1nmarques: You could try cmake-gui, which is quite nice to configure options17:22
nmarquesbschaefer, I think I found it ;)17:22
nmarquesbschaefer, missing dependency, gtest17:22
bschaefernmarques, awesome!17:22
MCR1bschaefer: thx again :)17:23
bschaeferMCR1, np!17:23
MCR1bschaefer: worked now.17:38
bschaeferMCR1, sweet17:38
nmarquesbschaefer, it's building... but there's hardcoded paths for gtest in the makefile, uncool stuff :)18:06
bschaefernmarques, :(, thats no good...if you make a bug report it should get looked at :)18:07
niadhhey18:08
nmarquesbschaefer, it's commented out, so its something people are aware... (gtest)18:08
nmarqueseither way I've disabled the tests and kicked out gtest, hopefully no second effects :P18:08
bschaefernmarques, oo alright, it must have been a work around :(18:08
bschaefernmarques, you could just not built tests haha18:08
bschaefernmarques, yeah! thats the way to do it :)18:08
bschaefer(there should be none! unless you want to run the gtest :) )18:09
niadhHi all, I was looking into packaging Unity for Arch Linux, was wondering if I might be able to get some help here on how to do that?18:09
niadhI have started with the nux component, but it has various dependencies on utouch libraries some of which I can find, others I cant18:11
=== yofel_ is now known as yofel
MCR1bschaefer: Still here ?21:00
MCR1Good news. I guess (hope) I fixed the first of the hardcoded Unity shortcut bugs.21:02
MCR1\o/21:02
bschaeferMCR1, yeah im around21:09
bschaefercool, hmm what issue was it?21:09
MCR1bschaefer: It was multiple issues, one moment21:09
MCR1bug 102274321:10
ubot5`Launchpad bug 1022743 in unity (Ubuntu) "Hardcoded Unity shortcuts create multiple Compiz problems" [Low,Confirmed] https://launchpad.net/bugs/102274321:10
* bschaefer looks21:10
MCR1the problem was that Unity takes over shortcuts, which Compiz already controls21:11
bschaeferMCR1, nice. I never noticed that as I usually keep my shortcuts default haha21:11
bschaeferMCR1, do you have a branch? If so we'll need some tests!21:12
MCR1maybe you noticed the I don't know comments in the branch you have worked on21:12
MCR1when you fixed the conflicts21:12
MCR1the improve wording one21:12
bschaeferyeah, I was just fixing the conflicts, I noticed some //FIXME conflicts blah blah21:12
MCR1yeah, somebody did an unfinished job there, haha21:13
MCR1which introduced bugs21:13
MCR1because both, Unity and Compiz were watching for those keys...21:14
bschaeferMCR1, does this just causes problem with the keyboard shortcut layout or actually causes usability issues?21:14
MCR1usabilty also - no possibility to change shortcuts for example21:14
MCR1if you change them they jump back currently21:14
bschaeferoo I should have looked at the code more....yeah. Im surprised it makes the shortcuts there...21:14
MCR1I guess it was not your fault21:15
* bschaefer just thought it was a nice pretty window21:15
MCR1somebody was to lazy to search for all the Compiz equivalents, so they just got hardcoded21:15
bschaeferand that it was 'pulling' the shortcuts from compiz, and if not then it was just hardcoded21:15
bschaeferyeaah, well if you have a branch that would be an awesome fix :)21:15
MCR1sure, I am working on it, but it will ofc conflict with yours ;)21:16
bschaeferhmm yeah that stupid unity merger isn't working21:16
MCR1maybe I should continue the work on improve-wording ?21:16
bschaeferthough I do like the unity merger it just seems to be always angry :(21:17
MCR1and make it improve-wording-and-shortcuts ;)21:17
bschaeferMCR1, you could do that and say its is a umm...21:17
bschaeferone sec I forgot the name...21:17
bschaeferMCR1, a Prerequisite Branch21:18
MCR1the bad thing is that this was the task for the weekend, and now I fixed it already - haha21:18
bschaeferwhen you do a merge proposal, and under extra options there is a Prerequisite Branch, put my branch under that so it has to be merged first before yours21:18
bschaeferhaha21:18
bschaeferMCR1, no worries, I can take a look at it as well. It's only Friday 2pm here21:19
MCR1bschaefer: yes, I mistakenly used that once already... ;)21:19
MCR1USA ?21:19
bschaeferMCR1, yup21:19
bschaeferit gets lonely on Fridays around this time haha21:19
MCR1hehe21:19
=== JanC_ is now known as JanC
MCR1ok, I'll start from your branch and re-fix and fix stuff there and then I submit the proposal with your branch as prerequisite, but it might take a while (I need a break now ;))21:22
bschaeferMCR1, no worries ping me when it's ready for a review :)21:23
MCR1ok, ql21:23
cjohnstonme4oslav: ping21:52
MCR1bschaefer: Part One should be ready for review: https://code.launchpad.net/~mc-return/unity/unity.merge.fix-hardcoded-keys-part1/+merge/11920422:14
bschaeferMCR1, 32+ hints.push_back(std::shared_ptr<shortcut::AbstractHint>(new shortcut::MockHint(_("Switching"), "", "", _("Move the focus."), shortcut::HARDCODED_OPTION, _("Left & Right"))));22:16
bschaeferwhat was done on that line?22:16
bschaeferi can't see a change haha22:16
=== salem_ is now known as _salem
MCR1bschaefer: foucs -> focus22:16
MCR1typo22:16
bschaeferMCR1, nice, im bad at finding those kind of typos haha22:16
MCR1I am good at those -> they hurt my eyes22:17
bschaeferMCR1, let me test it. Yeah I was staring at it intensively but still couldn't find it!22:17
MCR1bschaefer: Unfortunately some of the shortcuts need more investigation, while others, which are Unity-only, need additional options in the unityshell plug-in.22:18
MCR1bschaefer: Some simply ARE hardcoded, which is bad.22:18
bschaeferMCR1, yeah...hmm but at lease it's slowly getting fixed...idk why they were hard coded22:19
MCR1I think someone would have had to add additional code to the unityshell plug-in, but I have to investigate.22:20
bschaeferMCR1, hmm im still finding it hard to believe this is were shortcuts get generated though...cause im pretty sure events go X11 -> Compiz -> Unity or X11 -> Nux -> unity22:20
MCR1I think, that when you invent a new feature you do not think about the possibility of configuring it, you simply add the feature first and make it work with some default22:20
bschaeferyeah22:20
bschaeferwell let me test this out!22:21
bschaefercause unity overrides compiz events (which is also a bad workaround...)22:22
bschaefersometimes22:22
MCR1bschaefer: I cannot test the fix at the moment, but it makes sense for me, hopefully it works, but imho it should - or things are more complicated than needed22:22
bschaeferMCR1, cause what I would think it does is use a Get...to Get the current shortcut so it can draw the correct one22:23
bschaefernot set it, but if it also Sets it then that would be a problem...haha22:23
bschaefer(also bad design if it Gets and Sets with 1 function call...)22:24
MCR1bschaefer: Can you test it ? I am a bit excited...22:24
bschaeferMCR1, yeah, i have to let it compile first :)22:24
* bschaefer should have merged it to my unity branch...22:24
MCR1cool, thanks - I'll tell you in the meantime how to best test if it works...22:25
bschaefereither way though, you're branch is good. As it fixes hard coded problems22:25
bschaeferwell im guessing to test it would be to change the shortcut option in CCSM with one of the ones you changed22:26
MCR1to test it go to CCSM->General Options->Key Bindings and change the "Window Menu" key to something else than <Alt>space22:26
MCR1bschaefer: yes, exactly - I just wanted to guide you along the way (many folks do not like CCSM it seems)22:27
MCR1:)22:27
bschaeferyeeah CCSM can cause 'problems'22:27
bschaeferMCR1, /home/bschaefer/src/unity.merge.fix-hardcoded-keys-part1/shortcuts/StandaloneShortcuts.cpp:77:202: error: expected ‘)’ before ‘;’ token22:28
bschaeferyou forgot a ')' :)22:28
MCR1ups22:29
MCR1it is 0:29 here ;)22:29
bschaeferno problem, I did that when I was fixing the conflict on all of them haha22:29
bschaeferoo that is a bit late!22:29
MCR1I will fix it in the branch22:30
bschaeferMCR1, hmm I wonder if that was from my branch haha22:31
bschaeferit couldn't be though as it was compiling...22:31
bschaefero well it's an easy fix :)22:31
MCR1no, I think it was my fault during copypaste22:31
bschaeferoo yeah, that'll happen. I don't like how we even generate all those shortcuts...22:32
bschaeferI want to get it into a header in a const structure...22:32
MCR1Compiz is great at shortcut handling imho22:32
bschaeferyeah, compiz does shortcuts well...I just don't like:22:33
bschaeferhints.push_back(std::shared_ptr<shortcut::AbstractHint>(new shortcut::MockHint(_("Menu Bar"), "", "", _("Reveals application menu."), shortcut::COMPIZ_KEY_OPTION, "unityshell", "show_hud")));22:33
bschaefer50 times...22:33
bschaeferwe should be able to loop over a structure that will do that haha22:33
bschaeferplus we have duplication in unityshell.cpp and that Standalone one...22:33
MCR1hehe22:34
MCR1yes the duplication is stupid22:34
MCR1pushed22:34
bschaeferMCR1, yeah. Hmm you're branch didn't seem to fix it :(22:34
MCR1noooooooooooooooooooo22:34
bschaeferMCR1, I think this is a problem somewhere else, possibly in compiz or in unity.xml thingy hmm22:35
MCR1then I have to dig further into the code - planned to find some time for that on the weekend...22:35
MCR1thanks a lot for testing - does it still jump back to Alt+Space ?22:35
bschaeferMCR1, you're branch is still good though. As we don't want that hardcoded stuff in there...22:35
bschaeferyeah22:35
MCR1grmmpf22:35
bschaeferso you're branch will still get merged :)22:35
MCR1but should be easy to find the problem... but not today22:36
bschaeferyeah haha22:36
MCR1ok, thx a lot for the help22:36
bschaeferMCR1, np! Go get some sleep :)22:36
bschaeferthanks for digging into that problem :)22:36
MCR1yeah, I guess we will fix for 12.10 ;)22:37
MCR1gn22:37
bschaeferyup. good night!22:37

Generated by irclog2html.py 2.7 by Marius Gedminas - find it at mg.pov.lt!