2008-09-09 [colin] 3.5.0cvs96
authorColin Leroy <colin@colino.net>
Tue, 9 Sep 2008 16:40:59 +0000 (16:40 +0000)
committerColin Leroy <colin@colino.net>
Tue, 9 Sep 2008 16:40:59 +0000 (16:40 +0000)
* src/action.h
* src/addr_compl.c
* src/addressadd.c
* src/addressbook.h
* src/addressbook_foldersel.c
* src/addressitem.h
* src/addrgather.c
* src/alertpanel.c
* src/browseldap.c
* src/editaddress.c
* src/editaddress_other_attributes_ldap.h
* src/editbook.c
* src/editjpilot.c
* src/editldap.c
* src/editldap_basedn.c
* src/editvcard.c
* src/exphtmldlg.c
* src/expldifdlg.c
* src/export.c
* src/foldersel.c
* src/foldersel.h
* src/gedit-print.c
* src/gedit-print.h
* src/grouplistdialog.c
* src/headerview.c
* src/headerview.h
* src/image_viewer.c
* src/import.c
* src/importldif.c
* src/importmutt.c
* src/importpine.c
* src/inc.c
* src/main.c
* src/main.h
* src/messageview.c
* src/messageview.h
* src/noticeview.c
* src/prefs_actions.c
* src/prefs_filtering.c
* src/prefs_folder_column.c
* src/prefs_gtk.h
* src/prefs_summary_column.c
* src/prefs_toolbar.c
* src/send_message.c
* src/setup.c
* src/sourcewindow.c
* src/sourcewindow.h
* src/ssl_manager.c
* src/statusbar.c
* src/statusbar.h
* src/stock_pixmap.c
* src/stock_pixmap.h
* src/summaryview.c
* src/textview.c
* src/textview.h
* src/undo.h
* src/uri_opener.c
* src/wizard.c
* src/wizard.h
* src/common/ssl.h
* src/common/utils.c
* src/gtk/about.c
* src/gtk/colorlabel.c
* src/gtk/colorlabel.h
* src/gtk/combobox.h
* src/gtk/description_window.c
* src/gtk/filesel.c
* src/gtk/gtkaspell.c
* src/gtk/gtkaspell.h
* src/gtk/gtkcmclist.c
* src/gtk/gtkcmclist.h
* src/gtk/gtkcmctree.c
* src/gtk/gtkcmctree.h
* src/gtk/gtkcmoptionmenu.h
* src/gtk/gtksctree.c
* src/gtk/gtksctree.h
* src/gtk/gtkshruler.c
* src/gtk/gtkshruler.h
* src/gtk/gtksourceprintjob.c
* src/gtk/gtksourceprintjob.h
* src/gtk/gtkutils.c
* src/gtk/gtkutils.h
* src/gtk/gtkvscrollbutton.c
* src/gtk/gtkvscrollbutton.h
* src/gtk/icon_legend.c
* src/gtk/inputdialog.c
* src/gtk/logwindow.c
* src/gtk/logwindow.h
* src/gtk/manage_window.c
* src/gtk/manage_window.h
* src/gtk/menu.c
* src/gtk/prefswindow.c
* src/gtk/progressdialog.c
* src/gtk/progressdialog.h
* src/plugins/bogofilter/bogofilter_gtk.c
* src/plugins/pgpcore/passphrase.c
* src/plugins/spamassassin/spamassassin_gtk.c
* src/plugins/trayicon/trayicon.c
* src/plugins/trayicon/libeggtrayicon/eggtrayicon.c
* src/plugins/trayicon/libeggtrayicon/eggtrayicon.h
* src/plugins/trayicon/libeggtrayicon/gtk2-funcs.c
* src/plugins/trayicon/libeggtrayicon/gtkplugxembed.c
* src/plugins/trayicon/libeggtrayicon/gtkplugxembed.h
Complete GTK+ 2.14 undeprecation

106 files changed:
ChangeLog
PATCHSETS
configure.ac
src/action.h
src/addr_compl.c
src/addressadd.c
src/addressbook.h
src/addressbook_foldersel.c
src/addressitem.h
src/addrgather.c
src/alertpanel.c
src/browseldap.c
src/common/ssl.h
src/common/utils.c
src/editaddress.c
src/editaddress_other_attributes_ldap.h
src/editbook.c
src/editjpilot.c
src/editldap.c
src/editldap_basedn.c
src/editvcard.c
src/exphtmldlg.c
src/expldifdlg.c
src/export.c
src/foldersel.c
src/foldersel.h
src/gedit-print.c
src/gedit-print.h
src/grouplistdialog.c
src/gtk/about.c
src/gtk/colorlabel.c
src/gtk/colorlabel.h
src/gtk/combobox.h
src/gtk/description_window.c
src/gtk/filesel.c
src/gtk/gtkaspell.c
src/gtk/gtkaspell.h
src/gtk/gtkcmclist.c
src/gtk/gtkcmclist.h
src/gtk/gtkcmctree.c
src/gtk/gtkcmctree.h
src/gtk/gtkcmoptionmenu.h
src/gtk/gtksctree.c
src/gtk/gtksctree.h
src/gtk/gtkshruler.c
src/gtk/gtkshruler.h
src/gtk/gtksourceprintjob.c
src/gtk/gtksourceprintjob.h
src/gtk/gtkutils.c
src/gtk/gtkutils.h
src/gtk/gtkvscrollbutton.c
src/gtk/gtkvscrollbutton.h
src/gtk/icon_legend.c
src/gtk/inputdialog.c
src/gtk/logwindow.c
src/gtk/logwindow.h
src/gtk/manage_window.c
src/gtk/manage_window.h
src/gtk/menu.c
src/gtk/prefswindow.c
src/gtk/progressdialog.c
src/gtk/progressdialog.h
src/headerview.c
src/headerview.h
src/image_viewer.c
src/import.c
src/importldif.c
src/importmutt.c
src/importpine.c
src/inc.c
src/main.c
src/main.h
src/messageview.c
src/messageview.h
src/noticeview.c
src/plugins/bogofilter/bogofilter_gtk.c
src/plugins/pgpcore/passphrase.c
src/plugins/spamassassin/spamassassin_gtk.c
src/plugins/trayicon/libeggtrayicon/eggtrayicon.c
src/plugins/trayicon/libeggtrayicon/eggtrayicon.h
src/plugins/trayicon/libeggtrayicon/gtk2-funcs.c
src/plugins/trayicon/libeggtrayicon/gtkplugxembed.c
src/plugins/trayicon/libeggtrayicon/gtkplugxembed.h
src/plugins/trayicon/trayicon.c
src/prefs_actions.c
src/prefs_filtering.c
src/prefs_folder_column.c
src/prefs_gtk.h
src/prefs_summary_column.c
src/prefs_toolbar.c
src/send_message.c
src/setup.c
src/sourcewindow.c
src/sourcewindow.h
src/ssl_manager.c
src/statusbar.c
src/statusbar.h
src/stock_pixmap.c
src/stock_pixmap.h
src/summaryview.c
src/textview.c
src/textview.h
src/undo.h
src/uri_opener.c
src/wizard.c
src/wizard.h

index a25baf3..d0f203f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,110 @@
+2008-09-09 [colin]     3.5.0cvs96
+
+       * src/action.h
+       * src/addr_compl.c
+       * src/addressadd.c
+       * src/addressbook.h
+       * src/addressbook_foldersel.c
+       * src/addressitem.h
+       * src/addrgather.c
+       * src/alertpanel.c
+       * src/browseldap.c
+       * src/editaddress.c
+       * src/editaddress_other_attributes_ldap.h
+       * src/editbook.c
+       * src/editjpilot.c
+       * src/editldap.c
+       * src/editldap_basedn.c
+       * src/editvcard.c
+       * src/exphtmldlg.c
+       * src/expldifdlg.c
+       * src/export.c
+       * src/foldersel.c
+       * src/foldersel.h
+       * src/gedit-print.c
+       * src/gedit-print.h
+       * src/grouplistdialog.c
+       * src/headerview.c
+       * src/headerview.h
+       * src/image_viewer.c
+       * src/import.c
+       * src/importldif.c
+       * src/importmutt.c
+       * src/importpine.c
+       * src/inc.c
+       * src/main.c
+       * src/main.h
+       * src/messageview.c
+       * src/messageview.h
+       * src/noticeview.c
+       * src/prefs_actions.c
+       * src/prefs_filtering.c
+       * src/prefs_folder_column.c
+       * src/prefs_gtk.h
+       * src/prefs_summary_column.c
+       * src/prefs_toolbar.c
+       * src/send_message.c
+       * src/setup.c
+       * src/sourcewindow.c
+       * src/sourcewindow.h
+       * src/ssl_manager.c
+       * src/statusbar.c
+       * src/statusbar.h
+       * src/stock_pixmap.c
+       * src/stock_pixmap.h
+       * src/summaryview.c
+       * src/textview.c
+       * src/textview.h
+       * src/undo.h
+       * src/uri_opener.c
+       * src/wizard.c
+       * src/wizard.h
+       * src/common/ssl.h
+       * src/common/utils.c
+       * src/gtk/about.c
+       * src/gtk/colorlabel.c
+       * src/gtk/colorlabel.h
+       * src/gtk/combobox.h
+       * src/gtk/description_window.c
+       * src/gtk/filesel.c
+       * src/gtk/gtkaspell.c
+       * src/gtk/gtkaspell.h
+       * src/gtk/gtkcmclist.c
+       * src/gtk/gtkcmclist.h
+       * src/gtk/gtkcmctree.c
+       * src/gtk/gtkcmctree.h
+       * src/gtk/gtkcmoptionmenu.h
+       * src/gtk/gtksctree.c
+       * src/gtk/gtksctree.h
+       * src/gtk/gtkshruler.c
+       * src/gtk/gtkshruler.h
+       * src/gtk/gtksourceprintjob.c
+       * src/gtk/gtksourceprintjob.h
+       * src/gtk/gtkutils.c
+       * src/gtk/gtkutils.h
+       * src/gtk/gtkvscrollbutton.c
+       * src/gtk/gtkvscrollbutton.h
+       * src/gtk/icon_legend.c
+       * src/gtk/inputdialog.c
+       * src/gtk/logwindow.c
+       * src/gtk/logwindow.h
+       * src/gtk/manage_window.c
+       * src/gtk/manage_window.h
+       * src/gtk/menu.c
+       * src/gtk/prefswindow.c
+       * src/gtk/progressdialog.c
+       * src/gtk/progressdialog.h
+       * src/plugins/bogofilter/bogofilter_gtk.c
+       * src/plugins/pgpcore/passphrase.c
+       * src/plugins/spamassassin/spamassassin_gtk.c
+       * src/plugins/trayicon/trayicon.c
+       * src/plugins/trayicon/libeggtrayicon/eggtrayicon.c
+       * src/plugins/trayicon/libeggtrayicon/eggtrayicon.h
+       * src/plugins/trayicon/libeggtrayicon/gtk2-funcs.c
+       * src/plugins/trayicon/libeggtrayicon/gtkplugxembed.c
+       * src/plugins/trayicon/libeggtrayicon/gtkplugxembed.h
+               Complete GTK+ 2.14 undeprecation
+
 2008-09-09 [colin]     3.5.0cvs95
 
        * src/gtk/gtkcmclist.h
index 7ded79a..5273dec 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
 ( cvs diff -u -r 1.9.2.24 -r 1.9.2.25 src/addressadd.c;  cvs diff -u -r 1.1.2.12 -r 1.1.2.13 src/addressbook_foldersel.c;  cvs diff -u -r 1.1.2.3 -r 1.1.2.4 src/gtk/gtkcmclist.c;  cvs diff -u -r 1.1.2.2 -r 1.1.2.3 src/gtk/gtkcmclist.h;  cvs diff -u -r 1.1.2.6 -r 1.1.2.7 src/gtk/gtkcmctree.c;  cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/gtk/gtkcmctree.h;  cvs diff -u -r 1.1.4.49 -r 1.1.4.50 src/gtk/gtksctree.c;  cvs diff -u -r 1.12.2.46 -r 1.12.2.47 src/gtk/prefswindow.c;  cvs diff -u -r 1.7.2.12 -r 1.7.2.13 src/gtk/prefswindow.h;  ) > 3.5.0cvs93.patchset
 ( cvs diff -u -r 1.5.2.19 -r 1.5.2.20 src/noticeview.c;  cvs diff -u -r 1.3.8.9 -r 1.3.8.10 src/noticeview.h;  ) > 3.5.0cvs94.patchset
 ( cvs diff -u -r 1.1.2.3 -r 1.1.2.4 src/gtk/gtkcmclist.h;  ) > 3.5.0cvs95.patchset
+( cvs diff -u -r 1.3.2.10 -r 1.3.2.11 src/action.h;  cvs diff -u -r 1.27.2.42 -r 1.27.2.43 src/addr_compl.c;  cvs diff -u -r 1.9.2.25 -r 1.9.2.26 src/addressadd.c;  cvs diff -u -r 1.18.2.13 -r 1.18.2.14 src/addressbook.h;  cvs diff -u -r 1.1.2.13 -r 1.1.2.14 src/addressbook_foldersel.c;  cvs diff -u -r 1.5.2.11 -r 1.5.2.12 src/addressitem.h;  cvs diff -u -r 1.5.10.25 -r 1.5.10.26 src/addrgather.c;  cvs diff -u -r 1.17.2.38 -r 1.17.2.39 src/alertpanel.c;  cvs diff -u -r 1.2.4.21 -r 1.2.4.22 src/browseldap.c;  cvs diff -u -r 1.14.2.53 -r 1.14.2.54 src/editaddress.c;  cvs diff -u -r 1.1.2.9 -r 1.1.2.10 src/editaddress_other_attributes_ldap.h;  cvs diff -u -r 1.5.12.12 -r 1.5.12.13 src/editbook.c;  cvs diff -u -r 1.5.12.14 -r 1.5.12.15 src/editjpilot.c;  cvs diff -u -r 1.8.2.31 -r 1.8.2.32 src/editldap.c;  cvs diff -u -r 1.10.2.14 -r 1.10.2.15 src/editldap_basedn.c;  cvs diff -u -r 1.5.12.13 -r 1.5.12.14 src/editvcard.c;  cvs diff -u -r 1.3.2.24 -r 1.3.2.25 src/exphtmldlg.c;  cvs diff -u -r 1.1.4.29 -r 1.1.4.30 src/expldifdlg.c;  cvs diff -u -r 1.8.2.26 -r 1.8.2.27 src/export.c;  cvs diff -u -r 1.26.2.38 -r 1.26.2.39 src/foldersel.c;  cvs diff -u -r 1.4.12.6 -r 1.4.12.7 src/foldersel.h;  cvs diff -u -r 1.1.2.10 -r 1.1.2.11 src/gedit-print.c;  cvs diff -u -r 1.1.2.3 -r 1.1.2.4 src/gedit-print.h;  cvs diff -u -r 1.14.2.21 -r 1.14.2.22 src/grouplistdialog.c;  cvs diff -u -r 1.8.2.27 -r 1.8.2.28 src/headerview.c;  cvs diff -u -r 1.2.2.4 -r 1.2.2.5 src/headerview.h;  cvs diff -u -r 1.1.2.24 -r 1.1.2.25 src/image_viewer.c;  cvs diff -u -r 1.13.2.25 -r 1.13.2.26 src/import.c;  cvs diff -u -r 1.14.2.19 -r 1.14.2.20 src/importldif.c;  cvs diff -u -r 1.4.12.18 -r 1.4.12.19 src/importmutt.c;  cvs diff -u -r 1.1.14.18 -r 1.1.14.19 src/importpine.c;  cvs diff -u -r 1.149.2.91 -r 1.149.2.92 src/inc.c;  cvs diff -u -r 1.115.2.203 -r 1.115.2.204 src/main.c;  cvs diff -u -r 1.7.2.16 -r 1.7.2.17 src/main.h;  cvs diff -u -r 1.94.2.184 -r 1.94.2.185 src/messageview.c;  cvs diff -u -r 1.19.2.21 -r 1.19.2.22 src/messageview.h;  cvs diff -u -r 1.5.2.20 -r 1.5.2.21 src/noticeview.c;  cvs diff -u -r 1.60.2.62 -r 1.60.2.63 src/prefs_actions.c;  cvs diff -u -r 1.59.2.73 -r 1.59.2.74 src/prefs_filtering.c;  cvs diff -u -r 1.1.2.13 -r 1.1.2.14 src/prefs_folder_column.c;  cvs diff -u -r 1.5.2.16 -r 1.5.2.17 src/prefs_gtk.h;  cvs diff -u -r 1.10.2.22 -r 1.10.2.23 src/prefs_summary_column.c;  cvs diff -u -r 1.30.2.52 -r 1.30.2.53 src/prefs_toolbar.c;  cvs diff -u -r 1.17.2.48 -r 1.17.2.49 src/send_message.c;  cvs diff -u -r 1.5.2.14 -r 1.5.2.15 src/setup.c;  cvs diff -u -r 1.9.2.22 -r 1.9.2.23 src/sourcewindow.c;  cvs diff -u -r 1.1.1.1.16.7 -r 1.1.1.1.16.8 src/sourcewindow.h;  cvs diff -u -r 1.3.2.30 -r 1.3.2.31 src/ssl_manager.c;  cvs diff -u -r 1.5.2.22 -r 1.5.2.23 src/statusbar.c;  cvs diff -u -r 1.3.2.9 -r 1.3.2.10 src/statusbar.h;  cvs diff -u -r 1.25.2.60 -r 1.25.2.61 src/stock_pixmap.c;  cvs diff -u -r 1.18.2.37 -r 1.18.2.38 src/stock_pixmap.h;  cvs diff -u -r 1.395.2.389 -r 1.395.2.390 src/summaryview.c;  cvs diff -u -r 1.96.2.205 -r 1.96.2.206 src/textview.c;  cvs diff -u -r 1.12.2.23 -r 1.12.2.24 src/textview.h;  cvs diff -u -r 1.5.14.9 -r 1.5.14.10 src/undo.h;  cvs diff -u -r 1.1.2.7 -r 1.1.2.8 src/uri_opener.c;  cvs diff -u -r 1.1.2.74 -r 1.1.2.75 src/wizard.c;  cvs diff -u -r 1.1.2.8 -r 1.1.2.9 src/wizard.h;  cvs diff -u -r 1.2.2.9 -r 1.2.2.10 src/common/ssl.h;  cvs diff -u -r 1.36.2.144 -r 1.36.2.145 src/common/utils.c;  cvs diff -u -r 1.4.2.65 -r 1.4.2.66 src/gtk/about.c;  cvs diff -u -r 1.2.2.22 -r 1.2.2.23 src/gtk/colorlabel.c;  cvs diff -u -r 1.1.4.8 -r 1.1.4.9 src/gtk/colorlabel.h;  cvs diff -u -r 1.1.2.12 -r 1.1.2.13 src/gtk/combobox.h;  cvs diff -u -r 1.5.2.26 -r 1.5.2.27 src/gtk/description_window.c;  cvs diff -u -r 1.2.2.36 -r 1.2.2.37 src/gtk/filesel.c;  cvs diff -u -r 1.9.2.59 -r 1.9.2.60 src/gtk/gtkaspell.c;  cvs diff -u -r 1.5.2.14 -r 1.5.2.15 src/gtk/gtkaspell.h;  cvs diff -u -r 1.1.2.4 -r 1.1.2.5 src/gtk/gtkcmclist.c;  cvs diff -u -r 1.1.2.4 -r 1.1.2.5 src/gtk/gtkcmclist.h;  cvs diff -u -r 1.1.2.7 -r 1.1.2.8 src/gtk/gtkcmctree.c;  cvs diff -u -r 1.1.2.2 -r 1.1.2.3 src/gtk/gtkcmctree.h;  cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/gtk/gtkcmoptionmenu.h;  cvs diff -u -r 1.1.4.50 -r 1.1.4.51 src/gtk/gtksctree.c;  cvs diff -u -r 1.1.4.14 -r 1.1.4.15 src/gtk/gtksctree.h;  cvs diff -u -r 1.1.4.9 -r 1.1.4.10 src/gtk/gtkshruler.c;  cvs diff -u -r 1.1.4.5 -r 1.1.4.6 src/gtk/gtkshruler.h;  cvs diff -u -r 1.1.2.8 -r 1.1.2.9 src/gtk/gtksourceprintjob.c;  cvs diff -u -r 1.1.2.2 -r 1.1.2.3 src/gtk/gtksourceprintjob.h;  cvs diff -u -r 1.5.2.82 -r 1.5.2.83 src/gtk/gtkutils.c;  cvs diff -u -r 1.4.2.45 -r 1.4.2.46 src/gtk/gtkutils.h;  cvs diff -u -r 1.5.2.15 -r 1.5.2.16 src/gtk/gtkvscrollbutton.c;  cvs diff -u -r 1.3.2.2 -r 1.3.2.3 src/gtk/gtkvscrollbutton.h;  cvs diff -u -r 1.1.2.16 -r 1.1.2.17 src/gtk/icon_legend.c;  cvs diff -u -r 1.2.2.31 -r 1.2.2.32 src/gtk/inputdialog.c;  cvs diff -u -r 1.1.4.31 -r 1.1.4.32 src/gtk/logwindow.c;  cvs diff -u -r 1.1.4.14 -r 1.1.4.15 src/gtk/logwindow.h;  cvs diff -u -r 1.1.4.6 -r 1.1.4.7 src/gtk/manage_window.c;  cvs diff -u -r 1.1.4.7 -r 1.1.4.8 src/gtk/manage_window.h;  cvs diff -u -r 1.5.2.36 -r 1.5.2.37 src/gtk/menu.c;  cvs diff -u -r 1.12.2.47 -r 1.12.2.48 src/gtk/prefswindow.c;  cvs diff -u -r 1.1.4.22 -r 1.1.4.23 src/gtk/progressdialog.c;  cvs diff -u -r 1.1.4.12 -r 1.1.4.13 src/gtk/progressdialog.h;  cvs diff -u -r 1.1.2.34 -r 1.1.2.35 src/plugins/bogofilter/bogofilter_gtk.c;  cvs diff -u -r 1.1.2.30 -r 1.1.2.31 src/plugins/pgpcore/passphrase.c;  cvs diff -u -r 1.23.2.50 -r 1.23.2.51 src/plugins/spamassassin/spamassassin_gtk.c;  cvs diff -u -r 1.14.2.65 -r 1.14.2.66 src/plugins/trayicon/trayicon.c;  cvs diff -u -r 1.1.4.9 -r 1.1.4.10 src/plugins/trayicon/libeggtrayicon/eggtrayicon.c;  cvs diff -u -r 1.1.4.2 -r 1.1.4.3 src/plugins/trayicon/libeggtrayicon/eggtrayicon.h;  cvs diff -u -r 1.1 -r 1.2 src/plugins/trayicon/libeggtrayicon/gtk2-funcs.c;  cvs diff -u -r 1.1.4.3 -r 1.1.4.4 src/plugins/trayicon/libeggtrayicon/gtkplugxembed.c;  cvs diff -u -r 1.1.4.1 -r 1.1.4.2 src/plugins/trayicon/libeggtrayicon/gtkplugxembed.h;  ) > 3.5.0cvs96.patchset
index 63a7fd1..1f987c7 100644 (file)
@@ -11,7 +11,7 @@ MINOR_VERSION=5
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=95
+EXTRA_VERSION=96
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
@@ -144,7 +144,7 @@ fi
 CFLAGS="$CFLAGS -Wall"
 
 if test $USE_MAINTAINER_MODE = yes; then
-       CFLAGS="$CFLAGS -DGTK_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DG_DISABLE_DEPRECATED"
+       CFLAGS="$CFLAGS -DGTK_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DG_DISABLE_DEPRECATED -DGTK_DISABLE_SINGLE_INCLUDES"
 fi
 
 pthread_name=
index 986a50f..f6f80b2 100644 (file)
@@ -21,7 +21,7 @@
 #define __ACTION_H__
 
 #include <glib.h>
-#include <gtk/gtkitemfactory.h>
+#include <gtk/gtk.h>
 
 #include "mainwindow.h"
 #include "messageview.h"
index 63f00e8..f0e1a0f 100644 (file)
 #include <glib.h>
 #include <glib/gi18n.h>
 #include <gdk/gdkkeysyms.h>
-#include <gtk/gtkmain.h>
-#include <gtk/gtkwindow.h>
-#include <gtk/gtkentry.h>
-#include <gtk/gtkeditable.h>
-#include <gtk/gtkscrolledwindow.h>
-#include <gtk/gtktreeview.h>
-#include <gtk/gtktreemodel.h>
-#include <gtk/gtkliststore.h>
+#include <gtk/gtk.h>
 
 #include <string.h>
 #include <ctype.h>
index 117591d..700f17c 100644 (file)
 #include <glib.h>
 #include <glib/gi18n.h>
 #include <gdk/gdkkeysyms.h>
-#include <gtk/gtkwindow.h>
-#include <gtk/gtksignal.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkentry.h>
-#include <gtk/gtkhbbox.h>
-#include <gtk/gtkbutton.h>
+#include <gtk/gtk.h>
 
 #include "gtkutils.h"
 #include "stock_pixmap.h"
index e408ea8..f3621df 100644 (file)
@@ -21,7 +21,7 @@
 #define __ADDRESSBOOK_H__
 
 #include <glib.h>
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
 
 #include "compose.h"
 #include "addritem.h"
index d1bd6ff..00944f6 100644 (file)
 #include <glib.h>
 #include <glib/gi18n.h>
 #include <gdk/gdkkeysyms.h>
-#include <gtk/gtkwindow.h>
-#include <gtk/gtksignal.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkentry.h>
-#include <gtk/gtkhbbox.h>
-#include <gtk/gtkbutton.h>
+#include <gtk/gtk.h>
 
 #include "gtkutils.h"
 #include "stock_pixmap.h"
index ba286e2..378c566 100644 (file)
@@ -25,8 +25,7 @@
 #define __ADDRESSITEM_H__
 
 #include <glib.h>
-#include <gtk/gtkwidget.h>
-#include <gtk/gtkctree.h>
+#include <gtk/gtk.h>
 
 #include "compose.h"
 #include "addrindex.h"
index 030df12..92207d9 100644 (file)
 #include <glib.h>
 #include <glib/gi18n.h>
 #include <gdk/gdkkeysyms.h>
-#include <gtk/gtkmain.h>
-#include <gtk/gtkwidget.h>
-#include <gtk/gtkwindow.h>
-#include <gtk/gtkvbox.h>
-#include <gtk/gtktable.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkentry.h>
-#include <gtk/gtkhbbox.h>
-#include <gtk/gtkbutton.h>
-#include <gtk/gtkfilesel.h>
-#include <gtk/gtksignal.h>
+#include <gtk/gtk.h>
 
 #include "main.h"
 #include "inc.h"
index 2e463e7..5f3f154 100644 (file)
@@ -197,7 +197,7 @@ void alertpanel_error_log(const gchar *format, ...)
                if (val == G_ALERTALTERNATE)
                        log_window_show(mainwin->logwin);
        } else
-               alertpanel_error(buf);
+               alertpanel_error("%s", buf);
 }
 
 static void alertpanel_show(void)
index abc84ac..46b2c03 100644 (file)
 #include <glib.h>
 #include <glib/gi18n.h>
 #include <gdk/gdkkeysyms.h>
-#include <gtk/gtkwindow.h>
-#include <gtk/gtksignal.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkentry.h>
-#include <gtk/gtkhbbox.h>
-#include <gtk/gtkbutton.h>
+#include <gtk/gtk.h>
 
 #include <pthread.h>
 #include "gtkutils.h"
index 9d494a5..4dbb1f2 100644 (file)
@@ -62,7 +62,7 @@ void ssl_done_socket                  (SockInfo       *sockinfo);
 typedef struct _SSLClientCertHookData SSLClientCertHookData;
 struct _SSLClientCertHookData
 {
-       void *account;
+       const void *account;
        const gchar *cert_path;
        const gchar *password;
        gboolean is_smtp;
index ed83c91..609b644 100644 (file)
@@ -4967,19 +4967,19 @@ size_t fast_strftime(gchar *buf, gint buflen, const gchar *format, struct tm *lt
                        case 'p':
                                if (lt->tm_hour >= 12) {
                                        len = strlen(s_pm_up); CHECK_SIZE();
-                                       snprintf(curpos, buflen-total_done, s_pm_up);
+                                       snprintf(curpos, buflen-total_done, "%s", s_pm_up);
                                } else {
                                        len = strlen(s_am_up); CHECK_SIZE();
-                                       snprintf(curpos, buflen-total_done, s_am_up);
+                                       snprintf(curpos, buflen-total_done, "%s", s_am_up);
                                }
                                break;
                        case 'P':
                                if (lt->tm_hour >= 12) {
                                        len = strlen(s_pm_low); CHECK_SIZE();
-                                       snprintf(curpos, buflen-total_done, s_pm_low);
+                                       snprintf(curpos, buflen-total_done, "%s", s_pm_low);
                                } else {
                                        len = strlen(s_am_low); CHECK_SIZE();
-                                       snprintf(curpos, buflen-total_done, s_am_low);
+                                       snprintf(curpos, buflen-total_done, "%s", s_am_low);
                                }
                                break;
                        case 'r':
@@ -5121,7 +5121,8 @@ int claws_unlink(const gchar *filename)
                                         NULL, NULL, NULL, NULL, &status, NULL);
                                        debug_print("%s %s exited with status %d\n",
                                                args[0], filename, WEXITSTATUS(status));
-                                       truncate(filename, 0);
+                                       if (truncate(filename, 0) < 0)
+                                               g_warning("couln't truncate");
                                }
                        }
                }
index 7e44f29..697c734 100644 (file)
 #include <glib.h>
 #include <glib/gi18n.h>
 #include <gdk/gdkkeysyms.h>
-#include <gtk/gtkwindow.h>
-#include <gtk/gtksignal.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkvbox.h>
-#include <gtk/gtkentry.h>
-#include <gtk/gtktable.h>
+#include <gtk/gtk.h>
 
 #include "alertpanel.h"
 #include "mgutils.h"
index ed29b85..56829f8 100644 (file)
 #include <glib.h>
 #include <glib/gi18n.h>
 #include <gdk/gdkkeysyms.h>
-#include <gtk/gtkwindow.h>
-#include <gtk/gtksignal.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkvbox.h>
-#include <gtk/gtkentry.h>
-#include <gtk/gtktable.h>
-#include <gtk/gtkitemfactory.h>
+#include <gtk/gtk.h>
 
 typedef struct _PersonEdit_dlg PersonEditDlg;
 struct _PersonEdit_dlg {
index 5d88da4..e0954de 100644 (file)
 #include <glib.h>
 #include <glib/gi18n.h>
 #include <gdk/gdkkeysyms.h>
-#include <gtk/gtkwindow.h>
-#include <gtk/gtksignal.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkentry.h>
-#include <gtk/gtktable.h>
-#include <gtk/gtkbutton.h>
+#include <gtk/gtk.h>
 
 #include "utils.h"
 #include "prefs_common.h"
index f3beb50..69ca05f 100644 (file)
 #include <glib.h>
 #include <glib/gi18n.h>
 #include <gdk/gdkkeysyms.h>
-#include <gtk/gtkwindow.h>
-#include <gtk/gtksignal.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkentry.h>
-#include <gtk/gtkhbbox.h>
-#include <gtk/gtkvbox.h>
-#include <gtk/gtktable.h>
-#include <gtk/gtkframe.h>
-#include <gtk/gtkhseparator.h>
-#include <gtk/gtkbutton.h>
-#include <gtk/gtkstatusbar.h>
-#include <gtk/gtkcheckbutton.h>
-#include <gtk/gtkfilesel.h>
+#include <gtk/gtk.h>
 
 #include "addressbook.h"
 #include "prefs_common.h"
index c3178da..5c562bd 100644 (file)
 #include <glib.h>
 #include <glib/gi18n.h>
 #include <gdk/gdkkeysyms.h>
-#include <gtk/gtkwindow.h>
-#include <gtk/gtksignal.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkentry.h>
-#include <gtk/gtktable.h>
-#include <gtk/gtkbutton.h>
+#include <gtk/gtk.h>
 
 #include "addressbook.h"
 #include "prefs_common.h"
index 9bc8db8..40c584f 100644 (file)
 #include <glib.h>
 #include <glib/gi18n.h>
 #include <gdk/gdkkeysyms.h>
-#include <gtk/gtkwindow.h>
-#include <gtk/gtksignal.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkentry.h>
-#include <gtk/gtkhbbox.h>
-#include <gtk/gtkbutton.h>
+#include <gtk/gtk.h>
 
 #include "prefs_common.h"
 #include "ldaputil.h"
index 5f39ba0..ce10d29 100644 (file)
 #include <glib.h>
 #include <glib/gi18n.h>
 #include <gdk/gdkkeysyms.h>
-#include <gtk/gtkwindow.h>
-#include <gtk/gtksignal.h>
-#include <gtk/gtkvbox.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkentry.h>
-#include <gtk/gtktable.h>
-#include <gtk/gtkbutton.h>
-#include <gtk/gtkstatusbar.h>
-#include <gtk/gtkfilesel.h>
-#include <gtk/gtkhseparator.h>
-#include <gtk/gtkstock.h>
+#include <gtk/gtk.h>
 
 #include "addressbook.h"
 #include "prefs_common.h"
index 8a7830c..d88f7b1 100644 (file)
 #include <glib.h>
 #include <glib/gi18n.h>
 #include <gdk/gdkkeysyms.h>
-#include <gtk/gtkwindow.h>
-#include <gtk/gtksignal.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkentry.h>
-#include <gtk/gtktable.h>
-#include <gtk/gtkbutton.h>
+#include <gtk/gtk.h>
 
 #include "gtkutils.h"
 #include "prefs_common.h"
index a675538..1345d46 100644 (file)
 #include <glib.h>
 #include <glib/gi18n.h>
 #include <gdk/gdkkeysyms.h>
-#include <gtk/gtkwindow.h>
-#include <gtk/gtksignal.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkentry.h>
-#include <gtk/gtktable.h>
-#include <gtk/gtkbutton.h>
+#include <gtk/gtk.h>
 
 #include "gtkutils.h"
 #include "prefs_common.h"
index 0f8a774..5a200bd 100644 (file)
 #include <glib.h>
 #include <glib/gi18n.h>
 #include <gdk/gdkkeysyms.h>
-#include <gtk/gtkmain.h>
-#include <gtk/gtkwidget.h>
-#include <gtk/gtkwindow.h>
-#include <gtk/gtkvbox.h>
-#include <gtk/gtktable.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkentry.h>
-#include <gtk/gtkhbbox.h>
-#include <gtk/gtkbutton.h>
-#include <gtk/gtkfilesel.h>
-#include <gtk/gtksignal.h>
+#include <gtk/gtk.h>
 
 #include "claws.h"
 #include "main.h"
index 2c1825b..c3d2985 100644 (file)
 #include <glib.h>
 #include <glib/gi18n.h>
 #include <gdk/gdkkeysyms.h>
-#include <gtk/gtkmain.h>
-#include <gtk/gtkwidget.h>
-#include <gtk/gtktreestore.h>
-#include <gtk/gtktreeview.h>
-#include <gtk/gtkwindow.h>
-#include <gtk/gtkvbox.h>
-#include <gtk/gtkscrolledwindow.h>
-#include <gtk/gtkentry.h>
-#include <gtk/gtkhbbox.h>
-#include <gtk/gtksignal.h>
+#include <gtk/gtk.h>
 #include <stdio.h>
 #include <unistd.h>
 #include <string.h>
index fa775a0..e5a931f 100644 (file)
@@ -21,7 +21,7 @@
 #define __FOLDERSEL_H__
 
 #include <glib.h>
-#include <gtk/gtkwindow.h>
+#include <gtk/gtk.h>
 
 #include "folder.h"
 
index 9a683ff..4592fd2 100644 (file)
 #include <string.h>    /* For strlen */
 
 #include <glib/gi18n.h>
-#include <gtk/gtkframe.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtkvbox.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkmain.h>
-#include <gtk/gtkprogressbar.h>
-#include <gtk/gtkimage.h>
-#include <gtk/gtkwindow.h>
+#include <gtk/gtk.h>
 #include <libgnomeprintui/gnome-print-dialog.h>
 #include <libgnomeprintui/gnome-print-job-preview.h>
 
index a457d82..dcc305b 100644 (file)
@@ -33,7 +33,7 @@
 
 #ifdef USE_GNOMEPRINT
 
-#include <gtk/gtktextview.h>
+#include <gtk/gtk.h>
 
 void gedit_print               (GtkTextView* view);
 
index 66c8e2b..62f152d 100644 (file)
 #include <glib.h>
 #include <glib/gi18n.h>
 #include <gdk/gdkkeysyms.h>
-#include <gtk/gtkmain.h>
-#include <gtk/gtkwidget.h>
-#include <gtk/gtkdialog.h>
-#include <gtk/gtkwindow.h>
-#include <gtk/gtksignal.h>
-#include <gtk/gtkvbox.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkentry.h>
-#include <gtk/gtkctree.h>
-#include <gtk/gtkscrolledwindow.h>
-#include <gtk/gtkbutton.h>
-#include <gtk/gtkhbbox.h>
-#include <gtk/gtksctree.h>
-#include <gtk/gtkstock.h>
+#include <gtk/gtk.h>
 #include <string.h>
 
 #include "grouplistdialog.h"
index 501bef7..cce0b6f 100644 (file)
 #include <glib.h>
 #include <glib/gi18n.h>
 #include <gdk/gdkkeysyms.h>
-#include <gtk/gtkwidget.h>
-#include <gtk/gtkwindow.h>
-#include <gtk/gtksignal.h>
-#include <gtk/gtkvbox.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkhseparator.h>
-#include <gtk/gtkscrolledwindow.h>
-#include <gtk/gtktext.h>
-#include <gtk/gtkbutton.h>
+#include <gtk/gtk.h>
 #if HAVE_SYS_UTSNAME_H
 #  include <sys/utsname.h>
 #endif
index df6ec8a..2543d2c 100644 (file)
 #include <glib.h>
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
-#include <gtk/gtkwidget.h>
-#include <gtk/gtkimage.h>
-#include <gtk/gtkmenu.h>
-#include <gtk/gtkcheckmenuitem.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkmenuitem.h>
-#include <gtk/gtkalignment.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtkvbox.h>
-#include <gtk/gtkwindow.h>
-#include <gtk/gtkdrawingarea.h>
 
 #include "colorlabel.h"
 #include "utils.h"
index 04d5f8d..aabdda9 100644 (file)
@@ -21,7 +21,7 @@
 #define COLORLABEL_H__
 
 #include <glib.h>
-#include <gtk/gtkimage.h>
+#include <gtk/gtk.h>
 
 /* max value of color label index (0..max) - see also procmsg.h */
 #define COLORLABELS 15
index ca6faf8..0c85e45 100644 (file)
@@ -21,8 +21,7 @@
 #define __COMBOBOX_H__
 
 #include <glib.h>
-#include <gtk/gtkwidget.h>
-#include <gtk/gtkcombobox.h>
+#include <gtk/gtk.h>
 
 enum {
        COMBOBOX_TEXT,
index 2009603..9e8dc62 100644 (file)
@@ -55,7 +55,7 @@ void description_window_create(DescriptionWindow *dwindow)
 
                /* in case the description window is closed using the WM's [X] button */
                g_signal_connect(G_OBJECT(dwindow->window), "destroy",
-                               GTK_SIGNAL_FUNC(gtk_widget_destroyed), &dwindow->window);
+                               G_CALLBACK(gtk_widget_destroyed), &dwindow->window);
 
        } else g_print("windows exist\n");
 }
index f50effa..9ad0f48 100644 (file)
 
 #include <glib.h>
 #include <gdk/gdkkeysyms.h>
-#include <gtk/gtkwidget.h>
-#include <gtk/gtkfilesel.h>
-#include <gtk/gtkentry.h>
-#include <gtk/gtkmain.h>
-#include <gtk/gtksignal.h>
-#include <gtk/gtkeditable.h>
-#include <gtk/gtkstock.h>
-#include <gtk/gtkdialog.h>
-#include <gtk/gtkfilechooser.h>
-#include <gtk/gtkfilechooserdialog.h>
+#include <gtk/gtk.h>
 
 #ifdef MAEMO
 #ifdef CHINOOK
@@ -101,11 +92,19 @@ static GList *filesel_create(const gchar *title, const gchar *path,
 #ifdef MAEMO
        GtkWidget *chooser;
        if( path && strcmp(path, get_plugin_dir()) == 0 ) {
+#if !GTK_CHECK_VERSION(2,14,0)
                chooser = gtk_file_chooser_dialog_new_with_backend
                                        (title, NULL, action, "gtk+",
                                        GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
                                        action_btn, GTK_RESPONSE_ACCEPT, 
                                        NULL);
+#else
+               chooser = gtk_file_chooser_dialog_new
+                                       (title, NULL, action,
+                                       GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+                                       action_btn, GTK_RESPONSE_ACCEPT, 
+                                       NULL);
+#endif
        }
        else {
                chooser = hildon_file_chooser_dialog_new (NULL, action);
index a25d7a2..566d9f6 100644 (file)
@@ -48,9 +48,6 @@
 
 #include <gtk/gtk.h>
 #include <gdk/gdk.h>
-#include <gtk/gtkoptionmenu.h>
-#include <gtk/gtkmenu.h>
-#include <gtk/gtkmenuitem.h>
 #include <gdk/gdkkeysyms.h>
 
 #include <aspell.h>
index 6ce7e48..20dce26 100644 (file)
@@ -37,7 +37,7 @@
 
 #ifdef USE_ASPELL
 
-#include <gtk/gtkoptionmenu.h>
+#include <gtk/gtk.h>
 
 typedef struct _GtkAspell GtkAspell; /* Defined in gtkaspell.c */
 
index 6139717..498ae84 100644 (file)
@@ -507,7 +507,7 @@ gtk_cmclist_class_init (GtkCMCListClass *klass)
   widget_class = (GtkWidgetClass *) klass;
   container_class = (GtkContainerClass *) klass;
 
-  parent_class = gtk_type_class (GTK_TYPE_CONTAINER);
+  parent_class = g_type_class_peek (GTK_TYPE_CONTAINER);
 
   object_class->finalize = gtk_cmclist_finalize;
   gtk_object_class->destroy = gtk_cmclist_destroy;
@@ -1224,10 +1224,10 @@ gtk_cmclist_set_hadjustment (GtkCMCList      *clist,
 
   if (clist->hadjustment)
     {
-      g_signal_handlers_disconnect_matched(GTK_OBJECT (clist->hadjustment), G_SIGNAL_MATCH_DATA,
+      g_signal_handlers_disconnect_matched(G_OBJECT (clist->hadjustment), G_SIGNAL_MATCH_DATA,
                        0, 0, 0, 0, clist);
 
-      g_object_unref (GTK_OBJECT (clist->hadjustment));
+      g_object_unref (G_OBJECT (clist->hadjustment));
     }
 
   clist->hadjustment = adjustment;
@@ -1237,8 +1237,8 @@ gtk_cmclist_set_hadjustment (GtkCMCList      *clist,
 #if GLIB_CHECK_VERSION(2,10,0)
       g_object_ref_sink (clist->hadjustment);
 #else
-      gtk_object_ref (GTK_OBJECT (clist->hadjustment));
-      gtk_object_sink (GTK_OBJECT (clist->hadjustment));
+      gtk_object_ref (G_OBJECT (clist->hadjustment));
+      gtk_object_sink (G_OBJECT (clist->hadjustment));
 #endif
       g_signal_connect (G_OBJECT (clist->hadjustment), "changed",
                          G_CALLBACK( hadjustment_changed),
@@ -1277,9 +1277,9 @@ gtk_cmclist_set_vadjustment (GtkCMCList      *clist,
 
   if (clist->vadjustment)
     {
-      g_signal_handlers_disconnect_matched(GTK_OBJECT (clist->vadjustment), G_SIGNAL_MATCH_DATA,
+      g_signal_handlers_disconnect_matched(G_OBJECT (clist->vadjustment), G_SIGNAL_MATCH_DATA,
                        0, 0, 0, 0, clist);
-      g_object_unref (GTK_OBJECT (clist->vadjustment));
+      g_object_unref (G_OBJECT (clist->vadjustment));
     }
 
   clist->vadjustment = adjustment;
@@ -1289,14 +1289,14 @@ gtk_cmclist_set_vadjustment (GtkCMCList      *clist,
 #if GLIB_CHECK_VERSION(2,10,0)
       g_object_ref_sink (clist->vadjustment);
 #else
-      gtk_object_ref (GTK_OBJECT (clist->vadjustment));
-      gtk_object_sink (GTK_OBJECT (clist->vadjustment));
+      gtk_object_ref (G_OBJECT (clist->vadjustment));
+      gtk_object_sink (G_OBJECT (clist->vadjustment));
 #endif
 
-      g_signal_connect (GTK_OBJECT (clist->vadjustment), "changed",
+      g_signal_connect (G_OBJECT (clist->vadjustment), "changed",
                          G_CALLBACK(vadjustment_changed),
                          (gpointer) clist);
-      g_signal_connect (GTK_OBJECT (clist->vadjustment), "value_changed",
+      g_signal_connect (G_OBJECT (clist->vadjustment), "value_changed",
                          G_CALLBACK(vadjustment_value_changed),
                          (gpointer) clist);
     }
@@ -1451,7 +1451,7 @@ gtk_cmclist_column_title_active (GtkCMCList *clist,
 
   clist->column[column].button_passive = FALSE;
 
-  g_signal_handlers_disconnect_matched(GTK_OBJECT (clist->column[column].button), G_SIGNAL_MATCH_FUNC,
+  g_signal_handlers_disconnect_matched(G_OBJECT (clist->column[column].button), G_SIGNAL_MATCH_FUNC,
                    0, 0, 0, column_title_passive_func, 0);
 
   GTK_WIDGET_SET_FLAGS (clist->column[column].button, GTK_CAN_FOCUS);
@@ -1843,7 +1843,7 @@ gtk_cmclist_set_column_width (GtkCMCList *clist,
   if (column < 0 || column >= clist->columns)
     return;
 
-  g_signal_emit (GTK_OBJECT (clist), clist_signals[RESIZE_COLUMN], 0,
+  g_signal_emit (G_OBJECT (clist), clist_signals[RESIZE_COLUMN], 0,
                   column, width);
 }
 
@@ -2214,7 +2214,7 @@ column_button_create (GtkCMCList *clist,
                                  clist->title_window);
   gtk_widget_set_parent (button, GTK_WIDGET (clist));
 
-  g_signal_connect (GTK_OBJECT (button), "clicked",
+  g_signal_connect (G_OBJECT (button), "clicked",
                      G_CALLBACK(column_button_clicked),
                      (gpointer) clist);
   gtk_widget_show (button);
@@ -2237,7 +2237,7 @@ column_button_clicked (GtkWidget *widget,
     if (clist->column[i].button == widget)
       break;
 
-  g_signal_emit (GTK_OBJECT (clist), clist_signals[CLICK_COLUMN], 0, i);
+  g_signal_emit (G_OBJECT (clist), clist_signals[CLICK_COLUMN], 0, i);
 }
 
 static gint
@@ -2890,7 +2890,7 @@ real_remove_row (GtkCMCList *clist,
    * list to reflect the deincrimented indexies of rows after the
    * removal */
   if (clist_row->state == GTK_STATE_SELECTED)
-    g_signal_emit (GTK_OBJECT (clist), clist_signals[UNSELECT_ROW], 0,
+    g_signal_emit (G_OBJECT (clist), clist_signals[UNSELECT_ROW], 0,
                     row, -1, NULL);
 
   sync_selection (clist, row, SYNC_REMOVE);
@@ -2908,7 +2908,7 @@ real_remove_row (GtkCMCList *clist,
 
   if (clist->selection_mode == GTK_SELECTION_BROWSE && !clist->selection &&
       clist->focus_row >= 0)
-    g_signal_emit (GTK_OBJECT (clist), clist_signals[SELECT_ROW], 0,
+    g_signal_emit (G_OBJECT (clist), clist_signals[SELECT_ROW], 0,
                     clist->focus_row, -1, NULL);
 
   /* toast the row */
@@ -3240,7 +3240,7 @@ gtk_cmclist_row_move (GtkCMCList *clist,
       source_row == dest_row)
     return;
 
-  g_signal_emit (GTK_OBJECT (clist), clist_signals[ROW_MOVE], 0,
+  g_signal_emit (G_OBJECT (clist), clist_signals[ROW_MOVE], 0,
                   source_row, dest_row);
 }
 
@@ -3528,7 +3528,7 @@ gtk_cmclist_set_selectable (GtkCMCList *clist,
          remove_grab (clist);
          GTK_CMCLIST_GET_CLASS (clist)->resync_selection (clist, NULL);
        }
-      g_signal_emit (GTK_OBJECT (clist), clist_signals[UNSELECT_ROW], 0,
+      g_signal_emit (G_OBJECT (clist), clist_signals[UNSELECT_ROW], 0,
                       row, -1, NULL);
     }      
 }
@@ -3557,7 +3557,7 @@ gtk_cmclist_select_row (GtkCMCList *clist,
   if (column < -1 || column >= clist->columns)
     return;
 
-  g_signal_emit (GTK_OBJECT (clist), clist_signals[SELECT_ROW], 0,
+  g_signal_emit (G_OBJECT (clist), clist_signals[SELECT_ROW], 0,
                   row, column, NULL);
 }
 
@@ -3573,7 +3573,7 @@ gtk_cmclist_unselect_row (GtkCMCList *clist,
   if (column < -1 || column >= clist->columns)
     return;
 
-  g_signal_emit (GTK_OBJECT (clist), clist_signals[UNSELECT_ROW], 0,
+  g_signal_emit (G_OBJECT (clist), clist_signals[UNSELECT_ROW], 0,
                   row, column, NULL);
 }
 
@@ -3600,7 +3600,7 @@ gtk_cmclist_undo_selection (GtkCMCList *clist)
 
   if (clist->selection_mode == GTK_SELECTION_MULTIPLE &&
       (clist->undo_selection || clist->undo_unselection))
-    g_signal_emit (GTK_OBJECT (clist), clist_signals[UNDO_SELECTION], 0);
+    g_signal_emit (G_OBJECT (clist), clist_signals[UNDO_SELECTION], 0);
 }
 
 /* PRIVATE SELECTION FUNCTIONS
@@ -3650,12 +3650,12 @@ toggle_row (GtkCMCList *clist,
 
       if (clist_row->state == GTK_STATE_SELECTED)
        {
-         g_signal_emit (GTK_OBJECT (clist), clist_signals[UNSELECT_ROW], 0,
+         g_signal_emit (G_OBJECT (clist), clist_signals[UNSELECT_ROW], 0,
                           row, column, event);
          return;
        }
     case GTK_SELECTION_BROWSE:
-      g_signal_emit (GTK_OBJECT (clist), clist_signals[SELECT_ROW], 0,
+      g_signal_emit (G_OBJECT (clist), clist_signals[SELECT_ROW], 0,
                       row, column, event);
       break;
     default:
@@ -3788,7 +3788,7 @@ real_select_row (GtkCMCList *clist,
          if (row == sel_row)
            row_selected = TRUE;
          else
-           g_signal_emit (GTK_OBJECT (clist), clist_signals[UNSELECT_ROW], 0,
+           g_signal_emit (G_OBJECT (clist), clist_signals[UNSELECT_ROW], 0,
                             sel_row, column, event);
        }
 
@@ -3905,7 +3905,7 @@ real_unselect_all (GtkCMCList *clist)
     case GTK_SELECTION_BROWSE:
       if (clist->focus_row >= 0)
        {
-         g_signal_emit (GTK_OBJECT (clist),
+         g_signal_emit (G_OBJECT (clist),
                           clist_signals[SELECT_ROW], 0,
                           clist->focus_row, -1, NULL);
          return;
@@ -3930,7 +3930,7 @@ real_unselect_all (GtkCMCList *clist)
     {
       i = GPOINTER_TO_INT (list->data);
       list = list->next;
-      g_signal_emit (GTK_OBJECT (clist),
+      g_signal_emit (G_OBJECT (clist),
                       clist_signals[UNSELECT_ROW], 0, i, -1, NULL);
     }
 }
@@ -3995,13 +3995,13 @@ real_undo_selection (GtkCMCList *clist)
     }
 
   for (work = clist->undo_selection; work; work = work->next)
-    g_signal_emit (GTK_OBJECT (clist), clist_signals[SELECT_ROW], 0,
+    g_signal_emit (G_OBJECT (clist), clist_signals[SELECT_ROW], 0,
                     GPOINTER_TO_INT (work->data), -1, NULL);
 
   for (work = clist->undo_unselection; work; work = work->next)
     {
       /* g_print ("unselect %d\n",GPOINTER_TO_INT (work->data)); */
-      g_signal_emit (GTK_OBJECT (clist), clist_signals[UNSELECT_ROW], 0,
+      g_signal_emit (G_OBJECT (clist), clist_signals[UNSELECT_ROW], 0,
                       GPOINTER_TO_INT (work->data), -1, NULL);
     }
 
@@ -4095,7 +4095,7 @@ resync_selection (GtkCMCList *clist,
              if (clist_row->selectable)
                {
                  clist_row->state = GTK_STATE_SELECTED;
-                 g_signal_emit (GTK_OBJECT (clist),
+                 g_signal_emit (G_OBJECT (clist),
                                   clist_signals[UNSELECT_ROW], 0,
                                   row, -1, event);
                  clist->undo_selection = g_list_prepend
@@ -4116,7 +4116,7 @@ resync_selection (GtkCMCList *clist,
                if (GTK_CMCLIST_ROW (list)->state == GTK_STATE_NORMAL)
                  {
                    GTK_CMCLIST_ROW (list)->state = GTK_STATE_SELECTED;
-                   g_signal_emit (GTK_OBJECT (clist),
+                   g_signal_emit (G_OBJECT (clist),
                                     clist_signals[UNSELECT_ROW], 0,
                                     i, -1, event);
                    clist->undo_selection =
@@ -4144,7 +4144,7 @@ resync_selection (GtkCMCList *clist,
                if (GTK_CMCLIST_ROW (list)->state == GTK_STATE_NORMAL)
                  {
                    GTK_CMCLIST_ROW (list)->state = GTK_STATE_SELECTED;
-                   g_signal_emit (GTK_OBJECT (clist),
+                   g_signal_emit (G_OBJECT (clist),
                                     clist_signals[UNSELECT_ROW], 0,
                                     e, -1, event);
                    clist->undo_selection =
@@ -4164,7 +4164,7 @@ resync_selection (GtkCMCList *clist,
   
   clist->undo_unselection = g_list_reverse (clist->undo_unselection);
   for (list = clist->undo_unselection; list; list = list->next)
-    g_signal_emit (GTK_OBJECT (clist), clist_signals[SELECT_ROW], 0,
+    g_signal_emit (G_OBJECT (clist), clist_signals[SELECT_ROW], 0,
                     GPOINTER_TO_INT (list->data), -1, event);
 
   clist->anchor = -1;
@@ -4458,16 +4458,16 @@ gtk_cmclist_destroy (GtkObject *object)
   /* unref adjustments */
   if (clist->hadjustment)
     {
-      g_signal_handlers_disconnect_matched(GTK_OBJECT (clist->hadjustment), G_SIGNAL_MATCH_DATA,
+      g_signal_handlers_disconnect_matched(G_OBJECT (clist->hadjustment), G_SIGNAL_MATCH_DATA,
                        0, 0, 0, 0, clist);
-      g_object_unref (GTK_OBJECT (clist->hadjustment));
+      g_object_unref (G_OBJECT (clist->hadjustment));
       clist->hadjustment = NULL;
     }
   if (clist->vadjustment)
     {
-      g_signal_handlers_disconnect_matched(GTK_OBJECT (clist->vadjustment), G_SIGNAL_MATCH_DATA,
+      g_signal_handlers_disconnect_matched(G_OBJECT (clist->vadjustment), G_SIGNAL_MATCH_DATA,
                        0, 0, 0, 0, clist);
-      g_object_unref (GTK_OBJECT (clist->vadjustment));
+      g_object_unref (G_OBJECT (clist->vadjustment));
       clist->vadjustment = NULL;
     }
 
@@ -5041,7 +5041,7 @@ gtk_cmclist_button_press (GtkWidget      *widget,
                case GTK_SELECTION_SINGLE:
                  if (event->type != GDK_BUTTON_PRESS)
                    {
-                     g_signal_emit (GTK_OBJECT (clist),
+                     g_signal_emit (G_OBJECT (clist),
                                       clist_signals[SELECT_ROW], 0,
                                       row, column, event);
                      clist->anchor = -1;
@@ -5050,7 +5050,7 @@ gtk_cmclist_button_press (GtkWidget      *widget,
                    clist->anchor = row;
                  break;
                case GTK_SELECTION_BROWSE:
-                 g_signal_emit (GTK_OBJECT (clist),
+                 g_signal_emit (G_OBJECT (clist),
                                   clist_signals[SELECT_ROW], 0,
                                   row, column, event);
                  break;
@@ -5063,7 +5063,7 @@ gtk_cmclist_button_press (GtkWidget      *widget,
                          GTK_CMCLIST_GET_CLASS (clist)->resync_selection
                            (clist, (GdkEvent *) event);
                        }
-                     g_signal_emit (GTK_OBJECT (clist),
+                     g_signal_emit (G_OBJECT (clist),
                                       clist_signals[SELECT_ROW], 0,
                                       row, column, event);
                      break;
@@ -5416,7 +5416,7 @@ gtk_cmclist_motion (GtkWidget      *widget,
       switch (clist->selection_mode)
        {
        case GTK_SELECTION_BROWSE:
-         g_signal_emit (GTK_OBJECT (clist), clist_signals[SELECT_ROW], 0,
+         g_signal_emit (G_OBJECT (clist), clist_signals[SELECT_ROW], 0,
                           clist->focus_row, -1, event);
          break;
        case GTK_SELECTION_MULTIPLE:
@@ -6129,10 +6129,10 @@ adjust_adjustments (GtkCMCList *clist,
        {
          clist->vadjustment->value = MAX (0, (LIST_HEIGHT (clist) -
                                               clist->clist_window_height));
-         g_signal_emit_by_name (GTK_OBJECT (clist->vadjustment),
+         g_signal_emit_by_name (G_OBJECT (clist->vadjustment),
                                   "value_changed");
        }
-      g_signal_emit_by_name (GTK_OBJECT (clist->vadjustment), "changed");
+      g_signal_emit_by_name (G_OBJECT (clist->vadjustment), "changed");
     }
 
   if (clist->hadjustment)
@@ -6150,10 +6150,10 @@ adjust_adjustments (GtkCMCList *clist,
        {
          clist->hadjustment->value = MAX (0, (LIST_WIDTH (clist) -
                                               clist->clist_window_width));
-         g_signal_emit_by_name (GTK_OBJECT (clist->hadjustment),
+         g_signal_emit_by_name (G_OBJECT (clist->hadjustment),
                                   "value_changed");
        }
-      g_signal_emit_by_name (GTK_OBJECT (clist->hadjustment), "changed");
+      g_signal_emit_by_name (G_OBJECT (clist->hadjustment), "changed");
     }
 
   if (!block_resize && (!clist->vadjustment || !clist->hadjustment))
@@ -6525,7 +6525,7 @@ gtk_cmclist_focus_content_area (GtkCMCList *clist)
       if ((clist->selection_mode == GTK_SELECTION_BROWSE ||
           clist->selection_mode == GTK_SELECTION_MULTIPLE) &&
          !clist->selection)
-       g_signal_emit (GTK_OBJECT (clist),
+       g_signal_emit (G_OBJECT (clist),
                         clist_signals[SELECT_ROW], 0,
                         clist->focus_row, -1, NULL);
     }
@@ -6646,7 +6646,7 @@ gtk_cmclist_focus_in (GtkWidget     *widget,
 
       list = g_list_nth (clist->row_list, clist->focus_row);
       if (list && GTK_CMCLIST_ROW (list)->selectable)
-       g_signal_emit (GTK_OBJECT (clist), clist_signals[SELECT_ROW], 0,
+       g_signal_emit (G_OBJECT (clist), clist_signals[SELECT_ROW], 0,
                         clist->focus_row, -1, event);
       else
        gtk_cmclist_draw_focus (widget);
@@ -7020,7 +7020,7 @@ scroll_vertical (GtkCMCList      *clist,
       if (old_focus_row != clist->focus_row)
        {
          if (clist->selection_mode == GTK_SELECTION_BROWSE)
-           g_signal_emit (GTK_OBJECT (clist), clist_signals[UNSELECT_ROW], 0,
+           g_signal_emit (G_OBJECT (clist), clist_signals[UNSELECT_ROW], 0,
                             old_focus_row, -1, NULL);
          else if (!GTK_CMCLIST_ADD_MODE(clist))
            {
@@ -7035,7 +7035,7 @@ scroll_vertical (GtkCMCList      *clist,
          if (old_focus_row != clist->focus_row &&
              !(clist->selection_mode == GTK_SELECTION_MULTIPLE &&
                GTK_CMCLIST_ADD_MODE(clist)))
-           g_signal_emit (GTK_OBJECT (clist), clist_signals[SELECT_ROW], 0,
+           g_signal_emit (G_OBJECT (clist), clist_signals[SELECT_ROW], 0,
                             clist->focus_row, -1, NULL);
          switch (scroll_type)
            {
@@ -7079,7 +7079,7 @@ scroll_vertical (GtkCMCList      *clist,
          if (old_focus_row != clist->focus_row &&
              !(clist->selection_mode == GTK_SELECTION_MULTIPLE &&
                GTK_CMCLIST_ADD_MODE(clist)))
-           g_signal_emit (GTK_OBJECT (clist), clist_signals[SELECT_ROW], 0,
+           g_signal_emit (G_OBJECT (clist), clist_signals[SELECT_ROW], 0,
                             clist->focus_row, -1, NULL);
          break;
        }
index 8cdf4fa..fe1eb5f 100644 (file)
@@ -77,11 +77,11 @@ typedef enum
 } GtkCMButtonAction;
 
 #define GTK_TYPE_CMCLIST            (gtk_cmclist_get_type ())
-#define GTK_CMCLIST(obj)            (GTK_CHECK_CAST ((obj), GTK_TYPE_CMCLIST, GtkCMCList))
-#define GTK_CMCLIST_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_CMCLIST, GtkCMCListClass))
-#define GTK_IS_CMCLIST(obj)         (GTK_CHECK_TYPE ((obj), GTK_TYPE_CMCLIST))
-#define GTK_IS_CMCLIST_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_CMCLIST))
-#define GTK_CMCLIST_GET_CLASS(obj)  (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_CMCLIST, GtkCMCListClass))
+#define GTK_CMCLIST(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_CMCLIST, GtkCMCList))
+#define GTK_CMCLIST_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_CMCLIST, GtkCMCListClass))
+#define GTK_IS_CMCLIST(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_CMCLIST))
+#define GTK_IS_CMCLIST_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_CMCLIST))
+#define GTK_CMCLIST_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_CMCLIST, GtkCMCListClass))
 
 
 #define GTK_CMCLIST_FLAGS(clist)             (GTK_CMCLIST (clist)->flags)
index 48cd608..8f0b71c 100644 (file)
@@ -447,8 +447,8 @@ gtk_cmctree_class_init (GtkCMCTreeClass *klass)
   container_class = (GtkContainerClass *) klass;
   clist_class = (GtkCMCListClass *) klass;
 
-  parent_class = gtk_type_class (GTK_TYPE_CMCLIST);
-  container_class = gtk_type_class (GTK_TYPE_CONTAINER);
+  parent_class = g_type_class_peek (GTK_TYPE_CMCLIST);
+  container_class = g_type_class_peek (GTK_TYPE_CONTAINER);
 
   gobject_class->set_property = gtk_cmctree_set_arg;
   gobject_class->get_property = gtk_cmctree_get_arg;
@@ -3259,7 +3259,7 @@ tree_select (GtkCMCTree     *ctree,
 {
   if (node && GTK_CMCTREE_ROW (node)->row.state != GTK_STATE_SELECTED &&
       GTK_CMCTREE_ROW (node)->row.selectable)
-    g_signal_emit (GTK_OBJECT (ctree), ctree_signals[TREE_SELECT_ROW], 0,
+    g_signal_emit (G_OBJECT (ctree), ctree_signals[TREE_SELECT_ROW], 0,
                     node, -1);
 }
 
@@ -3269,7 +3269,7 @@ tree_unselect (GtkCMCTree     *ctree,
               gpointer      data)
 {
   if (node && GTK_CMCTREE_ROW (node)->row.state == GTK_STATE_SELECTED)
-    g_signal_emit (GTK_OBJECT (ctree), ctree_signals[TREE_UNSELECT_ROW], 0,
+    g_signal_emit (G_OBJECT (ctree), ctree_signals[TREE_UNSELECT_ROW], 0,
                     node, -1);
 }
 
@@ -3279,7 +3279,7 @@ tree_expand (GtkCMCTree     *ctree,
             gpointer      data)
 {
   if (node && !GTK_CMCTREE_ROW (node)->expanded)
-    g_signal_emit (GTK_OBJECT (ctree), ctree_signals[TREE_EXPAND], 0,node);
+    g_signal_emit (G_OBJECT (ctree), ctree_signals[TREE_EXPAND], 0,node);
 }
 
 static void
@@ -3288,7 +3288,7 @@ tree_collapse (GtkCMCTree     *ctree,
               gpointer      data)
 {
   if (node && GTK_CMCTREE_ROW (node)->expanded)
-    g_signal_emit (GTK_OBJECT (ctree), ctree_signals[TREE_COLLAPSE], 0,node);
+    g_signal_emit (G_OBJECT (ctree), ctree_signals[TREE_COLLAPSE], 0,node);
 }
 
 static void
@@ -3309,9 +3309,9 @@ tree_toggle_expansion (GtkCMCTree     *ctree,
     return;
 
   if (GTK_CMCTREE_ROW (node)->expanded)
-    g_signal_emit (GTK_OBJECT (ctree), ctree_signals[TREE_COLLAPSE], 0,node);
+    g_signal_emit (G_OBJECT (ctree), ctree_signals[TREE_COLLAPSE], 0,node);
   else
-    g_signal_emit (GTK_OBJECT (ctree), ctree_signals[TREE_EXPAND], 0,node);
+    g_signal_emit (G_OBJECT (ctree), ctree_signals[TREE_EXPAND], 0,node);
 }
 
 static GtkCMCTreeRow *
@@ -3435,7 +3435,7 @@ real_select_row (GtkCMCList *clist,
   
   if ((node = g_list_nth (clist->row_list, row)) &&
       GTK_CMCTREE_ROW (node)->row.selectable)
-    g_signal_emit (GTK_OBJECT (clist), ctree_signals[TREE_SELECT_ROW],0,
+    g_signal_emit (G_OBJECT (clist), ctree_signals[TREE_SELECT_ROW],0,
                     node, column);
 }
 
@@ -3450,7 +3450,7 @@ real_unselect_row (GtkCMCList *clist,
   g_return_if_fail (GTK_IS_CMCTREE (clist));
 
   if ((node = g_list_nth (clist->row_list, row)))
-    g_signal_emit (GTK_OBJECT (clist), ctree_signals[TREE_UNSELECT_ROW],0,
+    g_signal_emit (G_OBJECT (clist), ctree_signals[TREE_UNSELECT_ROW],0,
                     node, column);
 }
 
@@ -3488,7 +3488,7 @@ real_tree_select (GtkCMCTree     *ctree,
          if (node == sel_row)
            node_selected = TRUE;
          else
-           g_signal_emit (GTK_OBJECT (ctree),
+           g_signal_emit (G_OBJECT (ctree),
                             ctree_signals[TREE_UNSELECT_ROW], 0, sel_row, column);
        }
 
@@ -4430,7 +4430,7 @@ gtk_cmctree_move (GtkCMCTree     *ctree,
   g_return_if_fail (GTK_IS_CMCTREE (ctree));
   g_return_if_fail (node != NULL);
   
-  g_signal_emit (GTK_OBJECT (ctree), ctree_signals[TREE_MOVE], 0, node,
+  g_signal_emit (G_OBJECT (ctree), ctree_signals[TREE_MOVE], 0, node,
                   new_parent, new_sibling);
 }
 
@@ -4444,7 +4444,7 @@ gtk_cmctree_expand (GtkCMCTree     *ctree,
   if (GTK_CMCTREE_ROW (node)->is_leaf)
     return;
 
-  g_signal_emit (GTK_OBJECT (ctree), ctree_signals[TREE_EXPAND], 0, node);
+  g_signal_emit (G_OBJECT (ctree), ctree_signals[TREE_EXPAND], 0, node);
 }
 
 void 
@@ -4511,7 +4511,7 @@ gtk_cmctree_collapse (GtkCMCTree     *ctree,
   if (GTK_CMCTREE_ROW (node)->is_leaf)
     return;
 
-  g_signal_emit (GTK_OBJECT (ctree), ctree_signals[TREE_COLLAPSE], 0, node);
+  g_signal_emit (G_OBJECT (ctree), ctree_signals[TREE_COLLAPSE], 0, node);
 }
 
 void 
@@ -4631,7 +4631,7 @@ gtk_cmctree_select (GtkCMCTree     *ctree,
   g_return_if_fail (node != NULL);
 
   if (GTK_CMCTREE_ROW (node)->row.selectable)
-    g_signal_emit (GTK_OBJECT (ctree), ctree_signals[TREE_SELECT_ROW], 0,
+    g_signal_emit (G_OBJECT (ctree), ctree_signals[TREE_SELECT_ROW], 0,
                     node, -1);
 }
 
@@ -4642,7 +4642,7 @@ gtk_cmctree_unselect (GtkCMCTree     *ctree,
   g_return_if_fail (GTK_IS_CMCTREE (ctree));
   g_return_if_fail (node != NULL);
 
-  g_signal_emit (GTK_OBJECT (ctree), ctree_signals[TREE_UNSELECT_ROW], 0,
+  g_signal_emit (G_OBJECT (ctree), ctree_signals[TREE_UNSELECT_ROW], 0,
                   node, -1);
 }
 
index c1fe8c4..4e4b0b6 100644 (file)
 G_BEGIN_DECLS
 
 #define GTK_TYPE_CMCTREE            (gtk_cmctree_get_type ())
-#define GTK_CMCTREE(obj)            (GTK_CHECK_CAST ((obj), GTK_TYPE_CMCTREE, GtkCMCTree))
-#define GTK_CMCTREE_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_CMCTREE, GtkCMCTreeClass))
-#define GTK_IS_CMCTREE(obj)         (GTK_CHECK_TYPE ((obj), GTK_TYPE_CMCTREE))
-#define GTK_IS_CMCTREE_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_CMCTREE))
-#define GTK_CMCTREE_GET_CLASS(obj)  (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_CMCTREE, GtkCMCTreeClass))
+#define GTK_CMCTREE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_CMCTREE, GtkCMCTree))
+#define GTK_CMCTREE_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_CMCTREE, GtkCMCTreeClass))
+#define GTK_IS_CMCTREE(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_CMCTREE))
+#define GTK_IS_CMCTREE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_CMCTREE))
+#define GTK_CMCTREE_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_CMCTREE, GtkCMCTreeClass))
 
 #define GTK_CMCTREE_ROW(_node_) ((GtkCMCTreeRow *)(((GList *)(_node_))->data))
 #define GTK_CMCTREE_NODE(_node_) ((GtkCMCTreeNode *)((_node_)))
index 6824fcb..5a7afc0 100644 (file)
@@ -29,7 +29,7 @@
 
 
 #include <gdk/gdk.h>
-#include <gtk/gtkbutton.h>
+#include <gtk/gtk.h>
 
 
 G_BEGIN_DECLS
index 4d331da..84d65e1 100644 (file)
@@ -1359,7 +1359,7 @@ gtk_sctree_class_init (GtkSCTreeClass *klass)
        clist_class = (GtkCMCListClass *) klass;
        ctree_class = (GtkCMCTreeClass *) klass;
 
-       parent_class = gtk_type_class (gtk_cmctree_get_type ());
+       parent_class = g_type_class_peek (gtk_cmctree_get_type ());
 
        sctree_signals[ROW_POPUP_MENU] =
                g_signal_new ("row_popup_menu",
index 73e52b1..8727b5d 100644 (file)
@@ -9,10 +9,10 @@
 /* This code is based on "gtkflist.{h,c}" from mc-4.5.42 .*/
 
 #define TYPE_GTK_SCTREE                        (gtk_sctree_get_type ())
-#define GTK_SCTREE(obj)                        (GTK_CHECK_CAST ((obj), TYPE_GTK_SCTREE, GtkSCTree))
-#define GTK_SCTREE_CLASS(klass)                (GTK_CHECK_CLASS_CAST ((klass), TYPE_GTK_SCTREE, GtkSCTreeClass))
-#define GTK_IS_SCTREE(obj)             (GTK_CHECK_TYPE ((obj), TYPE_GTK_SCTREE))
-#define GTK_IS_SCTREE_CLASS(klass)     (GTK_CHECK_CLASS_TYPE ((klass), TYPE_GTK_SCTREE))
+#define GTK_SCTREE(obj)                        (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_GTK_SCTREE, GtkSCTree))
+#define GTK_SCTREE_CLASS(klass)                (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_GTK_SCTREE, GtkSCTreeClass))
+#define GTK_IS_SCTREE(obj)             (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_GTK_SCTREE))
+#define GTK_IS_SCTREE_CLASS(klass)     (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_GTK_SCTREE))
 
 
 typedef struct _GtkSCTree GtkSCTree;
index 41839e6..a4860d0 100644 (file)
@@ -29,7 +29,7 @@
 #include <math.h>
 #include <stdio.h>
 #include <string.h>
-#include <gtk/gtkhruler.h>
+#include <gtk/gtk.h>
 #include "gtkshruler.h"
 
 #define RULER_HEIGHT          14
index e0eff70..8142800 100644 (file)
@@ -20,7 +20,7 @@
 
 
 #include <gdk/gdk.h>
-#include <gtk/gtkhruler.h>
+#include <gtk/gtk.h>
 
 
 #ifdef __cplusplus
@@ -28,9 +28,9 @@ extern "C" {
 #endif /* __cplusplus */
 
 
-#define GTK_SHRULER(obj)            (GTK_CHECK_CAST ((obj), gtk_shruler_get_type (), GtkSHRuler))
-#define GTK_SHRULER_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), gtk_shruler_get_type (), GtkSHRulerClass))
-#define GTK_IS_SHRULER(obj)         (GTK_CHECK_TYPE ((obj), gtk_shruler_get_type ()))
+#define GTK_SHRULER(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), gtk_shruler_get_type (), GtkSHRuler))
+#define GTK_SHRULER_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), gtk_shruler_get_type (), GtkSHRulerClass))
+#define GTK_IS_SHRULER(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), gtk_shruler_get_type ()))
 
 
 typedef struct _GtkSHRuler        GtkSHRuler;
index 054e0fd..e36ef72 100644 (file)
@@ -37,8 +37,7 @@
 #include "image_viewer.h"
 
 #include <glib/gi18n.h>
-#include <gtk/gtkmain.h>
-#include <gtk/gtktextview.h>
+#include <gtk/gtk.h>
 #include <libgnomeprint/gnome-print-pango.h>
 
 #ifdef ENABLE_PROFILE
index 5a8ad44..b000a64 100644 (file)
@@ -30,8 +30,7 @@
 
 #include <libgnomeprint/gnome-print-config.h>
 #include <libgnomeprint/gnome-print-job.h>
-#include <gtk/gtktextbuffer.h>
-//#include <gtksourceview/gtksourceview.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 
index fb4f1a5..0714a65 100644 (file)
@@ -675,37 +675,37 @@ void gtkut_widget_init(void)
        GtkWidget *clist;
 
        clist = gtk_cmclist_new(1);
-       g_object_ref(GTK_OBJECT(clist));
+       g_object_ref(G_OBJECT(clist));
 #if GLIB_CHECK_VERSION(2,10,0)
-       g_object_ref_sink (GTK_OBJECT(clist));
+       g_object_ref_sink (G_OBJECT(clist));
 #else
-       gtk_object_ref (GTK_OBJECT(clist));
-       gtk_object_sink (GTK_OBJECT(clist));
+       gtk_object_ref (G_OBJECT(clist));
+       gtk_object_sink (G_OBJECT(clist));
 #endif
        gtkut_clist_bindings_add(clist);
-       g_object_unref(GTK_OBJECT(clist));
+       g_object_unref(G_OBJECT(clist));
 
        clist = gtk_cmctree_new(1, 0);
-       g_object_ref(GTK_OBJECT(clist));
+       g_object_ref(G_OBJECT(clist));
 #if GLIB_CHECK_VERSION(2,10,0)
-       g_object_ref_sink (GTK_OBJECT(clist));
+       g_object_ref_sink (G_OBJECT(clist));
 #else
-       gtk_object_ref (GTK_OBJECT(clist));
-       gtk_object_sink (GTK_OBJECT(clist));
+       gtk_object_ref (G_OBJECT(clist));
+       gtk_object_sink (G_OBJECT(clist));
 #endif
        gtkut_clist_bindings_add(clist);
-       g_object_unref(GTK_OBJECT(clist));
+       g_object_unref(G_OBJECT(clist));
 
        clist = gtk_sctree_new_with_titles(1, 0, NULL);
-       g_object_ref(GTK_OBJECT(clist));
+       g_object_ref(G_OBJECT(clist));
 #if GLIB_CHECK_VERSION(2,10,0)
-       g_object_ref_sink (GTK_OBJECT(clist));
+       g_object_ref_sink (G_OBJECT(clist));
 #else
-       gtk_object_ref (GTK_OBJECT(clist));
-       gtk_object_sink (GTK_OBJECT(clist));
+       gtk_object_ref (G_OBJECT(clist));
+       gtk_object_sink (G_OBJECT(clist));
 #endif
        gtkut_clist_bindings_add(clist);
-       g_object_unref(GTK_OBJECT(clist));
+       g_object_unref(G_OBJECT(clist));
 }
 
 void gtkut_widget_set_app_icon(GtkWidget *widget)
@@ -1623,7 +1623,7 @@ struct _ClawsIOClosure
 {
   GdkInputFunction function;
   GdkInputCondition condition;
-  GdkDestroyNotify notify;
+  GDestroyNotify notify;
   gpointer data;
 };
 
index 90fb375..d245fd1 100644 (file)
@@ -40,7 +40,6 @@
 #include <hildon-widgets/hildon-window.h>
 #endif
 #include "main.h"
-#include <gtk/gtkmain.h>
 #endif
 
 #include "gtkcmctree.h"
index 7fba338..4a3cb54 100644 (file)
 #endif
 
 #include <glib.h>
-#include <gtk/gtksignal.h>
-#include <gtk/gtkbutton.h>
-#include <gtk/gtkmisc.h>
 #include <gtk/gtk.h>
-#include <gtk/gtkbox.h>
-#include <gtk/gtkmain.h>
 
 #include "gtkvscrollbutton.h"
 
@@ -56,7 +51,7 @@ enum {
 static void gtk_vscrollbutton_class_init(GtkVScrollbuttonClass * klass);
 static void gtk_vscrollbutton_init(GtkVScrollbutton * vscrollbutton);
 
-GtkType gtk_vscrollbutton_get_type             (void);
+GType gtk_vscrollbutton_get_type               (void);
 GtkWidget *gtk_vscrollbutton_new               (GtkAdjustment    *adjustment);
 
 static gint gtk_vscrollbutton_button_release   (GtkWidget        *widget,
@@ -251,8 +246,8 @@ void gtk_vscrollbutton_set_adjustment(GtkVScrollbutton *scrollbutton,
 #if GLIB_CHECK_VERSION(2,10,0)
        g_object_ref_sink (G_OBJECT(adjustment));
 #else
-       gtk_object_ref (GTK_OBJECT (adjustment));
-       gtk_object_sink (GTK_OBJECT (adjustment));
+       gtk_object_ref (G_OBJECT (adjustment));
+       gtk_object_sink (G_OBJECT (adjustment));
 #endif
     }
 }
index f14a99c..7661d77 100644 (file)
 
 
 #include <gdk/gdk.h>
-#include <gtk/gtkwidget.h>
-#include <gtk/gtkvbox.h>
+#include <gtk/gtk.h>
 
 
 #define GTK_TYPE_VSCROLLBUTTON            (gtk_vscrollbutton_get_type ())
-#define GTK_VSCROLLBUTTON(obj)            (GTK_CHECK_CAST ((obj), GTK_TYPE_VSCROLLBUTTON, GtkVScrollbutton))
-#define GTK_VSCROLLBUTTON_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_VSCROLLBUTTON, GtkVScrollbuttonClass))
-#define GTK_IS_VSCROLLBUTTON(obj)         (GTK_CHECK_TYPE ((obj), GTK_TYPE_VSCROLLBUTTON))
-#define GTK_IS_VSCROLLBUTTON_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_VSCROLLBUTTON))
+#define GTK_VSCROLLBUTTON(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_VSCROLLBUTTON, GtkVScrollbutton))
+#define GTK_VSCROLLBUTTON_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_VSCROLLBUTTON, GtkVScrollbuttonClass))
+#define GTK_IS_VSCROLLBUTTON(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_VSCROLLBUTTON))
+#define GTK_IS_VSCROLLBUTTON_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_VSCROLLBUTTON))
 
 typedef struct _GtkVScrollbutton       GtkVScrollbutton;
 typedef struct _GtkVScrollbuttonClass  GtkVScrollbuttonClass;
@@ -70,7 +69,7 @@ extern "C" {
 #endif /* __cplusplus */
 
 
-GtkType    gtk_vscrollbutton_get_type  (void);
+GType    gtk_vscrollbutton_get_type    (void);
 GtkWidget* gtk_vscrollbutton_new       (GtkAdjustment *adjustment);
 gint      gtk_vscrollbutton_scroll     (GtkVScrollbutton *scrollbutton);
 
index f423377..706ea37 100644 (file)
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
-#include <gtk/gtkwidget.h>
-#include <gtk/gtkwindow.h>
-#include <gtk/gtksignal.h>
-#include <gtk/gtkvbox.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtklabel.h>
 
 #include "gtkutils.h"
 #include "stock_pixmap.h"
index fa0b9df..b4e4e2f 100644 (file)
 #include <glib.h>
 #include <glib/gi18n.h>
 #include <gdk/gdkkeysyms.h>
-#include <gtk/gtkmain.h>
-#include <gtk/gtkwidget.h>
-#include <gtk/gtkdialog.h>
-#include <gtk/gtkwindow.h>
-#include <gtk/gtksignal.h>
-#include <gtk/gtkvbox.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkentry.h>
-#include <gtk/gtkcomboboxentry.h>
-#include <gtk/gtkbutton.h>
-#include <gtk/gtkhbbox.h>
-#include <gtk/gtkstock.h>
-#include <gtk/gtkimage.h>
-#include <gtk/gtktogglebutton.h>
-#include <gtk/gtkcheckbutton.h>
+#include <gtk/gtk.h>
 
 #include "inputdialog.h"
 #include "manage_window.h"
index 979e801..fb0becb 100644 (file)
 #include <glib.h>
 #include <glib/gi18n.h>
 #include <gdk/gdkkeysyms.h>
-#include <gtk/gtkwidget.h>
-#include <gtk/gtkwindow.h>
-#include <gtk/gtksignal.h>
-#include <gtk/gtkscrolledwindow.h>
-#include <gtk/gtktextview.h>
-#include <gtk/gtkstyle.h>
-#include <gtk/gtkmenuitem.h>
-#include <gtk/gtkseparatormenuitem.h>
+#include <gtk/gtk.h>
 
 #include "logwindow.h"
 #include "utils.h"
index c2c71f2..e08dd76 100644 (file)
@@ -21,7 +21,7 @@
 #define __LOGWINDOW_H__
 
 #include <glib.h>
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
 
 #include "log.h"
 
index c2cb91a..9dbec4a 100644 (file)
@@ -18,8 +18,7 @@
  */
 
 #include <glib.h>
-#include <gtk/gtkwidget.h>
-#include <gtk/gtkwindow.h>
+#include <gtk/gtk.h>
 
 #include "manage_window.h"
 /* #include "utils.h" */
index bc5e399..b924ec1 100644 (file)
@@ -21,8 +21,7 @@
 #define __MANAGE_WINDOW_H__
 
 #include <glib.h>
-#include <gtk/gtkwidget.h>
-#include <gtk/gtkwindow.h>
+#include <gtk/gtk.h>
 
 #define MANAGE_WINDOW_SIGNALS_CONNECT(window) \
 { \
index a5bf937..beed8e7 100644 (file)
@@ -36,7 +36,6 @@
 #else
 #include <hildon-widgets/hildon-program.h>
 #endif
-#include <gtk/gtkmain.h>
 #endif
 
 #if 0 /* FIXME */
index 4cb9162..46d9562 100644 (file)
@@ -25,7 +25,6 @@
 #include <glib/gi18n.h>
 #include <string.h>
 #include <gtk/gtk.h>
-#include <gtk/gtktext.h>
 #include <gdk/gdkkeysyms.h>
 
 #include "utils.h"
index da7e0d2..d7a3e69 100644 (file)
 
 #include <glib.h>
 #include <glib/gi18n.h>
-#include <gtk/gtkdialog.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkprogressbar.h>
-#include <gtk/gtkscrolledwindow.h>
-#include <gtk/gtkliststore.h>
-#include <gtk/gtktreeview.h>
-#include <gtk/gtktreeselection.h>
-#include <gtk/gtkcellrendererpixbuf.h>
-#include <gtk/gtkcellrenderertext.h>
-#include <gtk/gtkbutton.h>
-#include <gtk/gtkstock.h>
+#include <gtk/gtk.h>
 
 #include "progressdialog.h"
 #include "gtkutils.h"
index b4632c2..7fe9f41 100644 (file)
@@ -21,8 +21,7 @@
 #define __PROGRESS_H__
 
 #include <glib.h>
-#include <gtk/gtkwidget.h>
-#include <gtk/gtkliststore.h>
+#include <gtk/gtk.h>
 
 typedef struct _ProgressDialog ProgressDialog;
 
index 2945472..4bcf09d 100644 (file)
 
 #include <glib.h>
 #include <glib/gi18n.h>
-#include <gtk/gtkwidget.h>
-#include <gtk/gtkstyle.h>
-#include <gtk/gtkscrolledwindow.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtkvbox.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkimage.h>
+#include <gtk/gtk.h>
 #include <stdio.h>
 #include <string.h>
 #include <time.h>
index 8f663df..b1d1b3d 100644 (file)
@@ -21,7 +21,7 @@
 #define __HEADERVIEW_H__
 
 #include <glib.h>
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
 
 typedef struct _HeaderView     HeaderView;
 
index e78295e..b615079 100644 (file)
@@ -23,8 +23,7 @@
 
 #include <glib.h>
 #include <glib/gi18n.h>
-#include <gtk/gtkscrolledwindow.h>
-#include <gtk/gtkpixmap.h>
+#include <gtk/gtk.h>
 
 #include "procmime.h"
 #include "utils.h"
index 43cd56c..5d5a1cc 100644 (file)
 #include <glib.h>
 #include <glib/gi18n.h>
 #include <gdk/gdkkeysyms.h>
-#include <gtk/gtkmain.h>
-#include <gtk/gtkwidget.h>
-#include <gtk/gtkwindow.h>
-#include <gtk/gtkvbox.h>
-#include <gtk/gtktable.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkentry.h>
-#include <gtk/gtkhbbox.h>
-#include <gtk/gtkbutton.h>
-#include <gtk/gtkfilesel.h>
-#include <gtk/gtksignal.h>
+#include <gtk/gtk.h>
 
 #include "claws.h"
 #include "main.h"
index 2ed95d4..e06364e 100644 (file)
 #include <glib.h>
 #include <glib/gi18n.h>
 #include <gdk/gdkkeysyms.h>
-#include <gtk/gtkwindow.h>
-#include <gtk/gtksignal.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkentry.h>
-#include <gtk/gtktable.h>
-#include <gtk/gtkbutton.h>
+#include <gtk/gtk.h>
 
 #include "addrbook.h"
 #include "addressbook.h"
index e1d638b..9ef60d6 100644 (file)
 #include <glib.h>
 #include <glib/gi18n.h>
 #include <gdk/gdkkeysyms.h>
-#include <gtk/gtkwindow.h>
-#include <gtk/gtksignal.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkentry.h>
-#include <gtk/gtktable.h>
-#include <gtk/gtkbutton.h>
+#include <gtk/gtk.h>
 
 #include "addrbook.h"
 #include "addressbook.h"
index 446cdba..493fbd7 100644 (file)
 #include <glib.h>
 #include <glib/gi18n.h>
 #include <gdk/gdkkeysyms.h>
-#include <gtk/gtkwindow.h>
-#include <gtk/gtksignal.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkentry.h>
-#include <gtk/gtktable.h>
-#include <gtk/gtkbutton.h>
+#include <gtk/gtk.h>
 
 #include "addrbook.h"
 #include "addressbook.h"
index 450e557..a355fa7 100644 (file)
--- a/src/inc.c
+++ b/src/inc.c
 
 #include <glib.h>
 #include <glib/gi18n.h>
-#include <gtk/gtkmain.h>
-#include <gtk/gtkwindow.h>
-#include <gtk/gtksignal.h>
-#include <gtk/gtkprogressbar.h>
+#include <gtk/gtk.h>
 #include <stdio.h>
 #include <unistd.h>
 #include <string.h>
index 1f10d67..4685bdd 100644 (file)
@@ -25,8 +25,7 @@
 
 #include <glib.h>
 #include <glib/gi18n.h>
-#include <gtk/gtkmain.h>
-#include <gtk/gtkrc.h>
+#include <gtk/gtk.h>
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -140,7 +139,6 @@ GCRY_THREAD_OPTION_PTHREAD_IMPL;
 #include <hildon-widgets/hildon-banner.h>
 #include <hildon-widgets/hildon-program.h>
 #endif
-#include <gtk/gtkmain.h>
 #include <libosso.h>
 #include <libgnomevfs/gnome-vfs-volume.h>
 #include <libgnomevfs/gnome-vfs-volume-monitor.h>
index 4e9526e..0616eef 100644 (file)
@@ -21,7 +21,7 @@
 #define __MAIN_H__
 
 #include <glib.h>
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
 #ifdef MAEMO
 #ifdef CHINOOK
 #include <hildon/hildon-program.h>
index 55d2a4f..8c63e32 100644 (file)
 #include <glib.h>
 #include <glib/gi18n.h>
 #include <gdk/gdkkeysyms.h>
-#include <gtk/gtkvbox.h>
-#include <gtk/gtkcontainer.h>
-#include <gtk/gtkwindow.h>
-#include <gtk/gtktext.h>
-#include <gtk/gtkmenu.h>
-#include <gtk/gtkmenuitem.h>
+#include <gtk/gtk.h>
 #include <stdio.h>
 #include <ctype.h>
 #include <string.h>
index 96e31a7..3bad00f 100644 (file)
@@ -25,7 +25,7 @@
 #endif
 
 #include <glib.h>
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
 
 typedef struct _MessageView    MessageView;
 
index bacaff1..4df1096 100644 (file)
 
 #include <glib.h>
 #include <glib/gi18n.h>
-#include <gtk/gtkwidget.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtkvbox.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkpixmap.h>
+#include <gtk/gtk.h>
 #include <stdio.h>
 #include <string.h>
 #include <time.h>
index ae6d53e..6243718 100644 (file)
@@ -27,7 +27,7 @@
 #include <glib.h>
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
-#include <gtk/gtkutils.h>
+#include "gtk/gtkutils.h"
 
 #include "common/claws.h"
 #include "common/version.h"
index 5778f10..5498487 100644 (file)
@@ -24,9 +24,8 @@
 
 #include <glib.h>
 #include <glib/gi18n.h>
-#include <gdk/gdktypes.h>
+#include <gdk/gdk.h>
 #include <gdk/gdkkeysyms.h>
-#include <gdk/gdkdisplay.h>
 #ifdef GDK_WINDOWING_X11
 #  include <gdk/gdkx.h>
 #endif /* GDK_WINDOWING_X11 */
index fead4d8..6b57fd9 100644 (file)
@@ -26,7 +26,7 @@
 #include <glib.h>
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
-#include <gtk/gtkutils.h>
+#include "gtk/gtkutils.h"
 
 #include "common/claws.h"
 #include "common/version.h"
index 2e93f65..01376fb 100644 (file)
@@ -23,7 +23,7 @@
 #include <time.h>
 #include <glib.h>
 #include <glib/gi18n.h>
-#include <gtk/gtkversion.h>
+#include <gtk/gtk.h>
 
 #include <string.h>
 #include "eggtrayicon.h"
index f61f24b..2903acc 100644 (file)
@@ -19,8 +19,8 @@
 #ifndef __EGG_TRAY_ICON_H__
 #define __EGG_TRAY_ICON_H__
 
-#include <gtk/gtkplug.h>
 #include <gdk/gdkx.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 
index c947994..3514f5d 100644 (file)
@@ -1,5 +1,4 @@
 #include <gtk/gtk.h>
-#include <gtk/gtkprivate.h>
 
 #include <gdk/gdkkeysyms.h>
 #include <gdk/gdkx.h>
index 8d3b5da..3ec2af7 100644 (file)
@@ -26,7 +26,6 @@
 
 #include <gtk/gtk.h>
 #include "gtkplugxembed.h"
-#include <gtk/gtkprivate.h>
 
 #include <gdk/gdkkeysyms.h>
 #include <gdk/gdkx.h>
@@ -154,7 +153,7 @@ gtk_plug_xembed_class_init (GtkPlugXEmbedClass *class)
   plug_signals[EMBEDDED] =
          g_signal_new ("embedded",
                        GTK_RUN_LAST,
-                       GTK_OBJECT_CLASS (class)->type,
+                       G_OBJECT_CLASS (class)->type,
                        GTK_STRUCT_OFFSET (GtkPlugXEmbedClass, embedded),
                        gtk_marshal_NONE__NONE,
                        GTK_TYPE_NONE, 0);
@@ -413,7 +412,7 @@ gtk_plug_xembed_finalize (GtkObject *object)
       plug->grabbed_keys = NULL;
     }
   
-  GTK_OBJECT_CLASS (parent_class)->finalize (object);
+  G_OBJECT_CLASS (parent_class)->finalize (object);
 }
 
 static void
index b5258f7..8640aac 100644 (file)
@@ -27,8 +27,7 @@
 
 
 #include <gdk/gdk.h>
-#include <gtk/gtksocket.h>
-#include <gtk/gtkwindow.h>
+#include <gtk/gtk.h>
 
 
 #ifdef __cplusplus
index ae7464f..3a22147 100644 (file)
@@ -390,7 +390,7 @@ static void create_trayicon()
        destroy_signal_id =
        g_signal_connect(G_OBJECT(trayicon), "destroy",
                G_CALLBACK(destroy_cb), NULL);
-       g_signal_connect(GTK_OBJECT(trayicon), "size-request",
+       g_signal_connect(G_OBJECT(trayicon), "size-request",
                G_CALLBACK(resize_cb), NULL);
        g_signal_connect(G_OBJECT(eventbox), "button-press-event",
                G_CALLBACK(click_cb), NULL);
index c5fd7bd..1f6ab7f 100644 (file)
@@ -657,7 +657,7 @@ static gint prefs_actions_clist_set_row(gint row)
                gchar *message;
                message = g_markup_printf_escaped(_("The command\n%s\nhas a syntax error."),
                                                entry_text);
-               alertpanel_error(message);
+               alertpanel_error("%s", message);
                g_free(message);
                return -1;
        }
index bf95b4c..44991f8 100644 (file)
@@ -26,7 +26,6 @@
 #include <glib.h>
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
-#include <gtk/gtkoptionmenu.h>
 #include <gdk/gdkkeysyms.h>
 #include <stdio.h>
 #include <stdlib.h>
index 0390567..1bb841e 100644 (file)
 
 #include <glib.h>
 #include <glib/gi18n.h>
-#include <gtk/gtkmain.h>
-#include <gtk/gtkwindow.h>
-#include <gtk/gtkvbox.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtkbutton.h>
+#include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
 
 #include "prefs_gtk.h"
index 351f7a8..b601496 100644 (file)
 #define __PREFS_GTK_H__
 
 #include <glib.h>
-#include <gtk/gtkwidget.h>
-#include <gtk/gtksignal.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtknotebook.h>
-#include <gtk/gtkcheckbutton.h>
-#include <gtk/gtkbox.h>
+#include <gtk/gtk.h>
 #include <stdio.h>
 
 typedef struct _PrefParam      PrefParam;
index f47fcd2..43de2b3 100644 (file)
 
 #include <glib.h>
 #include <glib/gi18n.h>
-#include <gtk/gtkmain.h>
-#include <gtk/gtkwindow.h>
-#include <gtk/gtkvbox.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtkbutton.h>
+#include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
 
 #include "prefs_gtk.h"
index dc8bb9f..4ac0beb 100644 (file)
@@ -30,7 +30,6 @@
 #include <glib.h>
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
-#include <gtk/gtkoptionmenu.h>
 #include <gdk/gdkkeysyms.h>
 #include <stdio.h>
 #include <stdlib.h>
index ded4b6e..14977d0 100644 (file)
@@ -25,9 +25,7 @@
 
 #include <glib.h>
 #include <glib/gi18n.h>
-#include <gtk/gtkmain.h>
-#include <gtk/gtksignal.h>
-#include <gtk/gtkwindow.h>
+#include <gtk/gtk.h>
 #include <stdio.h>
 #include <string.h>
 #include <signal.h>
index 87f23bd..b08a7c5 100644 (file)
@@ -24,7 +24,7 @@
 #include <stddef.h>
 #include <glib.h>
 #include <glib/gi18n.h>
-#include <gtk/gtkstatusbar.h>
+#include <gtk/gtk.h>
 
 #include "inputdialog.h"
 #include "alertpanel.h"
index ecf0041..804dac9 100644 (file)
 #include <glib.h>
 #include <glib/gi18n.h>
 #include <gdk/gdkkeysyms.h>
-#include <gtk/gtkwidget.h>
-#include <gtk/gtkwindow.h>
-#include <gtk/gtksignal.h>
-#include <gtk/gtkscrolledwindow.h>
-#include <gtk/gtktext.h>
-#include <gtk/gtkstyle.h>
+#include <gtk/gtk.h>
 #include <stdio.h>
 #include <stdlib.h>
 
index 3fbe344..a06c06d 100644 (file)
@@ -21,7 +21,7 @@
 #define __SOURCEWINDOW_H__
 
 #include <glib.h>
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
 
 #include "procmsg.h"
 
index b44256f..7856d0c 100644 (file)
@@ -22,7 +22,7 @@
 #endif
 
 #if (defined(USE_OPENSSL) || defined (USE_GNUTLS))
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
 #include <glib.h>
 #include <glib/gi18n.h>
 #include <gdk/gdkkeysyms.h>
index 5014a0e..011f818 100644 (file)
@@ -23,8 +23,7 @@
 
 #include <glib.h>
 #include <glib/gi18n.h>
-#include <gtk/gtkstatusbar.h>
-#include <gtk/gtkprogressbar.h>
+#include <gtk/gtk.h>
 #include <stdarg.h>
 
 #include "mainwindow.h"
index 3627147..95a9763 100644 (file)
@@ -21,8 +21,7 @@
 #define __STATUSBAR_H__
 
 #include <glib.h>
-#include <gtk/gtkwidget.h>
-#include <gtk/gtkstatusbar.h>
+#include <gtk/gtk.h>
 
 GtkWidget *statusbar_create    (void);
 void statusbar_puts            (GtkStatusbar   *statusbar,
index 69af460..94bda02 100644 (file)
@@ -19,8 +19,7 @@
 
 #include "defs.h"
 #include <glib.h>
-#include <gtk/gtkwidget.h>
-#include <gtk/gtkimage.h>
+#include <gtk/gtk.h>
 #include <string.h>
 #include <dirent.h>
 
index c74c517..028f8b0 100644 (file)
@@ -21,7 +21,7 @@
 #define __STOCK_PIXMAP_H__
 
 #include <glib.h>
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
 
 typedef enum
 {
index c3f6265..ef3ea17 100644 (file)
@@ -22,7 +22,6 @@
 #include <glib.h>
 #include <glib/gi18n.h>
 #include <gdk/gdkkeysyms.h>
-#include <gtk/gtkscrolledwindow.h>
 #include <gtk/gtk.h>
 
 #include <stdio.h>
index 7c0ea89..fc3657e 100644 (file)
@@ -27,9 +27,7 @@
 #include <glib/gi18n.h>
 #include <gdk/gdk.h>
 #include <gdk/gdkkeysyms.h>
-#include <gtk/gtkvbox.h>
-#include <gtk/gtkscrolledwindow.h>
-#include <gtk/gtksignal.h>
+#include <gtk/gtk.h>
 #include <stdio.h>
 #include <ctype.h>
 #include <string.h>
index 3c5e15d..fb06b20 100644 (file)
@@ -25,8 +25,7 @@
 #endif
 
 #include <glib.h>
-#include <gtk/gtkwidget.h>
-#include <gtk/gtktextiter.h>
+#include <gtk/gtk.h>
 
 typedef struct _TextView       TextView;
 typedef struct _ClickableText  ClickableText;
index 76cf3ed..f0c3221 100644 (file)
@@ -23,8 +23,7 @@
 #define __UNDO_H__
 
 #include <glib.h>
-#include <gtk/gtktextview.h>
-#include <gtk/gtkitemfactory.h>
+#include <gtk/gtk.h>
 
 typedef enum 
 {
index 019de10..d117672 100644 (file)
@@ -21,7 +21,7 @@
 #  include "config.h"
 #endif
 
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
 #include <glib.h>
 #include <glib/gi18n.h>
 #include <gdk/gdkkeysyms.h>
index bd9b86b..9a3c056 100644 (file)
 #include <glib.h>
 #include <glib/gi18n.h>
 #include <gdk/gdkkeysyms.h>
-#include <gtk/gtkwidget.h>
-#include <gtk/gtkvbox.h>
-#include <gtk/gtkbox.h>
-#include <gtk/gtktable.h>
-#include <gtk/gtkentry.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtknotebook.h>
-#include <gtk/gtktogglebutton.h>
-#include <gtk/gtkcheckbutton.h>
 #include <gtk/gtk.h>
 
 #include <stdio.h>
index 9526a0b..f824f7e 100644 (file)
@@ -23,7 +23,7 @@
 
 #include <glib.h>
 #include <gdk/gdk.h>
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
 
 #include "mainwindow.h"