From: Mark Gilbert (webmaster@dofty.zzn.com)
Date: Sat Jul 27 2002 - 22:07:54 EDT
On Sat, 2002-07-27 at 20:35, j.m.maurer wrote:
> Merging the GTK2 branch back into HEAD
>
Yay!
> I've probably broken some stuff, but the auto* build at least works for
Yep.
> me. I wanted to do and will do more work on it, but I want to get it
> committed so MG can fix the diving make before he leaves. I did some
I've done most of this now, just some minor glitches left.
> * Note to Mark Gilbert: can you have a look at the
> abi/src/config/platforms/{freebsd,openbsd,linux,netbsd} files to double
> check if I merged them correctly?
You didn't, I fixed it, we've talked about this. No worries.
>
> * Note to Joaquin: I commented out the contents of the funtion
> isUnicode() in xap_UnixPSGraphics.cpp, since the GdkFontPrivate type
> does not exists in GDK2 anymore and I have no knowlegde of it whatsoever
Note to Joaquin: Are unixfonts no longer necessary? If so, I wanna stop
making them an install rule dependancy. Hopefully you can get back to
me asap.
> * General note 2: do NOT try to build using --enable-gnome, cause it
> won't work
Or ABI_OPT_GNOME if you use diving make. I'm working on this (the build
system part) and should have a clean(er) fix soon.
> Marc
> - Thanks go out to Dom who did 99.9% of the GTK2 porting
> - Did I win the Biggest-Commit-Ever-Price?
Thanks go to you too, it's a big job.
Also, iirc, biesi helped a bit on the menus. Correct me if I'm wrong.
>
> CVS:
> ----------------------------------------------------------------------
> CVS: Enter Log. Lines beginning with `CVS:' are removed automatically
> CVS:
> CVS: Committing in .
> CVS:
> CVS: Modified Files:
> CVS: autogen.sh configure.ac configure.in
> CVS: ac-helpers/abi-glib-gtk.m4 src/af/ev/unix/ev_UnixMenu.cpp
> CVS: src/af/ev/unix/ev_UnixMenu.h src/af/ev/unix/ev_UnixToolbar.cpp
> CVS: src/af/ev/unix/ev_UnixToolbar.h
> CVS: src/af/gr/unix/gr_UnixGraphics.cpp
> CVS: src/af/xap/unix/GNUmakefile.am
> CVS: src/af/xap/unix/xap_UnixDialogHelper.cpp
> CVS: src/af/xap/unix/xap_UnixDialogHelper.h
> CVS: src/af/xap/unix/xap_UnixDlg_About.cpp
> CVS: src/af/xap/unix/xap_UnixDlg_About.h
> CVS: src/af/xap/unix/xap_UnixDlg_Encoding.cpp
> CVS: src/af/xap/unix/xap_UnixDlg_Encoding.h
> CVS: src/af/xap/unix/xap_UnixDlg_FileOpenSaveAs.cpp
> CVS: src/af/xap/unix/xap_UnixDlg_FontChooser.cpp
> CVS: src/af/xap/unix/xap_UnixDlg_FontChooser.h
> CVS: src/af/xap/unix/xap_UnixDlg_Image.cpp
> CVS: src/af/xap/unix/xap_UnixDlg_Image.h
> CVS: src/af/xap/unix/xap_UnixDlg_Insert_Symbol.cpp
> CVS: src/af/xap/unix/xap_UnixDlg_Insert_Symbol.h
> CVS: src/af/xap/unix/xap_UnixDlg_Language.cpp
> CVS: src/af/xap/unix/xap_UnixDlg_Language.h
> CVS: src/af/xap/unix/xap_UnixDlg_MessageBox.cpp
> CVS: src/af/xap/unix/xap_UnixDlg_MessageBox.h
> CVS: src/af/xap/unix/xap_UnixDlg_Password.cpp
> CVS: src/af/xap/unix/xap_UnixDlg_Password.h
> CVS: src/af/xap/unix/xap_UnixDlg_PluginManager.cpp
> CVS: src/af/xap/unix/xap_UnixDlg_PluginManager.h
> CVS: src/af/xap/unix/xap_UnixDlg_Print.cpp
> CVS: src/af/xap/unix/xap_UnixDlg_Print.h
> CVS: src/af/xap/unix/xap_UnixDlg_WindowMore.cpp
> CVS: src/af/xap/unix/xap_UnixDlg_WindowMore.h
> CVS: src/af/xap/unix/xap_UnixDlg_Zoom.cpp
> CVS: src/af/xap/unix/xap_UnixDlg_Zoom.h
> CVS: src/af/xap/unix/xap_UnixFontXLFD.cpp
> CVS: src/af/xap/unix/xap_UnixFrame.cpp
> CVS: src/af/xap/unix/xap_UnixPSGraphics.cpp
> CVS: src/af/xap/unix/xap_UnixToolbar_Icons.cpp
> CVS: src/af/xap/unix/gnome/xap_UnixGnomeDlg_MessageBox.cpp
> CVS: src/af/xap/xp/xap_Dlg_FileOpenSaveAs.cpp
> CVS: src/af/xap/xp/xap_Dlg_FontChooser.cpp
> CVS: src/af/xap/xp/xap_Dlg_Insert_Symbol.cpp
> CVS: src/af/xap/xp/xap_Dlg_Language.cpp
> CVS: src/af/xap/xp/xap_Dlg_PluginManager.cpp
> CVS: src/af/xap/xp/xap_Dlg_Zoom.cpp src/config/platforms/freebsd.mk
> CVS: src/config/platforms/linux.mk src/config/platforms/netbsd.mk
> CVS: src/config/platforms/openbsd.mk src/wp/ap/Makefile
> CVS: src/wp/ap/unix/GNUmakefile.am src/wp/ap/unix/Makefile
> CVS: src/wp/ap/unix/ap_UnixApp.cpp
> CVS: src/wp/ap/unix/ap_UnixDialog_Background.cpp
> CVS: src/wp/ap/unix/ap_UnixDialog_Background.h
> CVS: src/wp/ap/unix/ap_UnixDialog_Break.cpp
> CVS: src/wp/ap/unix/ap_UnixDialog_Break.h
> CVS: src/wp/ap/unix/ap_UnixDialog_Columns.cpp
> CVS: src/wp/ap/unix/ap_UnixDialog_Columns.h
> CVS: src/wp/ap/unix/ap_UnixDialog_Field.cpp
> CVS: src/wp/ap/unix/ap_UnixDialog_Field.h
> CVS: src/wp/ap/unix/ap_UnixDialog_Goto.cpp
> CVS: src/wp/ap/unix/ap_UnixDialog_HdrFtr.cpp
> CVS: src/wp/ap/unix/ap_UnixDialog_HdrFtr.h
> CVS: src/wp/ap/unix/ap_UnixDialog_InsertBookmark.cpp
> CVS: src/wp/ap/unix/ap_UnixDialog_InsertHyperlink.cpp
> CVS: src/wp/ap/unix/ap_UnixDialog_InsertTable.cpp
> CVS: src/wp/ap/unix/ap_UnixDialog_InsertTable.h
> CVS: src/wp/ap/unix/ap_UnixDialog_Insert_DateTime.cpp
> CVS: src/wp/ap/unix/ap_UnixDialog_Insert_DateTime.h
> CVS: src/wp/ap/unix/ap_UnixDialog_ListRevisions.cpp
> CVS: src/wp/ap/unix/ap_UnixDialog_ListRevisions.h
> CVS: src/wp/ap/unix/ap_UnixDialog_Lists.cpp
> CVS: src/wp/ap/unix/ap_UnixDialog_MarkRevisions.cpp
> CVS: src/wp/ap/unix/ap_UnixDialog_MarkRevisions.h
> CVS: src/wp/ap/unix/ap_UnixDialog_MetaData.cpp
> CVS: src/wp/ap/unix/ap_UnixDialog_MetaData.h
> CVS: src/wp/ap/unix/ap_UnixDialog_New.cpp
> CVS: src/wp/ap/unix/ap_UnixDialog_New.h
> CVS: src/wp/ap/unix/ap_UnixDialog_Options.cpp
> CVS: src/wp/ap/unix/ap_UnixDialog_PageNumbers.cpp
> CVS: src/wp/ap/unix/ap_UnixDialog_PageNumbers.h
> CVS: src/wp/ap/unix/ap_UnixDialog_PageSetup.cpp
> CVS: src/wp/ap/unix/ap_UnixDialog_PageSetup.h
> CVS: src/wp/ap/unix/ap_UnixDialog_Paragraph.cpp
> CVS: src/wp/ap/unix/ap_UnixDialog_Replace.cpp
> CVS: src/wp/ap/unix/ap_UnixDialog_Spell.cpp
> CVS: src/wp/ap/unix/ap_UnixDialog_Styles.cpp
> CVS: src/wp/ap/unix/ap_UnixDialog_Tab.cpp
> CVS: src/wp/ap/unix/ap_UnixDialog_ToggleCase.cpp
> CVS: src/wp/ap/unix/ap_UnixDialog_ToggleCase.h
> CVS: src/wp/ap/unix/ap_UnixDialog_WordCount.cpp
> CVS: src/wp/ap/unix/ap_UnixFrame.cpp
> CVS: src/wp/ap/unix/ap_UnixLeftRuler.cpp
> CVS: src/wp/ap/unix/ap_UnixLeftRuler.h
> CVS: src/wp/ap/unix/ap_UnixTopRuler.cpp
> CVS: src/wp/ap/unix/ap_UnixTopRuler.h
> CVS: src/wp/ap/xp/ap_Dialog_Background.cpp
> CVS: src/wp/ap/xp/ap_Dialog_Break.cpp
> CVS: src/wp/ap/xp/ap_Dialog_Columns.cpp
> CVS: src/wp/ap/xp/ap_Dialog_Field.cpp
> CVS: src/wp/ap/xp/ap_Dialog_Goto.cpp
> CVS: src/wp/ap/xp/ap_Dialog_HdrFtr.cpp
> CVS: src/wp/ap/xp/ap_Dialog_InsertBookmark.cpp
> CVS: src/wp/ap/xp/ap_Dialog_InsertHyperlink.cpp
> CVS: src/wp/ap/xp/ap_Dialog_Insert_DateTime.cpp
> CVS: src/wp/ap/xp/ap_Dialog_Lists.cpp
> CVS: src/wp/ap/xp/ap_Dialog_New.cpp
> CVS: src/wp/ap/xp/ap_Dialog_Options.cpp
> CVS: src/wp/ap/xp/ap_Dialog_PageNumbers.cpp
> CVS: src/wp/ap/xp/ap_Dialog_PageSetup.cpp
> CVS: src/wp/ap/xp/ap_Dialog_Paragraph.cpp
> CVS: src/wp/ap/xp/ap_Dialog_Replace.cpp
> CVS: src/wp/ap/xp/ap_Dialog_Spell.cpp
> CVS: src/wp/ap/xp/ap_Dialog_Styles.cpp
> CVS: src/wp/ap/xp/ap_Dialog_Tab.cpp
> CVS: src/wp/ap/xp/ap_Dialog_ToggleCase.cpp
> CVS: src/wp/ap/xp/ap_Dialog_WordCount.cpp
> CVS: src/wp/ap/xp/ap_EditMethods.cpp
> CVS: Added Files:
> CVS: src/af/ev/unix/stock/menu_about.xpm
> CVS: src/af/ev/unix/stock/menu_book.xpm
> CVS: src/af/ev/unix/stock/menu_export.xpm
> CVS: src/af/ev/unix/stock/menu_import.xpm
> CVS: src/af/ev/unix/stock/menu_insert_image.xpm
> CVS: src/af/ev/unix/stock/menu_insert_symbol.xpm
> CVS:
> ----------------------------------------------------------------------
>
>
Hehehe. Now you guys got your work cut out for you re-porting. Good
luck (I mean it, you'll need it).
Cheers!
-MG
This archive was generated by hypermail 2.1.4 : Sat Jul 27 2002 - 22:14:36 EDT