From: Paul Mangan Date: Sat, 13 Oct 2007 05:31:36 +0000 (+0000) Subject: 2007-10-13 [paul] 3.0.2cvs66 X-Git-Tag: rel_3_1_0~87 X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=84d35ad06c90db6b42a5083b9d25516b6f991f90;hp=3d1cc116cd899a7e988f42c99299835315345b13 2007-10-13 [paul] 3.0.2cvs66 * src/main.c * src/main.h * src/gtk/gtkutils.c * src/gtk/gtkutils.h fix a bunch of compiler warnings on maemo --- diff --git a/ChangeLog b/ChangeLog index 81e9c0b00..9d025e3cd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2007-10-13 [paul] 3.0.2cvs66 + + * src/main.c + * src/main.h + * src/gtk/gtkutils.c + * src/gtk/gtkutils.h + fix a bunch of compiler warnings on maemo + 2007-10-12 [colin] 3.0.2cvs65 * src/account.c diff --git a/PATCHSETS b/PATCHSETS index d5d12003c..e67ea9eab 100644 --- a/PATCHSETS +++ b/PATCHSETS @@ -2978,3 +2978,4 @@ ( cvs diff -u -r 1.14.2.40 -r 1.14.2.41 src/editaddress.c; ) > 3.0.2cvs63.patchset ( cvs diff -u -r 1.61.2.72 -r 1.61.2.73 src/account.c; cvs diff -u -r 1.207.2.186 -r 1.207.2.187 src/folderview.c; cvs diff -u -r 1.115.2.169 -r 1.115.2.170 src/main.c; cvs diff -u -r 1.274.2.215 -r 1.274.2.216 src/mainwindow.c; cvs diff -u -r 1.94.2.160 -r 1.94.2.161 src/messageview.c; cvs diff -u -r 1.15.2.52 -r 1.15.2.53 src/summary_search.c; cvs diff -u -r 1.395.2.330 -r 1.395.2.331 src/summaryview.c; cvs diff -u -r 1.43.2.88 -r 1.43.2.89 src/toolbar.c; cvs diff -u -r 1.1.2.61 -r 1.1.2.62 src/wizard.c; cvs diff -u -r 1.36.2.117 -r 1.36.2.118 src/common/utils.c; cvs diff -u -r 1.12.2.43 -r 1.12.2.44 src/gtk/prefswindow.c; ) > 3.0.2cvs64.patchset ( cvs diff -u -r 1.61.2.73 -r 1.61.2.74 src/account.c; cvs diff -u -r 1.13.2.15 -r 1.13.2.16 src/addritem.c; cvs diff -u -r 1.12.2.13 -r 1.12.2.14 src/addritem.h; cvs diff -u -r 1.60.2.38 -r 1.60.2.39 src/filtering.c; cvs diff -u -r 1.21.2.14 -r 1.21.2.15 src/filtering.h; cvs diff -u -r 1.213.2.165 -r 1.213.2.166 src/folder.c; cvs diff -u -r 1.87.2.49 -r 1.87.2.50 src/folder.h; cvs diff -u -r 1.36.2.118 -r 1.36.2.119 src/common/utils.c; cvs diff -u -r 1.20.2.52 -r 1.20.2.53 src/common/utils.h; ) > 3.0.2cvs65.patchset +( cvs diff -u -r 1.115.2.170 -r 1.115.2.171 src/main.c; cvs diff -u -r 1.7.2.12 -r 1.7.2.13 src/main.h; cvs diff -u -r 1.5.2.67 -r 1.5.2.68 src/gtk/gtkutils.c; cvs diff -u -r 1.4.2.36 -r 1.4.2.37 src/gtk/gtkutils.h; ) > 3.0.2cvs66.patchset diff --git a/configure.ac b/configure.ac index bbb3683d7..423f71518 100644 --- a/configure.ac +++ b/configure.ac @@ -11,7 +11,7 @@ MINOR_VERSION=0 MICRO_VERSION=2 INTERFACE_AGE=0 BINARY_AGE=0 -EXTRA_VERSION=65 +EXTRA_VERSION=66 EXTRA_RELEASE= EXTRA_GTK2_VERSION= diff --git a/src/gtk/gtkutils.c b/src/gtk/gtkutils.c index 2e5e3f7b0..a86950c5b 100644 --- a/src/gtk/gtkutils.c +++ b/src/gtk/gtkutils.c @@ -1642,24 +1642,18 @@ gboolean gtkut_tree_model_get_iter_last(GtkTreeModel *model, return gtk_tree_model_iter_nth_child(model, iter, NULL, count - 1); } -#ifdef MAEMO -HildonWindow *gtkut_window_new (GtkWindowType type, - const gchar *class) -{ - HildonWindow *window = HILDON_WINDOW(hildon_window_new()); - gtk_window_set_role(GTK_WINDOW(window), class); - hildon_program_add_window(hildon_program(), window); - return window; -} -#else GtkWidget *gtkut_window_new (GtkWindowType type, const gchar *class) { +#ifndef MAEMO GtkWidget *window = gtk_window_new(type); +#else + GtkWidget *window = hildon_window_new(); + hildon_program_add_window(hildon_program, HILDON_WINDOW(window)); +#endif gtk_window_set_role(GTK_WINDOW(window), class); return window; } -#endif gboolean gtkut_tree_iter_comp(GtkTreeModel *model, GtkTreeIter *iter1, diff --git a/src/gtk/gtkutils.h b/src/gtk/gtkutils.h index 14b9f5f75..4a810e655 100644 --- a/src/gtk/gtkutils.h +++ b/src/gtk/gtkutils.h @@ -42,6 +42,8 @@ #ifdef MAEMO #include +#include +#include "main.h" #include #endif @@ -190,13 +192,9 @@ GtkWidget *label_window_create(const gchar *str); void label_window_destroy(GtkWidget *widget); void gtkut_window_popup (GtkWidget *window); -#ifdef MAEMO -HildonWindow *gtkut_window_new (GtkWindowType type, - const gchar *class); -#else GtkWidget *gtkut_window_new (GtkWindowType type, const gchar *class); -#endif + void gtkut_widget_get_uposition (GtkWidget *widget, gint *px, diff --git a/src/main.c b/src/main.c index 5459f794d..cc69d1424 100644 --- a/src/main.c +++ b/src/main.c @@ -213,7 +213,6 @@ static void exit_claws (MainWindow *mainwin); static MainWindow *static_mainwindow; #ifdef MAEMO -static HildonProgram *static_hildonprogram; static osso_context_t *static_osso_context; void exit_event_handler(gboolean die_now, gpointer data) @@ -859,7 +858,7 @@ int main(int argc, char *argv[]) if (osso_context == NULL) { return OSSO_ERROR; } - static_hildonprogram = HILDON_PROGRAM(hildon_program_get_instance()); + hildon_program = HILDON_PROGRAM(hildon_program_get_instance()); static_osso_context = osso_context; #endif gdk_rgb_init(); @@ -1049,8 +1048,8 @@ int main(int argc, char *argv[]) #ifdef MAEMO AppData *appdata; appdata = g_new0(AppData, 1); - appdata->program = static_hildonprogram; - appdata->window = mainwin->window; + appdata->program = hildon_program; + appdata->window = HILDON_WINDOW(mainwin->window); appdata->osso_context = osso_context; result = osso_rpc_set_cb_f(appdata->osso_context, OSSO_SERVICE, @@ -2092,10 +2091,6 @@ static void install_basic_sighandlers() } #ifdef MAEMO -HildonProgram *hildon_program(void) -{ - return static_hildonprogram; -} osso_context_t *get_osso_context(void) { return static_osso_context; diff --git a/src/main.h b/src/main.h index 0ee51a23c..ae9caab1e 100644 --- a/src/main.h +++ b/src/main.h @@ -25,6 +25,13 @@ extern gchar *prog_version; extern gboolean debug_mode; +#ifdef MAEMO +#include +#include + +HildonProgram *hildon_program; +#endif + void app_will_exit (GtkWidget *widget, gpointer data); gboolean clean_quit (gpointer data);