From 6b2a9a4628f69588c73883163ff00ad50d551ab2 Mon Sep 17 00:00:00 2001 From: Colin Leroy Date: Sat, 13 Oct 2007 08:28:20 +0000 Subject: [PATCH] 2007-10-13 [colin] 3.0.2cvs68 * src/main.c * src/main.h Maemo: define hildon_program in main.c, make it accessible in the .h with extern --- ChangeLog | 7 +++++++ PATCHSETS | 1 + configure.ac | 2 +- src/main.c | 4 ++++ src/main.h | 11 ++++++----- 5 files changed, 19 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index a4ec7f46a..95423109f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2007-10-13 [colin] 3.0.2cvs68 + + * src/main.c + * src/main.h + Maemo: define hildon_program in main.c, + make it accessible in the .h with extern + 2007-10-13 [paul] 3.0.2cvs67 * src/gtk/menu.c diff --git a/PATCHSETS b/PATCHSETS index f7a708cc4..6bbc98ead 100644 --- a/PATCHSETS +++ b/PATCHSETS @@ -2980,3 +2980,4 @@ ( 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 ( cvs diff -u -r 1.5.2.24 -r 1.5.2.25 src/gtk/menu.c; ) > 3.0.2cvs67.patchset +( cvs diff -u -r 1.115.2.171 -r 1.115.2.172 src/main.c; cvs diff -u -r 1.7.2.13 -r 1.7.2.14 src/main.h; ) > 3.0.2cvs68.patchset diff --git a/configure.ac b/configure.ac index d18561dba..daab14fa8 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=67 +EXTRA_VERSION=68 EXTRA_RELEASE= EXTRA_GTK2_VERSION= diff --git a/src/main.c b/src/main.c index cc69d1424..e6426370d 100644 --- a/src/main.c +++ b/src/main.c @@ -142,6 +142,10 @@ static GnomeVFSVolumeMonitor *volmon; gchar *prog_version; gchar *argv0; +#ifdef MAEMO +HildonProgram *hildon_program; +#endif + #ifdef HAVE_STARTUP_NOTIFICATION static SnLauncheeContext *sn_context = NULL; static SnDisplay *sn_display = NULL; diff --git a/src/main.h b/src/main.h index ae9caab1e..a23bf910f 100644 --- a/src/main.h +++ b/src/main.h @@ -22,16 +22,17 @@ #include #include - -extern gchar *prog_version; -extern gboolean debug_mode; #ifdef MAEMO #include #include - -HildonProgram *hildon_program; #endif +extern gchar *prog_version; +extern gboolean debug_mode; + +#ifdef MAEMO +extern HildonProgram *hildon_program; +#endif void app_will_exit (GtkWidget *widget, gpointer data); gboolean clean_quit (gpointer data); -- 2.25.1