1 --- gogglesmm-0.12.7/src/GMDatabaseSource.cpp~ 2011-06-08 22:22:34.000000000 +0200
2 +++ gogglesmm-0.12.7/src/GMDatabaseSource.cpp 2014-01-02 14:13:22.282806231 +0100
4 #if FOXVERSION < FXVERSION(1,7,0)
5 for (FXint i=0;i<albumicons.size();i++){
7 - for (FXuint i=0;i<albumicons.size();i++){
8 + for (FXuint i=0;i<albumicons.no();i++){
10 if (!albumicons.empty(i)) {
11 albumicon = (FXIcon*)albumicons.value(i);
12 --- gogglesmm-0.12.7/src/GMImportDialog.cpp~ 2012-07-31 03:41:46.000000000 +0200
13 +++ gogglesmm-0.12.7/src/GMImportDialog.cpp 2014-01-02 14:18:05.529470847 +0100
15 GMTreeListBox::replace(dirbox);
17 bookmarkmenu=new GMMenuPane(this,POPUP_SHRINKWRAP);
18 - new GMMenuCommand(bookmarkmenu,tr("&Set bookmark\t\tBookmark current directory."),markicon,this,ID_BOOKMARK);
19 - new GMMenuCommand(bookmarkmenu,tr("&Clear bookmarks\t\tClear bookmarks."),clearicon,&bookmarks,FXRecentFiles::ID_CLEAR);
20 + new GMMenuCommand(bookmarkmenu,tr("&Set bookmark\t\tBookmark current directory."),bookaddicon,this,ID_BOOKMARK);
21 + new GMMenuCommand(bookmarkmenu,tr("&Clear bookmarks\t\tClear bookmarks."),bookclricon,&bookmarks,FXRecentFiles::ID_CLEAR);
22 FXMenuSeparator* sep1=new FXMenuSeparator(bookmarkmenu);
23 sep1->setTarget(&bookmarks);
24 sep1->setSelector(FXRecentFiles::ID_ANYFILES);
26 new GMButton(navbuttons,tr("\tGo up one directory\tMove up to higher directory."),updiricon,this,ID_DIRECTORY_UP,BUTTON_TOOLBAR|FRAME_RAISED,0,0,0,0, 3,3,3,3);
27 new GMButton(navbuttons,tr("\tGo to home directory\tBack to home directory."),homeicon,this,ID_HOME,BUTTON_TOOLBAR|FRAME_RAISED,0,0,0,0, 3,3,3,3);
28 new GMButton(navbuttons,tr("\tGo to work directory\tBack to working directory."),workicon,this,ID_WORK,BUTTON_TOOLBAR|FRAME_RAISED,0,0,0,0, 3,3,3,3);
29 - GMMenuButton *bookmenu=new GMMenuButton(navbuttons,tr("\tBookmarks\tVisit bookmarked directories."),markicon,bookmarkmenu,MENUBUTTON_NOARROWS|MENUBUTTON_ATTACH_LEFT|MENUBUTTON_TOOLBAR|FRAME_RAISED,0,0,0,0, 3,3,3,3);
30 + GMMenuButton *bookmenu=new GMMenuButton(navbuttons,tr("\tBookmarks\tVisit bookmarked directories."),bookaddicon,bookmarkmenu,MENUBUTTON_NOARROWS|MENUBUTTON_ATTACH_LEFT|MENUBUTTON_TOOLBAR|FRAME_RAISED,0,0,0,0, 3,3,3,3);
31 bookmenu->setTarget(this);
32 bookmenu->setSelector(ID_BOOKMENU);
33 new GMButton(navbuttons,tr("\tCreate new directory\tCreate new directory."),newicon,this,ID_NEW,BUTTON_TOOLBAR|FRAME_RAISED,0,0,0,0, 3,3,3,3);
34 --- gogglesmm-0.12.7/src/GMDBus.cpp~ 2011-10-08 18:56:06.000000000 +0200
35 +++ gogglesmm-0.12.7/src/GMDBus.cpp 2014-01-02 14:19:14.802803679 +0100
37 #if FOXVERSION < FXVERSION(1,7,0)
38 for (FXint i=0;i<connections.size();i++) {
40 - for (FXuint i=0;i<connections.size();i++) {
41 + for (FXuint i=0;i<connections.no();i++) {
43 if (!connections.empty(i)) {
44 ((GMDBus*)connections.value(i))->setup_event_loop();