pull-request: gtk related code from core logic: info and statistics

Henrik Brautaset Aronsen subsurface at henrik.synth.no
Mon Apr 15 23:11:27 PDT 2013


Looks good to me.

H

Dirk Hohndel wrote:
> I ended up doing those two merges myself. Your work helped, but I
> believe my merge that I pushed a little while ago is somewhat better.
>
> Please double check and yell if you think I got something wrong.
>
> /D
>
> Henrik Brautaset Aronsen<subsurface at henrik.synth.no>  writes:
>
>> That last one (statistics) was rather painful to merge into master,
>> since I had to take into account the newly introduced tags.
>>
>> It would be great if you add stuff like this to the master branch first,
>> Dirk.  Also, there are a couple of commits in the master branch that
>> should have been included in Qt branch as well.
>>
>> Never mind, hopefully this will only have to happen for a short time :)
>>
>> -Henrik
>>
>>
>>
>> The following changes since commit bfe21343ca1f4c26e3fed2a3f446901a91d0b92e:
>>
>>     Remove second dive_trip_list definition and douplicate helper
>> function (2013-04-15 07:16:36 -0700)
>>
>> are available in the git repository at:
>>
>>     git at github.com:henrik242/subsurface.git more-stuff-from-the-Qt-branch
>>
>> for you to fetch changes up to 1804a976e40071eab80f39c110fd762de136bc4f:
>>
>>     Separate Gtk related code from core logic: statistics (2013-04-15
>> 18:18:58 +0200)
>>
>> ----------------------------------------------------------------
>> Dirk Hohndel (2):
>>         Separate Gtk related code from core logic: info
>>         Separate Gtk related code from core logic: statistics
>>
>>    Makefile         |    9 +-
>>    display-gtk.h    |    2 -
>>    display.h        |    2 +
>>    info-gtk.c       |  965
>> +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
>>    info.c           | 1123
>> ++++++++------------------------------------------------------------------------------------------------------------
>>    info.h           |   20 +++
>>    statistics-gtk.c |  658
>> ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
>>    statistics.c     |  696
>> ++----------------------------------------------------------------------
>>    statistics.h     |   43 +++++
>>    9 files changed, 1777 insertions(+), 1741 deletions(-)
>>    create mode 100644 info-gtk.c
>>    create mode 100644 info.h
>>    create mode 100644 statistics-gtk.c
>>    create mode 100644 statistics.h
>>
>> _______________________________________________
>> subsurface mailing list
>> subsurface at hohndel.org
>> http://lists.hohndel.org/cgi-bin/mailman/listinfo/subsurface
>


More information about the subsurface mailing list