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 a25baf38204672bcd8c76e257028295285c78ef1..d0f203f92d1fd99c36a7d9ad27279ff5943ba712 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 7ded79ae951ce95411767b1a2043e9c7d942e0db..5273deca02ae4df17a44a099d6759e101ac41450 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 63a7fd10ede5240f5b5b985e1b5f1265f21147ed..1f987c765680f793e01c75e41a9ed4deba4cf13e 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 986a50fbe1463f8df098c9ad5b47ca2e819e98de..f6f80b2185df86ba8119a28dea4c36cf6315bc97 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 63f00e8f02ae2f87c600590cb625437ea33bf416..f0e1a0fc2c3b68347d24534c0f649361b2eba9ea 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 117591d5b716c520cb6922ab4cfc0bae7fe7cb28..700f17c1199c2d5f9346a17d37b91254973f11d7 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 e408ea834cc01ea42436515372b6e98cf9fc6e87..f3621dff18bbad37d670fdff9186c9082b02bf70 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 d1bd6ff8ebe3a7d6a1fddca11c79c1dca7a56078..00944f6e84d8a06cea9b4a935bcda89292dd8be9 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 ba286e26d35cfd5c72c392e3985ab8c330ac8bf7..378c566b255dc8d9c5c8260a947eaae780d95ea6 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 030df12e4d409f103327cca31196c5224ecffaea..92207d920ab66395baa909930bd4bbffd02feab5 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 2e463e78c4b3e3f56edc223d3524648e415133b0..5f3f154da82a75b2e5ee401ca10fd84bee731ec4 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 abc84ac4b4a3305b8333936f32a657504d1c4b7b..46b2c03137c41100af5740530bf29c90a2fb0a03 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 9d494a5cb08a2821f3ca8aabe73e6484cba75c15..4dbb1f239b8f1ba079890cb3b293e4c3f876025e 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 ed83c91ec66e1092a8af312588ba869d8663e4c9..609b644bea22d69baca7658aace0bd4ac9b2d738 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 7e44f29f479ff76d9e57dea7745501e5cf12d299..697c734d362b134b67eedfc5c04d6584b85bcdd4 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 ed29b85efad85150410352bcb9cdc475e20d641d..56829f884d079df98b87cbbb912bcacc519be06c 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 5d88da4940a90f487be443ac8b735e5f10555de3..e0954de5d4de723048deb970df281128f78a988d 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 f3beb507cbb45c7a4b8efd05e5ab472cad50d41b..69ca05fe88acb99ecacb5d70909c903108562024 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 c3178da5b0f9b1eb36f1461b093d3036b62845d1..5c562bdac03f4401078b08e6428c725c2ce82125 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 9bc8db80d0931c3bd934d96834d41a63ff9b4223..40c584fb2523c887e7786b2bb662e655fbf73e78 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 5f39ba0536354b040a1a30b85fbae5afbad31a57..ce10d29ad6a135b7f08eee758a26388e5c325b7a 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 8a7830c4a32f86db7d86dc0a608be7e8bd63a684..d88f7b159f8c8d72808716ef276404b21f43c593 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 a6755381e413fcd54df3b0cec428da7b055a9eef..1345d46c1266f605632fb6f14baffc061850a852 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 0f8a774ce83852c2855d775f1c3a1b3422f8a55a..5a200bdb9a8064634aa2469477399f69d4a147d3 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 2c1825b160fdc4ce1221a68dfc7e717f1aa5248c..c3d2985e1a19e99efff84db1fdea5910d2b255a3 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 fa775a05fab2fac7ea5842267577c9865db25287..e5a931f8f2c4156e83ddd44b23bc84a6e439a23d 100644 (file)
@@ -21,7 +21,7 @@
 #define __FOLDERSEL_H__
 
 #include <glib.h>
-#include <gtk/gtkwindow.h>
+#include <gtk/gtk.h>
 
 #include "folder.h"
 
index 9a683ff6cf238df1c1554adf00938fbba3c679c2..4592fd25a5e3b91a1eb094d0e911c38eb9cfa741 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 a457d822c7b61687b34d116be5e43adf5b26e5e9..dcc305b9e57fcd2733288cce0d03b49abd7b7de1 100644 (file)
@@ -33,7 +33,7 @@
 
 #ifdef USE_GNOMEPRINT
 
-#include <gtk/gtktextview.h>
+#include <gtk/gtk.h>
 
 void gedit_print               (GtkTextView* view);
 
index 66c8e2b533e82380bb03dd0ee19b9874d80e57b3..62f152d87a37ee1bb47d9b70df884014d7b33966 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 501bef7fb4b807e7a9a7d1260849cb40cf4f501d..cce0b6f51e5ecae710bfcfa46d14373c11b77938 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 df6ec8a405c040d8904b3e7ecaa744eb0dc4e386..2543d2c6fb50e7e699f509c526bbc48bf69d8b2c 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 04d5f8d4620121066de10e0a7d30e272dc33fb58..aabdda9853820989ab7c5d84563c531b7a046ec7 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 ca6faf809650775a8b809089ac28a2423dd09e62..0c85e45869ad97bf51a0a56854b5c28124ced960 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 20096034fc635fc5eed23f78e3a62eb358aec6fc..9e8dc62139837745ab7caa36dc90dd87f3f168ad 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 f50effac14c03c0b901557d43d4b7e64a210702a..9ad0f48474ba620529ff7283dc46041f053947b3 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 a25d7a27b3172fa873121e204aa959e4bd9e12e7..566d9f67f21fe84fe8e16aabafee0831e1ca09ba 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 6ce7e48e1f721d4bacdabea2b101b1e1362fca00..20dce2607e3f2b65133a7d75d669ca422eab9c7f 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 6139717b4f7695f7498b115cd768fb12cf90695e..498ae8490e735bfed968bb6ce36d9de8cc596213 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 8cdf4fab0226f1f4a40aeb7041ac3f07d4ffa082..fe1eb5f0963b3990c44910fdd5e0fa1e87ded857 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 48cd6083436d16368d3ce0d22ec1c0d32351b1fb..8f0b71c802afc2a7922993cbb66a466750038a74 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 c1fe8c4f1324480dd8df38000f2e2f8f79b975b3..4e4b0b60a7ea1daa0e948b5c10dc38a33e37f940 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 6824fcb5874c65ae7fe2ed79546900ab8419f0ca..5a7afc0558c140d239e224ac752109d90722d8e0 100644 (file)
@@ -29,7 +29,7 @@
 
 
 #include <gdk/gdk.h>
-#include <gtk/gtkbutton.h>
+#include <gtk/gtk.h>
 
 
 G_BEGIN_DECLS
index 4d331da12c744c77d955e3ba3dfa6c88f5df429c..84d65e19df59a16c066358e38dba6c6736c4ffad 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 73e52b1ae879e19fe3bb79e82e80454e18f3a752..8727b5d27ff93c71bbc0a84c0a0f94b88c90bbea 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 41839e6e92669abf7123cea38abd9d5262d82145..a4860d08d2d446264349276705e60da4fa1bfcd7 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 e0eff7057208cfa250fba2671999c8623322be9b..81428004358ed8ee74eed41cf29c955ed45d033f 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 054e0fd98b860b25ab41aaeb16507e5936e5c5ed..e36ef728d3b34ecc8a22edf2ebf76475b68a93d4 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 5a8ad44be1ad45f1f80083e377f0ffd212302e44..b000a64e97d5747c3055f21519f56759a0c6210a 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 fb4f1a58d21ece2b93be0196a4c51c9614468a83..0714a65144f0f51e0ca58bec2a5f738e1973b67e 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 90fb375c5d2437b869a76dbe515db535348a1dd8..d245fd1970964c0ee9dd8902bc12055b0347d8c4 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 7fba338d175abe9053218d13315a558e32698c26..4a3cb5438f4328783a476d247bcf8f823d0f9ff0 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 f14a99c634fa60c2b7667ebf5647f3fe2841f03d..7661d77e7628e1aa947493af0c7e6df2bec6f2f5 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 f42337755e8ab63bd9087b419009d0a2613defac..706ea37e1f15ce9ee07504ea50ad8e70d84d6cf1 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 fa0b9df8fe5a69923c5c7e8e4c1ba37a05f99a04..b4e4e2ff1741c758cf010f0552679196d2e95579 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 979e801a422c9e294d514b12242f1e3de7fb8115..fb0becb001092acad4367bcf5ca5051880eef95c 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 c2c71f217c6beb29c0d884402d56a4401dfb7ea8..e08dd767bd6924b978a658865e4db87ee6198ca7 100644 (file)
@@ -21,7 +21,7 @@
 #define __LOGWINDOW_H__
 
 #include <glib.h>
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
 
 #include "log.h"
 
index c2cb91ab3a6d05fffb1f85208622dc820641ed25..9dbec4ad54b56dbd7e3d752b023b236ef2f4a2ba 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 bc5e399a63822160d0b1ff5a38760cd21c78f60e..b924ec159b94e295912947535c4c99c788113aee 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 a5bf937aac7a2a585d73ea561514b6302dbd5dff..beed8e78b45e8efcb3523864f7679f8494ad140b 100644 (file)
@@ -36,7 +36,6 @@
 #else
 #include <hildon-widgets/hildon-program.h>
 #endif
-#include <gtk/gtkmain.h>
 #endif
 
 #if 0 /* FIXME */
index 4cb9162591da280810ea82074eaecdfb823c457d..46d956261e5529479a79b83b1a7e6c1ea0626f41 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 da7e0d2fee68cad3ee86d93e71acd99ad0a6a27e..d7a3e69f29d1f6ef7a691f41612b5f618db02fde 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 b4632c233276401dbc48c8cdd1bac6ecc58cc095..7fe9f41901365dedbc9567bf8a986a640e95c3fa 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 29454720c5a911b98da8d579aa67ee0b9e372e1e..4bcf09d8a75fdb4beab0fa77747a2e0f2a0d14ab 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 8f663dfea383de2ce54fce1c8a6b4fd22df92a4b..b1d1b3d6e787b283747c2273a188eea9091d9ccc 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 e78295ec2664a5d2ce53d52f65c3fd58df86636b..b6150799f6f5a3fa44c2487cbc0bda5e2956bb3b 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 43cd56c82c9440caabb9cf0e98df3a79e0b9805a..5d5a1cce97337caec3283bfce748935cc3c645f7 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 2ed95d4e1f2aa68f307989e2cf10b1852fba2b0a..e06364ebcab70bb5d843d5066d04a8e319611e10 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 e1d638b8cc586902faaff3ba222e4b5f3551ec4d..9ef60d6a2fe9bffc6d4e5581ea887c382c24c8ba 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 446cdbaa8c13e5d8ebbfe251de348248a46c3dad..493fbd741898826b8d9a472b33fa323c8aa47e59 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 450e557d59a262f618d4f5ff01af902635b4acde..a355fa75b876b6e68fe9368275a41cfd57db2698 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 1f10d677f0d23bafd69dc191ec35252fa010ac83..4685bdd96cfa4d20f27f135d4bf3423746e640f0 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 4e9526e19d84032bd167fa7ad4d5f641b1e26912..0616eefdef6459aaff98a56bb0f1e716ef0e0f78 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 55d2a4fbb968b755d985c3bbc42e04bcda85f786..8c63e3294bc1a69a7afa4e0482404ddf3bc7bf4c 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 96e31a7ec692d522cf62f8454678d49ccf80c993..3bad00fca868b1716ddf79c20785832773cebbcb 100644 (file)
@@ -25,7 +25,7 @@
 #endif
 
 #include <glib.h>
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
 
 typedef struct _MessageView    MessageView;
 
index bacaff1010b43ae23fb671849d37b876bae03a65..4df1096fcc5be808a64243280e535985b0311743 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 ae6d53ed8bab70fab6427fd7432d682d0298af25..6243718597e0b598b756349f001e9d2a40eaaa27 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 5778f10d5324f6dc49c9d7a517cb40668546d86c..5498487074a4b8589c59a1f5abdad11d39f6dcdd 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 fead4d848b41e385afee670f023f8adb02469435..6b57fd9c9338bfc7b22e40c331bdce6034801089 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 2e93f65da045d1f58ea88d2d48910507b311ab64..01376fbd3aac17a670cc055d61eab54554a14f6a 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 f61f24b37782e2fa85cd01c9753619332355c8b6..2903accc765e65314d6b793fcedb22f12a6a9ab6 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 c9479947a69441a99a09a06d63ad8f967e92165d..3514f5dc84d51e8f439c5a8ca3bb1445c307c935 100644 (file)
@@ -1,5 +1,4 @@
 #include <gtk/gtk.h>
-#include <gtk/gtkprivate.h>
 
 #include <gdk/gdkkeysyms.h>
 #include <gdk/gdkx.h>
index 8d3b5da73f362a78007e798fa0962ef67c5c154a..3ec2af76f39edd2503cec5d288a751df1449a06f 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 b5258f7ddca89c3d8c7209d8d7dbb8570b79a620..8640aacf4017f35033db6ad3246c17d54ede575b 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 ae7464fb40f281cb05ba2bbaadb76040237e7f44..3a2214734fe6eced70184b11b547703c8e479032 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 c5fd7bddf0ada0876d1ce8d5227c2da5cdb0512b..1f6ab7f0c4faae4defe72bdd9028ed7e6345ffe2 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 bf95b4ce3586e202c2a3e99e926b1dd33549067c..44991f80c3b6cce1ef6b51d2bc6eeb419a3e82e3 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 0390567bbc15e7ee43e4e1f7850bad470a95f6e7..1bb841e7aef81275f26a7c8abaea40a55a74d411 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 351f7a8abd767542d8e31795cb11fb9dc5d90447..b60149667245417c7ed82228685e18e4d2795e2d 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 f47fcd28f8fb13ebfa072a86d7259710e592fc8e..43de2b385aeb7f294f6187033ab171fb48ef4dce 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 dc8bb9fe9256dee5e4c9bcd6b2a57c988cda0e9e..4ac0beb3098316ac3e84ab53b0ce313163ae2ad7 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 ded4b6ea05dbefe4ddf64f98f3998c47d54f27bd..14977d0cd51a09a9cb14e859182faf7d453d6b56 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 87f23bd7ce9d26d89e56e2a552818c63f8027000..b08a7c5852f8e8e6a9e95636a14f4197d1a3a06b 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 ecf0041f07cba6c2c5c62f9ca7d7909a3771fcfb..804dac94d0de464077564d1ab40bbbb378bc4eae 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 3fbe3440aae833969c6d2b60bb72a3c7f3aaf75a..a06c06d0f4fd13974a2503fc7fc9c775725e8789 100644 (file)
@@ -21,7 +21,7 @@
 #define __SOURCEWINDOW_H__
 
 #include <glib.h>
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
 
 #include "procmsg.h"
 
index b44256f30c693430b42ee484cf73c5ed63e041b8..7856d0c3e3996fa946977ff2a12fe290f670692f 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 5014a0e672d5bdbacb8f6086d85e65719953c536..011f818ef6c2b2769d48f24b20f466a914c94bee 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 36271475e9cc10feba5784f471ddc58fdac5d294..95a976318bc839b046a058493510ecb74c769af8 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 69af4606fa6cceb51bc581188df9d64a49da2e61..94bda0203c629d7894fe0353034eda393a08fc86 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 c74c517070a430dedb8a721dc423de21a1dbbca0..028f8b09e551c7f0d424f0a6fc8c3d5109a028a6 100644 (file)
@@ -21,7 +21,7 @@
 #define __STOCK_PIXMAP_H__
 
 #include <glib.h>
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
 
 typedef enum
 {
index c3f6265f937b794ba5a9c25b7512d643b695bb25..ef3ea17d186e86a1b0798bdf93b989c26b2aae62 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 7c0ea89f6c35dd33818b5ef05d9019b3021b1913..fc3657e357898899f2a9c9a6552f8364bcf7c274 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 3c5e15d77d81c3fe0b65bb4c088692345a16d48f..fb06b20881dde8047976a8fe57c61bb1650f1d8e 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 76cf3ed16098a1d412ebaf591d41a9a65a785e2f..f0c3221071387ed14974e2ec244a9fe1f93813ea 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 019de10af8555427845a5c4db4bbacbe62fa95fa..d117672aac7df8a748578208db1d3b1d1d9f24a6 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 bd9b86bb24ccf5f4002c02252484dc7785805019..9a3c056a459a5b6ab9130ffbcedd145ce3accc49 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 9526a0bca3e6ae2318923f162aadc8543de650f0..f824f7e0f638d457b93c6f3b7e1e84c0db3f5d3e 100644 (file)
@@ -23,7 +23,7 @@
 
 #include <glib.h>
 #include <gdk/gdk.h>
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
 
 #include "mainwindow.h"