| MohammadAG | Sc0rpius, just repaint it at each orientation change | 00:04 |
|---|---|---|
| Sc0rpius | welll I used "screen-changed" property at first with a gtk_widget_queue_draw and didn't work | 00:05 |
| MohammadAG | that repaints it? | 00:06 |
| thp | Sc0rpius: configure event should do the trick | 00:06 |
| Sc0rpius | something makes me think the button is being redrawn already (that's why from portrait to landscape works) | 00:06 |
| Sc0rpius | and maybe it's not getting the new screen properties right or something | 00:06 |
| thp | you get the new window size. then you just check width > height, etc.. | 00:06 |
| MohammadAG | thp, shouldn't matter | 00:06 |
| MohammadAG | redrawing it should happen on both orientation changes | 00:07 |
| Sc0rpius | and that's really weird... it already works from portrait -> landscape... it's just from landscape -> portrait it doesn't work | 00:07 |
| MohammadAG | yeah | 00:07 |
| Sc0rpius | I'll try some other stuff but I have to do some groceries shopping now :( bbl | 00:07 |
| *** Venemo has quit IRC | 00:34 | |
| *** Venemo has joined #maemo-ssu | 00:38 | |
| *** _NIN has quit IRC | 01:18 | |
| *** Sc0rpius has quit IRC | 01:18 | |
| *** Sc0rpius has joined #maemo-ssu | 01:28 | |
| *** lardman has joined #maemo-ssu | 01:36 | |
| *** lardman has quit IRC | 01:36 | |
| *** lardman has joined #maemo-ssu | 01:36 | |
| *** trbs has quit IRC | 01:39 | |
| Sc0rpius | hmm | 01:44 |
| Sc0rpius | this is hard to test if Xephyr doesn't allow size change | 01:45 |
| *** lardman has quit IRC | 01:48 | |
| *** timeless has quit IRC | 01:55 | |
| *** cuerva has quit IRC | 02:09 | |
| *** barzam has quit IRC | 02:23 | |
| *** Lava_Croft has quit IRC | 02:24 | |
| *** Lava_Croft has joined #maemo-ssu | 02:24 | |
| *** barzam has joined #maemo-ssu | 02:24 | |
| *** merlin1991 has quit IRC | 02:37 | |
| *** Venemo has quit IRC | 02:37 | |
| *** Venemo has joined #maemo-ssu | 02:39 | |
| *** arcean has quit IRC | 02:59 | |
| *** Echo- has quit IRC | 03:04 | |
| njsf | Hi all | 03:33 |
| njsf | I'd like to help by testing the "unstable" CSSU | 03:33 |
| njsf | but since it is my main device, I'd like to know how dangerous is it ? | 03:33 |
| njsf | I keep regular backups and an occasional reflash would not stop me from doing it... | 03:34 |
| Sc0rpius | no danger at all | 03:35 |
| Sc0rpius | do you use BackupMenu? | 03:35 |
| *** cyteen has joined #maemo-ssu | 03:55 | |
| njsf | No, not backupmenu | 04:20 |
| njsf | sorry for the delay got sidetracked | 04:20 |
| njsf | I use the regular backup and I do a frequent rsync | 04:20 |
| Sc0rpius | ok | 04:28 |
| Sc0rpius | well BackupMenu is great | 04:28 |
| Sc0rpius | I think there's no turning back (yet) if you go to CSSU, but you get updated stuff | 04:28 |
| Sc0rpius | updated Modest (faster), updated Hildon Desktop, etc, and a lot of nice things | 04:28 |
| njsf | well I already have the stable one | 04:29 |
| Sc0rpius | and weekly updates, since all the time the community is updating and improving stuff | 04:29 |
| njsf | where actually my modest has been crashing frequently | 04:29 |
| Sc0rpius | well if you go to CSSU | 04:29 |
| Sc0rpius | and your Modest crashes | 04:29 |
| njsf | But I don't know if that is not some sqlite corruption | 04:29 |
| Sc0rpius | we can fix it | 04:29 |
| njsf | Modest has been released then... | 04:29 |
| njsf | nice | 04:29 |
| njsf | I guess I should clone the gitorious stuff | 04:29 |
| Sc0rpius | yeah latest MOdest version is 3.90.7+CSSU updates | 04:29 |
| njsf | I can also help there | 04:30 |
| Sc0rpius | if you're using PR 1.3, then your Modest is 3.4.8 | 04:30 |
| njsf | I mean I'll have a learning curve of course | 04:30 |
| Sc0rpius | sure, you can develop stuff, fix bugs, translate stuff, etc | 04:30 |
| njsf | I assume only with dpkg I can see the version? | 04:34 |
| Sc0rpius | yeah | 04:37 |
| Sc0rpius | dpkg -l | grep modest | 04:37 |
| Sc0rpius | ii modest 3.90.8-2 an e-mail client for platforms with modest r | 04:37 |
| njsf | Version: 3.90.7-3 | 04:37 |
| Sc0rpius | oh nice, you already got CSSU then :) | 04:37 |
| njsf | yes, just not the testing one | 04:37 |
| njsf | I guess I am missing some repos | 04:38 |
| njsf | I do my rsyncs via ssh | 04:38 |
| njsf | learn my lesson after the USB connector broke | 04:38 |
| Sc0rpius | I wonder which version is the stable one | 04:38 |
| njsf | probably the one I listed ;) | 04:38 |
| Sc0rpius | and actually I didn't know there was a stable version already | 04:39 |
| Sc0rpius | I think you installed the testing | 04:39 |
| Sc0rpius | because there's no stable yet :P | 04:39 |
| njsf | oh... ok then | 04:39 |
| njsf | I though the instructions on the announcement were of the stable repos | 04:40 |
| Sc0rpius | what's the version of your mp-fremantle-community-pr package? | 04:40 |
| njsf | but I am ok with it | 04:40 |
| njsf | I am just in the middle of an apt-get update... | 04:40 |
| Sc0rpius | ok | 04:40 |
| njsf | 20.2010.36-2ma | 04:43 |
| njsf | Is this the cssu repos ? deb http://repository.maemo.org/community-testing/ fremantle free non-free | 04:44 |
| njsf | Ahh just noticed that I have some upgrades to do | 04:45 |
| njsf | funny, it seems that FAM does not detect these | 04:45 |
| njsf | and I mostly use FAM not HAm | 04:45 |
| njsf | doing apt-get upgrade from the prompt now | 04:45 |
| njsf | there is indeed an upgrade for modest there | 04:46 |
| njsf | so http://gitorious.org/community-ssu is where all the updates are being managed ? | 04:46 |
| *** chainsawbike has quit IRC | 04:47 | |
| Sc0rpius | yeah that's the one | 04:47 |
| njsf | So I guess that now that modest is free I can address a pet peeve I have with it regarding nokia messaging :D | 04:48 |
| njsf | I should probably also add that deb to the scratchbox repos right ? | 04:49 |
| *** chainsawbike has joined #maemo-ssu | 04:49 | |
| Sc0rpius | yeah definitely but CSSU is not installable as a whole in scratchbox | 04:58 |
| Sc0rpius | but you can install parts of it | 04:59 |
| njsf | ok, and regarding PR-1.3 any change I should make ? | 04:59 |
| njsf | I last did anything when we were still at PR 1.2 and I just did an apt-get update there and nothing seemed to change | 05:00 |
| njsf | is the SDK for 1.2 still current for 1.3 then ? | 05:00 |
| Sc0rpius | I guess the latest is SDK update 7 | 05:01 |
| Sc0rpius | and I don't think it's the same than 1.2, read here: | 05:01 |
| Sc0rpius | http://www.forum.nokia.com/info/sw.nokia.com/id/c05693a1-265c-4c7f-a389-fc227db4c465/Maemo_5_SDK.html | 05:01 |
| Sc0rpius | This version of the SDK provides developers with the software delivered in the sixth software update to the Nokia N900 mobile computer (PR 1.3, version 10.2010.36-2). | 05:02 |
| njsf | hmmm ok I guess I need to reinstall it | 05:02 |
| njsf | thanks Sc0rpius | 05:02 |
| njsf | good thing tomorrow is a holiday for me | 05:02 |
| njsf | will do it then | 05:02 |
| njsf | going afk for now | 05:02 |
| *** M4rtinK has quit IRC | 05:23 | |
| Sc0rpius | well just one bug away to finish the tree view mode | 05:25 |
| Sc0rpius | or so I think | 05:26 |
| *** chainsawbike has quit IRC | 05:41 | |
| *** chainsawbike has joined #maemo-ssu | 05:43 | |
| Sc0rpius | [28791]: GLIB CRITICAL ** GLib-GObject - Object class ModestHildonPannableAreaScrollable doesn't implement property 'movement-mode' from interface 'ModestScrollable' | 07:18 |
| Sc0rpius | it seems there are some other spots where movement-mode is used instead of mov-mode | 07:18 |
| *** DocScrutinizer has quit IRC | 07:28 | |
| *** DocScrutinizer has joined #maemo-ssu | 07:28 | |
| *** normaltusker_ has joined #maemo-ssu | 09:21 | |
| *** normaltusker_ has quit IRC | 09:25 | |
| ruskie | njsf, what do you mean now that it's free.... was free since before... | 10:38 |
| *** normaltusker has joined #maemo-ssu | 12:03 | |
| *** arcean has joined #maemo-ssu | 12:31 | |
| *** arcean is now known as arcean_ | 12:32 | |
| *** lizardo has joined #maemo-ssu | 13:10 | |
| *** normaltusker has quit IRC | 13:21 | |
| *** lardman|home is now known as lardman | 13:26 | |
| *** lardman has joined #maemo-ssu | 13:26 | |
| *** BCMM has joined #maemo-ssu | 13:48 | |
| BCMM | did a CSSU update clobber my transitions.ini? | 13:49 |
| thp | BCMM: it probably overwrote yours | 13:49 |
| thp | BCMM: when hildon-desktop gets updated, transitions.ini also gets updated | 13:50 |
| BCMM | that's what i meant; thought so | 13:50 |
| BCMM | doesn't debian have a way to cope with that? surely people don't lose stuff like httpd.conf | 13:51 |
| mirr0r | it creates a backup, transitions.ini.old | 13:54 |
| BCMM | also, where is it kept? i've totally forgotten | 13:54 |
| mirr0r | in /usr/share/hildon-desktop/ | 13:54 |
| BCMM | mirr0r: thanks! | 13:54 |
| thp | BCMM: well, debian has "configuration files", but by default, i think it only assumes files in /etc are configuration files (they are handled in a special way when upgrading) | 13:55 |
| BCMM | thp: thanks, that makes sense | 13:55 |
| BCMM | same on gentoo, which i'm famiiar with: certian dirs like /etc/ are protected | 13:55 |
| thp | i think http://www.debian.org/doc/debian-policy/ap-pkg-conffiles.html has the details | 13:56 |
| mirr0r | thp, is your fast rotation patch already in cssu? | 13:57 |
| thp | it's in the git repos, don't know about release status | 13:58 |
| thp | if you have zaxisrotation as an option in transitions.ini, it's in there :) | 13:58 |
| mirr0r | heh, i dont | 14:01 |
| *** xnt14 has quit IRC | 14:02 | |
| *** xnt14 has joined #maemo-ssu | 14:03 | |
| ruskie | hmm I hope the portrait launcher has an option to disable auto rotation... else that should be certainly added in... | 14:05 |
| mirr0r | 20.2010.36-2maemo11 is the newest version, right? | 14:05 |
| BCMM | portrait launcher? sounds nice | 14:13 |
| BCMM | so does faster rotation actually | 14:13 |
| BCMM | is portait task switching feasible at all? switching between portait browser windows is a pain ATM | 14:15 |
| *** psycho_oreos has joined #maemo-ssu | 14:26 | |
| *** RST38h has quit IRC | 14:30 | |
| thp | you can force it using shift+ctrl+fn+i in task switcher mode.. we need to relayout the windows as you can see | 14:30 |
| thp | or rather shift+ctrl+fn+L | 14:30 |
| *** RST38h has joined #maemo-ssu | 14:30 | |
| *** M4rtinK has joined #maemo-ssu | 14:31 | |
| *** NIN101 has joined #maemo-ssu | 14:32 | |
| *** BCMM_ has joined #maemo-ssu | 15:01 | |
| MohammadAG | thp, neat shortcut | 15:08 |
| *** NIN101 has quit IRC | 15:38 | |
| *** psycho_oreos has quit IRC | 15:42 | |
| *** BCMM_ has quit IRC | 15:45 | |
| andre__ | errm, power-kernel is not suddenly part of CSSU, is it? | 16:14 |
| * andre__ wants to close a report as INVALID | 16:15 | |
| BCMM | thp: shiny! | 16:18 |
| *** cyteen has quit IRC | 16:34 | |
| *** mardy has quit IRC | 16:40 | |
| *** M4rtinK has quit IRC | 16:53 | |
| Jaffa | Morning, all | 17:45 |
| Jaffa | andre__: No, it's not (yet) | 17:46 |
| Jaffa | andre__: Ah, I see - bug 11958 | 17:46 |
| povbot | Bug https://bugs.maemo.org/11958 Sofia SIP is stuttering | 17:46 |
| andre__ | yeah, that one I had in mind | 17:48 |
| andre__ | "Phone call doesn't work, that's all." descriptions really don't help in reproducing | 17:49 |
| *** NIN101 has joined #maemo-ssu | 17:53 | |
| *** Aranel has quit IRC | 17:58 | |
| *** Guest32552 has joined #maemo-ssu | 18:05 | |
| *** Guest32552 has quit IRC | 18:10 | |
| *** Aranel_ has joined #maemo-ssu | 18:10 | |
| *** Aranel_ is now known as Aranel | 18:12 | |
| *** Aranel has joined #maemo-ssu | 18:12 | |
| *** lardman is now known as lardman|gone | 18:53 | |
| *** andre__ has quit IRC | 19:25 | |
| *** andre__ has joined #maemo-ssu | 19:25 | |
| *** BCMM has quit IRC | 19:29 | |
| *** lardman has joined #maemo-ssu | 19:34 | |
| *** trbs has joined #maemo-ssu | 19:45 | |
| *** lcuk has quit IRC | 19:52 | |
| *** BCMM has joined #maemo-ssu | 19:58 | |
| *** BCMM has quit IRC | 19:58 | |
| *** BCMM has joined #maemo-ssu | 19:58 | |
| *** marcels has joined #maemo-ssu | 20:00 | |
| *** M4rtinK has joined #maemo-ssu | 20:05 | |
| *** Milhouse has quit IRC | 20:14 | |
| *** Milhouse has joined #maemo-ssu | 20:18 | |
| *** Milhouse has quit IRC | 20:18 | |
| *** Milhouse has joined #maemo-ssu | 20:18 | |
| MohammadAG | Jaffa, any suggestions on where I should place the .png for the maemo.org logo? | 20:31 |
| * MohammadAG was thinking /usr/share/pixmaps | 20:31 | |
| *** divan has joined #maemo-ssu | 20:32 | |
| *** arcean_ has quit IRC | 20:33 | |
| *** arcean__ has joined #maemo-ssu | 20:33 | |
| *** Aranel_ has joined #maemo-ssu | 20:34 | |
| *** Aranel has quit IRC | 20:34 | |
| *** Aranel_ is now known as Aranel | 20:44 | |
| *** Aranel has quit IRC | 20:44 | |
| *** Aranel has joined #maemo-ssu | 20:44 | |
| *** divan has quit IRC | 20:45 | |
| *** arcean__ is now known as arcean_ | 20:50 | |
| *** NIN101 has quit IRC | 20:52 | |
| *** M4rtinK has quit IRC | 20:57 | |
| *** NIN101 has joined #maemo-ssu | 21:08 | |
| *** marcels_ has joined #maemo-ssu | 21:27 | |
| Jaffa | MohammadAG: Yeah, /usr/share/pixmaps would be my assumption. | 21:29 |
| *** marcels_ has quit IRC | 21:29 | |
| Jaffa | MohammadAG: Or /opt/maemo/usr/share/pixmaps perhaps | 21:30 |
| *** marcels has quit IRC | 21:30 | |
| *** NIN101 has quit IRC | 21:33 | |
| MohammadAG | Jaffa, afaik that's a symlink back to /usr/share/pixmaps | 21:35 |
| Sc0rpius | heh | 21:39 |
| *** NIN101 has joined #maemo-ssu | 21:39 | |
| Jaffa | MohammadAG: Ah, I forget which hacks were introduced in the later PRs ;-) | 21:40 |
| *** lcuk has joined #maemo-ssu | 21:40 | |
| *** lcuk has quit IRC | 21:40 | |
| *** lcuk has joined #maemo-ssu | 21:40 | |
| *** marcels has joined #maemo-ssu | 21:45 | |
| andre__ | https://bugs.maemo.org/show_bug.cgi?id=10783#c4 might be a workaround that could be interesting for russian CSSU users | 22:03 |
| povbot | Bug 10783: Ctrl button types in "A" in Russian layout on home screen | 22:03 |
| andre__ | one-line code change | 22:03 |
| MohammadAG | andre__, fixed | 22:18 |
| *** marcels has quit IRC | 22:18 | |
| andre__ | MohammadAG, heh, that was quick. also added a comment on that ticket that it'll be in CSSU? | 22:19 |
| MohammadAG | andre__, you need push email :P | 22:19 |
| andre__ | no way. If I get a notification bubble every 10 seconds on my desktop I cannot concentrate on work anymore | 22:20 |
| *** NIN101 has quit IRC | 22:20 | |
| MohammadAG | heh | 22:21 |
| *** NIN101 has joined #maemo-ssu | 22:21 | |
| MohammadAG | Jaffa, I see no issues with nicolai's patch | 22:23 |
| Jaffa | MohammadAG: URL? | 22:30 |
| MohammadAG | Jaffa, the 9-homescreen one | 22:30 |
| MohammadAG | https://bugs.maemo.org/show_bug.cgi?id=11933 | 22:30 |
| povbot | Bug 11933: Support further desktops (5-9) | 22:30 |
| Jaffa | MohammadAG: The UI is fugly. | 22:30 |
| Jaffa | It looks amateurish. | 22:30 |
| Jaffa | Surely 8 is sufficient, and doesn't lead to a nasty UI | 22:31 |
| Jaffa | ? | 22:31 |
| MohammadAG | Matan had a better approach tbh | 22:31 |
| MohammadAG | he had a hildon pannable area that scrolled horizontally | 22:31 |
| Jaffa | Ah, that sounds much nicer. | 22:31 |
| MohammadAG | so it looked the same as it is now | 22:31 |
| Jaffa | Why are both doing 9, btw? Is there something inherent? | 22:31 |
| MohammadAG | I think that's the maximum | 22:31 |
| MohammadAG | not sure though | 22:31 |
| MohammadAG | I mean, 12 would look better in nicolai's UI | 22:32 |
| Jaffa | Indeed | 22:32 |
| Jaffa | Perhaps suggest to him reworking it to use a horizontal pannable UI? | 22:32 |
| MohammadAG | sec, lemme find Matan's patch | 22:33 |
| MohammadAG | I had it in the CSSU at some point before release | 22:33 |
| MohammadAG | http://gitorious.org/community-ssu/hildon-home/commit/31487c09dc47ff31274a7a8f525c06fa42752323 | 22:34 |
| *** BCMM_ has joined #maemo-ssu | 22:34 | |
| *** cyteen has joined #maemo-ssu | 22:35 | |
| MohammadAG | you know | 22:35 |
| MohammadAG | I think we can do those easily | 22:35 |
| MohammadAG | I'll try and merge it now | 22:35 |
| MohammadAG | building | 22:41 |
| MohammadAG | Jaffa, done, seems to work fine | 22:44 |
| MohammadAG | Jaffa, http://i51.tinypic.com/2wr2epx.jpg | 22:46 |
| Jaffa | Cool | 22:46 |
| MohammadAG | and it doesn't break background selection, that's why nicolai's patch beats matan's :D | 22:47 |
| Jaffa | Shiny :-) | 22:48 |
| Jaffa | When're you thinking of releasing? | 22:51 |
| Jaffa | Did you and Sc0rpius sort modest portrait, btw? | 22:51 |
| MohammadAG | not the "New Message" button | 22:52 |
| MohammadAG | but the rest works fine | 22:52 |
| *** microlith has quit IRC | 22:54 | |
| Jaffa | What's the problem with "New Message"? Too wide? | 22:54 |
| MohammadAG | no, it doesn't get repainted unless it's interacted with | 22:55 |
| MohammadAG | and only when switched to portrait mode, when going from portrait to landscape it's repainted | 22:55 |
| Jaffa | Eugh | 22:55 |
| MohammadAG | also, hildon-application-manager in the git repo is 12 versions old(!!!) | 22:55 |
| MohammadAG | need to update that and merge thp's patch, quick | 22:56 |
| Jaffa | :) | 22:59 |
| Sc0rpius | so people can expect 2maemo12 today? | 23:05 |
| MohammadAG | maybe :p | 23:07 |
| * MohammadAG builds modest | 23:08 | |
| Sc0rpius | I have some new ideas to try for the New Message Button | 23:08 |
| Sc0rpius | that occurred to me while I was sleeping last night | 23:08 |
| MohammadAG | try them :P | 23:08 |
| Sc0rpius | yeah I will tonite | 23:08 |
| * MohammadAG watches temperature of laptop rise to 76C | 23:08 | |
| MohammadAG | btw Sc0rpius | 23:09 |
| Sc0rpius | ? | 23:09 |
| MohammadAG | Sc0rpius, look at folder view | 23:10 |
| MohammadAG | where you see Inbox Sent etc | 23:10 |
| MohammadAG | apply ctrl+shift+r | 23:10 |
| MohammadAG | the new message button works fine, only in that view | 23:10 |
| * Sc0rpius tries | 23:11 | |
| *** wmarone has joined #maemo-ssu | 23:11 | |
| Sc0rpius | doesn't work for me | 23:11 |
| MohammadAG | hmm | 23:11 |
| Sc0rpius | folder view is where I see Inbox, Drafts, Outbox, Sent, etc | 23:11 |
| MohammadAG | yeah | 23:11 |
| Sc0rpius | nope, same bug | 23:11 |
| Sc0rpius | header view, same | 23:12 |
| Sc0rpius | and finally account view, same | 23:12 |
| MohammadAG | hmm | 23:12 |
| MohammadAG | must be Nokia Messaging then | 23:12 |
| Sc0rpius | where can I get a Nokia Messaging account? | 23:13 |
| MohammadAG | email.nokia.com | 23:13 |
| Sc0rpius | I think it doesn't allow me to create one | 23:13 |
| MohammadAG | works well for gmail tbh | 23:13 |
| MohammadAG | why | 23:13 |
| Sc0rpius | it says something like "your pone already has it, follow instructions there" | 23:14 |
| Sc0rpius | but you can't create the account in the phone | 23:14 |
| MohammadAG | hmm | 23:14 |
| MohammadAG | I signed up N95-times | 23:14 |
| MohammadAG | chose the N95 | 23:14 |
| MohammadAG | choose* | 23:14 |
| Sc0rpius | Download the most up to date Nokia Messaging software to your phone. | 23:15 |
| Sc0rpius | With your mobile phone browser go to http://email.nokia.com. | 23:15 |
| Sc0rpius | that's choosing N95 | 23:15 |
| MohammadAG | hmm | 23:15 |
| MohammadAG | you should be able to create an account on the N900 itself | 23:15 |
| Sc0rpius | let's see | 23:17 |
| Sc0rpius | hmm interesting | 23:18 |
| Sc0rpius | there's no curl for N900? | 23:22 |
| MohammadAG | no idea | 23:23 |
| Sc0rpius | http://ompldr.org/vN2lhZA | 23:26 |
| Sc0rpius | it seems I could do it | 23:26 |
| Sc0rpius | but I wonder if I can see subfolders of Gmail via Nokia Messaging | 23:26 |
| Sc0rpius | oh my god, in LIST mode I have to first select the account, and then the mailbox NO WAY | 23:29 |
| Sc0rpius | in my tree view mode (as you can see in the link above) you don't need to do that | 23:29 |
| MohammadAG | Sc0rpius, you know stuff about git and merging right? | 23:30 |
| MohammadAG | looking forward to tree view :D | 23:30 |
| Sc0rpius | it's almost ready, I have a bug in "move folder" and the screenshot thing that is not working right, but everything else works perfectly | 23:31 |
| Sc0rpius | I know little about git and merging, but ask away anyway | 23:31 |
| Sc0rpius | I know there's a #git here in Freenode heh | 23:31 |
| MohammadAG | screenshot? | 23:32 |
| MohammadAG | and the screenshot thing that is not working right | 23:32 |
| MohammadAG | what screenshot thing? | 23:32 |
| MohammadAG | rm /home/user/.cache/launch/com.nokia.modest.pvr and it'll be recreated if you're talking about the startup screenshot | 23:33 |
| MohammadAG | about git, I fetched ham-2-2 from the remote repository, how do I merge it? | 23:33 |
| MohammadAG | [sbox-FREMANTLE_ARMEL: ~/ssu/hildon-application-manager] > git fetch git://gitorious.org/hildon-application-manager/mainline.git ham-2-2 | 23:33 |
| MohammadAG | From git://gitorious.org/hildon-application-manager/mainline | 23:33 |
| MohammadAG | * branch ham-2-2 -> FETCH_HEAD | 23:33 |
| Sc0rpius | Modest creates that PVR screenshot, in tree view mode I try to create it after the GtkWindow is mapped, but then a get a black screen | 23:34 |
| Sc0rpius | in the account view mode Modest creates the screenshot everytime you close it, using the destroy signal | 23:34 |
| MohammadAG | yeah, that's how most apps do it | 23:34 |
| Sc0rpius | but I can't do that in tree view mode because it'll be very very weird | 23:34 |
| MohammadAG | true | 23:34 |
| Sc0rpius | I have/want to create it when the the GtkTreeView is mapped <--- I haven't tried that yet | 23:35 |
| MohammadAG | any ideas about the problem above? | 23:35 |
| Sc0rpius | ok to merge from another repository I do: | 23:35 |
| Sc0rpius | git pull http://foreignrepository | 23:35 |
| Sc0rpius | git push | 23:35 |
| Sc0rpius | and that's it | 23:35 |
| MohammadAG | I want to merge a branch with another one | 23:35 |
| Sc0rpius | oh ok | 23:35 |
| MohammadAG | ham-2-2 with master | 23:35 |
| Sc0rpius | then forget what I said | 23:35 |
| MohammadAG | heh | 23:36 |
| Sc0rpius | while in master: git merge <branch> | 23:36 |
| Sc0rpius | if the changes don't conflict, it works | 23:36 |
| MohammadAG | [sbox-FREMANTLE_ARMEL: ~/ssu/hildon-application-manager] > git checkout master | 23:37 |
| MohammadAG | Already on "master" | 23:37 |
| MohammadAG | Your branch is ahead of the tracked remote branch 'origin/master' by 1 commit. | 23:37 |
| Sc0rpius | ok now: git merge ham-2-2 | 23:37 |
| MohammadAG | <MohammadAG> [sbox-FREMANTLE_ARMEL: ~/ssu/hildon-application-manager] > git merge ham-2-2 | 23:37 |
| MohammadAG | <MohammadAG> ham-2-2 - not something we can merge | 23:37 |
| Sc0rpius | and that will merge ham-2-2 TO master | 23:37 |
| Sc0rpius | hmm | 23:37 |
| Sc0rpius | 'git branch' only gives you master? | 23:38 |
| MohammadAG | yes | 23:38 |
| Sc0rpius | ah but you can't merge remotely branches | 23:39 |
| Sc0rpius | you have to create a copy of the branch first that references the branch in the repository and then merge | 23:39 |
| MohammadAG | hmm, how? | 23:39 |
| MohammadAG | git checkout ham-2-2? | 23:39 |
| wmarone | :w | 23:41 |
| wmarone | doh, wrong window | 23:41 |
| Sc0rpius | git checkout ham-2-2 will let you peek at the branch | 23:42 |
| Sc0rpius | but I use git checkout -b ham-2-2 origin/ham-2-2 | 23:42 |
| MohammadAG | [sbox-FREMANTLE_ARMEL: ~/ssu/hildon-application-manager] > git checkout ham-2-2 | 23:42 |
| MohammadAG | error: pathspec 'ham-2-2' did not match any file(s) known to git. | 23:42 |
| Sc0rpius | yeah well it's origin/ham-2-2 | 23:43 |
| Sc0rpius | so I would do is: | 23:43 |
| MohammadAG | [sbox-FREMANTLE_ARMEL: ~/ssu/hildon-application-manager] > git checkout -b ham-2-2 origin/ham-2-2 | 23:43 |
| MohammadAG | fatal: git checkout: updating paths is incompatible with switching branches/forcing | 23:43 |
| MohammadAG | Did you intend to checkout 'origin/ham-2-2' which can not be resolved as commit? | 23:43 |
| Sc0rpius | git branch -r gives you origin/ham-2-2 ? | 23:43 |
| * Sc0rpius checks your repository | 23:44 | |
| Sc0rpius | you don't have a ham-2-2 branch in your repository | 23:44 |
| Sc0rpius | just master | 23:44 |
| Sc0rpius | if you want to merge a remote repository branch ham-2-2 into your master repository | 23:45 |
| MohammadAG | yeah | 23:45 |
| Sc0rpius | go to your master updated, git fetch from remote repository ham-2-2 | 23:45 |
| Sc0rpius | and then git push | 23:45 |
| Sc0rpius | you aren't really merging | 23:45 |
| MohammadAG | I'm cherry picking | 23:46 |
| MohammadAG | I git fetched, nothing changed | 23:46 |
| Sc0rpius | how did you fetch? | 23:46 |
| *** merlin1991 has joined #maemo-ssu | 23:47 | |
| MohammadAG | [sbox-FREMANTLE_ARMEL: ~/ssu/hildon-application-manager] > git fetch git://gitorious.org/hildon-application-manager/mainline.git ham-2-2 | 23:47 |
| MohammadAG | hmm, crap | 23:48 |
| Sc0rpius | what you want is a git pull | 23:48 |
| MohammadAG | did that, conflicts | 23:48 |
| Sc0rpius | then I guess we have to resolve the conflicts | 23:49 |
| Jaffa | Sc0rpius: For the screenshot, try setting a timer to go off about 80ms after the window is mapped. That's what Hermes does, copying the code from - erm - HAM, I think | 23:50 |
| Sc0rpius | Hermes sounds like a PS3 hacker to me | 23:51 |
| Sc0rpius | but I don't want to "block" Modest to take the screenshot | 23:51 |
| MohammadAG | heh | 23:51 |
| MohammadAG | timer != block | 23:51 |
| Sc0rpius | maybe using g_something_function_to_do_that | 23:51 |
| MohammadAG | afaik timers run in a separate thread, at least in Qt | 23:51 |
| MohammadAG | g_object_timer I think | 23:51 |
| Sc0rpius | well in GTK there are functions to add "tasks" that will be run in the main loop in a specified time | 23:52 |
| MohammadAG | though my memory's rusty when it comes to gtk stuff | 23:52 |
| Sc0rpius | or g_idle_something to run the task in idle | 23:52 |
| Sc0rpius | but that will be a solution nonetheless | 23:52 |
| Sc0rpius | I'll check HAM | 23:52 |
| MohammadAG | is there a way to restart a repository? | 23:52 |
| MohammadAG | i.e clean it up | 23:52 |
| MohammadAG | without deleting it | 23:52 |
| Sc0rpius | I don't think so | 23:55 |
| MohammadAG | Sc0rpius, then is there a way to backup a merge request? | 23:58 |
| Sc0rpius | backup a merge request? how so? | 23:58 |
| MohammadAG | a .diff/patch | 23:58 |
| Sc0rpius | well yeah | 23:59 |
| Sc0rpius | easiest way for me is go to the merge request in gitorious | 23:59 |
| MohammadAG | oh, found it | 23:59 |
Generated by irclog2html.py 2.15.1 by Marius Gedminas - find it at mg.pov.lt!
