+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
( 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
MICRO_VERSION=0
INTERFACE_AGE=0
BINARY_AGE=0
-EXTRA_VERSION=95
+EXTRA_VERSION=96
EXTRA_RELEASE=
EXTRA_GTK2_VERSION=
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=
#define __ACTION_H__
#include <glib.h>
-#include <gtk/gtkitemfactory.h>
+#include <gtk/gtk.h>
#include "mainwindow.h"
#include "messageview.h"
#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>
#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"
#define __ADDRESSBOOK_H__
#include <glib.h>
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
#include "compose.h"
#include "addritem.h"
#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"
#define __ADDRESSITEM_H__
#include <glib.h>
-#include <gtk/gtkwidget.h>
-#include <gtk/gtkctree.h>
+#include <gtk/gtk.h>
#include "compose.h"
#include "addrindex.h"
#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"
if (val == G_ALERTALTERNATE)
log_window_show(mainwin->logwin);
} else
- alertpanel_error(buf);
+ alertpanel_error("%s", buf);
}
static void alertpanel_show(void)
#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"
typedef struct _SSLClientCertHookData SSLClientCertHookData;
struct _SSLClientCertHookData
{
- void *account;
+ const void *account;
const gchar *cert_path;
const gchar *password;
gboolean is_smtp;
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':
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");
}
}
}
#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"
#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 {
#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"
#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"
#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"
#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"
#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"
#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"
#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"
#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"
#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>
#define __FOLDERSEL_H__
#include <glib.h>
-#include <gtk/gtkwindow.h>
+#include <gtk/gtk.h>
#include "folder.h"
#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>
#ifdef USE_GNOMEPRINT
-#include <gtk/gtktextview.h>
+#include <gtk/gtk.h>
void gedit_print (GtkTextView* view);
#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"
#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
#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"
#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
#define __COMBOBOX_H__
#include <glib.h>
-#include <gtk/gtkwidget.h>
-#include <gtk/gtkcombobox.h>
+#include <gtk/gtk.h>
enum {
COMBOBOX_TEXT,
/* 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");
}
#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
#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);
#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>
#ifdef USE_ASPELL
-#include <gtk/gtkoptionmenu.h>
+#include <gtk/gtk.h>
typedef struct _GtkAspell GtkAspell; /* Defined in gtkaspell.c */
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;
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;
#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),
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;
#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);
}
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);
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);
}
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);
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
* 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);
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 */
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);
}
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);
}
}
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);
}
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);
}
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
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:
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);
}
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;
{
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);
}
}
}
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);
}
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
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 =
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 =
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;
/* 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;
}
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;
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;
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;
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:
{
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)
{
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))
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);
}
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);
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))
{
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)
{
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;
}
} 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)
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;
{
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);
}
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);
}
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
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
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 *
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);
}
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);
}
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);
}
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);
}
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
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
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);
}
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);
}
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_)))
#include <gdk/gdk.h>
-#include <gtk/gtkbutton.h>
+#include <gtk/gtk.h>
G_BEGIN_DECLS
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",
/* 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;
#include <math.h>
#include <stdio.h>
#include <string.h>
-#include <gtk/gtkhruler.h>
+#include <gtk/gtk.h>
#include "gtkshruler.h"
#define RULER_HEIGHT 14
#include <gdk/gdk.h>
-#include <gtk/gtkhruler.h>
+#include <gtk/gtk.h>
#ifdef __cplusplus
#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;
#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
#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
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)
{
GdkInputFunction function;
GdkInputCondition condition;
- GdkDestroyNotify notify;
+ GDestroyNotify notify;
gpointer data;
};
#include <hildon-widgets/hildon-window.h>
#endif
#include "main.h"
-#include <gtk/gtkmain.h>
#endif
#include "gtkcmctree.h"
#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"
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,
#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
}
}
#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;
#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);
#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"
#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"
#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"
#define __LOGWINDOW_H__
#include <glib.h>
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
#include "log.h"
*/
#include <glib.h>
-#include <gtk/gtkwidget.h>
-#include <gtk/gtkwindow.h>
+#include <gtk/gtk.h>
#include "manage_window.h"
/* #include "utils.h" */
#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) \
{ \
#else
#include <hildon-widgets/hildon-program.h>
#endif
-#include <gtk/gtkmain.h>
#endif
#if 0 /* FIXME */
#include <glib/gi18n.h>
#include <string.h>
#include <gtk/gtk.h>
-#include <gtk/gtktext.h>
#include <gdk/gdkkeysyms.h>
#include "utils.h"
#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"
#define __PROGRESS_H__
#include <glib.h>
-#include <gtk/gtkwidget.h>
-#include <gtk/gtkliststore.h>
+#include <gtk/gtk.h>
typedef struct _ProgressDialog ProgressDialog;
#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>
#define __HEADERVIEW_H__
#include <glib.h>
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
typedef struct _HeaderView HeaderView;
#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"
#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"
#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"
#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"
#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"
#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>
#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>
#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>
#define __MAIN_H__
#include <glib.h>
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
#ifdef MAEMO
#ifdef CHINOOK
#include <hildon/hildon-program.h>
#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>
#endif
#include <glib.h>
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
typedef struct _MessageView MessageView;
#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>
#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"
#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 */
#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"
#include <time.h>
#include <glib.h>
#include <glib/gi18n.h>
-#include <gtk/gtkversion.h>
+#include <gtk/gtk.h>
#include <string.h>
#include "eggtrayicon.h"
#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
#include <gtk/gtk.h>
-#include <gtk/gtkprivate.h>
#include <gdk/gdkkeysyms.h>
#include <gdk/gdkx.h>
#include <gtk/gtk.h>
#include "gtkplugxembed.h"
-#include <gtk/gtkprivate.h>
#include <gdk/gdkkeysyms.h>
#include <gdk/gdkx.h>
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);
plug->grabbed_keys = NULL;
}
- GTK_OBJECT_CLASS (parent_class)->finalize (object);
+ G_OBJECT_CLASS (parent_class)->finalize (object);
}
static void
#include <gdk/gdk.h>
-#include <gtk/gtksocket.h>
-#include <gtk/gtkwindow.h>
+#include <gtk/gtk.h>
#ifdef __cplusplus
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);
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;
}
#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>
#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"
#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;
#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"
#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>
#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>
#include <stddef.h>
#include <glib.h>
#include <glib/gi18n.h>
-#include <gtk/gtkstatusbar.h>
+#include <gtk/gtk.h>
#include "inputdialog.h"
#include "alertpanel.h"
#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>
#define __SOURCEWINDOW_H__
#include <glib.h>
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
#include "procmsg.h"
#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>
#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"
#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,
#include "defs.h"
#include <glib.h>
-#include <gtk/gtkwidget.h>
-#include <gtk/gtkimage.h>
+#include <gtk/gtk.h>
#include <string.h>
#include <dirent.h>
#define __STOCK_PIXMAP_H__
#include <glib.h>
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
typedef enum
{
#include <glib.h>
#include <glib/gi18n.h>
#include <gdk/gdkkeysyms.h>
-#include <gtk/gtkscrolledwindow.h>
#include <gtk/gtk.h>
#include <stdio.h>
#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>
#endif
#include <glib.h>
-#include <gtk/gtkwidget.h>
-#include <gtk/gtktextiter.h>
+#include <gtk/gtk.h>
typedef struct _TextView TextView;
typedef struct _ClickableText ClickableText;
#define __UNDO_H__
#include <glib.h>
-#include <gtk/gtktextview.h>
-#include <gtk/gtkitemfactory.h>
+#include <gtk/gtk.h>
typedef enum
{
# include "config.h"
#endif
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
#include <glib.h>
#include <glib/gi18n.h>
#include <gdk/gdkkeysyms.h>
#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>
#include <glib.h>
#include <gdk/gdk.h>
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
#include "mainwindow.h"