From cfe9cc011396bf3cea0eda49faffbbc39795c368 Mon Sep 17 00:00:00 2001 From: Vlad Date: Wed, 4 Aug 2010 14:46:52 +0300 Subject: [PATCH] fixed all gcc warnings --- applet/configure.ac | 6 ++--- applet/src/Makefile.am | 12 +++++----- applet/src/livewp-config.c | 1 - applet/src/livewp-control-widget.h | 1 + applet/src/livewp-dbus.h | 6 ++--- applet/src/livewp-home-widget.c | 43 ++++++------------------------------ applet/src/livewp-home-widget.h | 1 + applet/src/livewp-main.c | 3 +++ applet/src/livewp-scene.c | 16 +++++--------- applet/src/livewp-scene.h | 3 ++- 10 files changed, 32 insertions(+), 60 deletions(-) diff --git a/applet/configure.ac b/applet/configure.ac index 7a120ba..1c2b470 100644 --- a/applet/configure.ac +++ b/applet/configure.ac @@ -12,9 +12,9 @@ AC_HEADER_STDC AC_PROG_INSTALL AM_PROG_LIBTOOL -PKG_CHECK_MODULES(EXAMPLE, hildon-1 libhildondesktop-1 hildon-fm-2 gtk+-2.0 gstreamer-0.10) -AC_SUBST(EXAMPLE_CFLAGS) -AC_SUBST(EXAMPLE_LIBS) +PKG_CHECK_MODULES(MAEMO, hildon-1 libhildondesktop-1 hildon-fm-2 gtk+-2.0 gstreamer-0.10) +AC_SUBST(MAEMO_CFLAGS) +AC_SUBST(MAEMO_LIBS) PKG_CHECK_MODULES(OSSO, [libosso >= 1]) AC_SUBST(OSSO_LIBS) diff --git a/applet/src/Makefile.am b/applet/src/Makefile.am index c20492a..6d37264 100644 --- a/applet/src/Makefile.am +++ b/applet/src/Makefile.am @@ -12,9 +12,9 @@ SOURCE_FILES = livewp-main.c \ bin_PROGRAMS = livewp livewp_SOURCES = $(SOURCE_FILES) # -livewp_CFLAGS = -Wall $(EXAMPLE_CFLAGS) $(OSSO_CFLAGS) $(SQLITE_CFLAGS) -DAPPLICATION +livewp_CFLAGS = -Wall $(MAEMO_CFLAGS) $(OSSO_CFLAGS) $(SQLITE_CFLAGS) -DAPPLICATION # -livewp_LDADD = $(EXAMPLE_LIBS) $(OSSO_LIBS) $(SQLITE_LIBS) -lgstinterfaces-0.10 +livewp_LDADD = $(MAEMO_LIBS) $(OSSO_LIBS) $(SQLITE_LIBS) -lgstinterfaces-0.10 # We invent desktoplib_LTLIBRARIES instead of the normal lib_LTLIBRARIES, # so we can specify the non-standard installation directory. @@ -29,9 +29,9 @@ liblivewp_home_widget_la_SOURCES = livewp-home-widget.c livewp-home-widget.h \ livewp-dbus.c livewp-dbus.h \ livewp-actor.c livewp-actor.h \ livewp-scene.c livewp-scene.h -liblivewp_home_widget_la_LIBADD = $(EXAMPLE_LIBS) $(OSSO_LIBS) $(SQLITE_LIBS) +liblivewp_home_widget_la_LIBADD = $(MAEMO_LIBS) $(OSSO_LIBS) $(SQLITE_LIBS) -AM_CFLAGS = -Wall $(EXAMPLE_CFLAGS) $(OSSO_CFLAGS) $(SQLITE_CFLAGS) +AM_CFLAGS = -Wall $(MAEMO_CFLAGS) $(OSSO_CFLAGS) $(SQLITE_CFLAGS) panellib_LTLIBRARIES = liblivewp-panel-widget.la panellibdir = $(HILDON_PANEL_LIB_DIR) @@ -40,8 +40,8 @@ liblivewp_panel_widget_la_SOURCES = livewp-settings.c livewp-settings.h livewp-c livewp-config.c livewp-config.h \ livewp-control-widget.c livewp-control-widget.h \ livewp-dbus.c livewp-dbus.h -liblivewp_panel_widget_la_LIBADD = $(EXAMPLE_LIBS) $(OSSO_LIBS) $(CONTROLPANEL_LIBS) +liblivewp_panel_widget_la_LIBADD = $(MAEMO_LIBS) $(OSSO_LIBS) $(CONTROLPANEL_LIBS) -liblivewp_panel_widget_la_CFLAGS = -Wall $(EXAMPLE_CFLAGS) $(OSSO_CFLAGS) $(CONTROLPANEL_CFLAGS) -DCONTROLPANEL +liblivewp_panel_widget_la_CFLAGS = -Wall $(MAEMO_CFLAGS) $(OSSO_CFLAGS) $(CONTROLPANEL_CFLAGS) -DCONTROLPANEL diff --git a/applet/src/livewp-config.c b/applet/src/livewp-config.c index 96dda24..0487672 100644 --- a/applet/src/livewp-config.c +++ b/applet/src/livewp-config.c @@ -27,7 +27,6 @@ gint current_active_view(void){ GConfClient *gconf_client = NULL; - GConfValue *value = NULL; gint result = -1; gconf_client = gconf_client_get_default(); diff --git a/applet/src/livewp-control-widget.h b/applet/src/livewp-control-widget.h index 288fe6c..39fac87 100644 --- a/applet/src/livewp-control-widget.h +++ b/applet/src/livewp-control-widget.h @@ -26,3 +26,4 @@ void lw_settings(Animation_WallpaperPrivate *priv, gpointer data); gint read_config(Animation_WallpaperPrivate *priv); void livewp_initialize_dbus(Animation_WallpaperPrivate *priv); +void lw_main_settings(Animation_WallpaperPrivate *priv, gpointer data); diff --git a/applet/src/livewp-dbus.h b/applet/src/livewp-dbus.h index e1ccd05..7fafbe2 100644 --- a/applet/src/livewp-dbus.h +++ b/applet/src/livewp-dbus.h @@ -31,11 +31,11 @@ /*******************************************************************************/ void livewp_initialize_dbus(Animation_WallpaperPrivate *priv); void livewp_deinitialize_dbus(Animation_WallpaperPrivate *priv); -DBusHandlerResult -get_livewp_signal_cb(DBusConnection *conn, DBusMessage *msg, Animation_WallpaperPrivate *priv); - +DBusHandlerResult get_livewp_signal_cb(DBusConnection *conn, DBusMessage *msg, Animation_WallpaperPrivate *priv); void send_dbus_signal (Animation_WallpaperPrivate *priv, const gchar *interface, const gchar *path, const gchar *member); gint read_config(Animation_WallpaperPrivate *priv); void reload_scene(AWallpaperPlugin *desktop_plugin); +void quit_from_program (Animation_WallpaperPrivate *priv); +void view_state_changed (Animation_WallpaperPrivate *priv); /*******************************************************************************/ #endif diff --git a/applet/src/livewp-home-widget.c b/applet/src/livewp-home-widget.c index 4f55a67..60f31c9 100644 --- a/applet/src/livewp-home-widget.c +++ b/applet/src/livewp-home-widget.c @@ -29,6 +29,8 @@ #include "livewp-scene.h" #include #include +#include +#include #define GCONF_KEY_POSITION "/apps/osso/hildon-desktop/applets/livewp-home-widget.desktop-%i/position" #define GCONF_KEY_MODIFIED "/apps/osso/hildon-desktop/applets/livewp-home-widget.desktop-%i/modified" @@ -44,7 +46,7 @@ lw_applet_realize (GtkWidget *widget) GdkScreen *screen; gchar * strid; gint id; - AWallpaperPlugin *desktop_plugin = widget; + AWallpaperPlugin *desktop_plugin = (AWallpaperPlugin *)widget; char* child_argv[] = {"/usr/bin/livewp", "0", (char *) 0 }; @@ -72,7 +74,7 @@ lw_applet_realize (GtkWidget *widget) fprintf(stderr,"Problem with new process"); } - desktop_plugin_visible_notify(widget, NULL, desktop_plugin); + desktop_plugin_visible_notify((GObject *)widget, NULL, desktop_plugin); #if 0 /* Load config */ @@ -90,30 +92,6 @@ lw_applet_realize (GtkWidget *widget) GTK_WIDGET_CLASS (animation_wallpaper_plugin_parent_class)->realize (widget); } - -static gboolean -lw_applet_expose_event(GtkWidget *widget, - GdkEventExpose *event) -{ - cairo_t *cr; - - /* Create cairo context */ - cr = gdk_cairo_create (GDK_DRAWABLE (widget->window)); - gdk_cairo_region (cr, event->region); - cairo_clip (cr); - - /* Draw alpha background */ - cairo_set_operator (cr, CAIRO_OPERATOR_SOURCE); - cairo_set_source_rgba (cr, 0.0, 0.0, 0.0, 0.0); - cairo_paint (cr); - - /* Free context */ - cairo_destroy (cr); - - return GTK_WIDGET_CLASS (animation_wallpaper_plugin_parent_class)->expose_event (widget, - event); -} - static gboolean expose_event (GtkWidget *widget,GdkEventExpose *event, gpointer data) @@ -520,9 +498,6 @@ send_alive_event(Animation_WallpaperPrivate *priv) static void animation_wallpaper_plugin_init (AWallpaperPlugin *desktop_plugin) { - GtkWidget *rich_animation; - gchar buffer[2048]; - gchar str[128]; //fprintf(stderr, "!!!!!!!plugin init \n"); Animation_WallpaperPrivate *priv = Animation_Wallpaper_HOME_PLUGIN_GET_PRIVATE (desktop_plugin); @@ -533,7 +508,7 @@ animation_wallpaper_plugin_init (AWallpaperPlugin *desktop_plugin) livewp_initialize_dbus(priv); priv->desktop_plugin = desktop_plugin; - priv->window = desktop_plugin; + priv->window = (GtkWidget *)desktop_plugin; priv->visible = FALSE; priv->short_timer = 0; priv->xapplet = 0; @@ -621,11 +596,8 @@ fprintf(stderr,"lw_applet_finalize\n"); static void desktop_widget_finalize (GObject *object) { - AWallpaperPlugin *desktop_plugin = Animation_Wallpaper_HOME_PLUGIN (object); - Animation_WallpaperPrivate *priv = desktop_plugin->priv; - - /* Call the base class's implementation: */ - G_OBJECT_CLASS (animation_wallpaper_plugin_parent_class)->finalize (object); + /* Call the base class's implementation: */ + G_OBJECT_CLASS (animation_wallpaper_plugin_parent_class)->finalize (object); } static void @@ -639,7 +611,6 @@ animation_wallpaper_plugin_class_init (AWallpaperPluginClass *klass) { gobject_class->destroy = (gpointer)lw_applet_finalize; object_class->finalize = desktop_widget_finalize; widget_class->realize = lw_applet_realize; -// widget_class->expose_event = lw_applet_expose_event; g_type_class_add_private (klass, sizeof (Animation_WallpaperPrivate)); diff --git a/applet/src/livewp-home-widget.h b/applet/src/livewp-home-widget.h index 0b4f5fd..dbff73b 100644 --- a/applet/src/livewp-home-widget.h +++ b/applet/src/livewp-home-widget.h @@ -80,5 +80,6 @@ void livewp_deinitialize_dbus(Animation_WallpaperPrivate *priv); gint current_active_view(void); gboolean long_timeout (AWallpaperPlugin *desktop_plugin); void desktop_plugin_visible_notify (GObject *object, GParamSpec *spec, AWallpaperPlugin *desktop_plugin); +void send_dbus_signal (Animation_WallpaperPrivate *priv, const gchar *interface, const gchar *path, const gchar *member); #endif diff --git a/applet/src/livewp-main.c b/applet/src/livewp-main.c index eaf3abe..dd43f03 100644 --- a/applet/src/livewp-main.c +++ b/applet/src/livewp-main.c @@ -29,6 +29,9 @@ /*******************************************************************************/ static void set_live_bg (Display *display, Window xwindow, int mode); +void quit_from_program (Animation_WallpaperPrivate *priv); +void view_state_changed (Animation_WallpaperPrivate *priv); + static void set_live_bg (Display *display, Window xwindow, int mode) { diff --git a/applet/src/livewp-scene.c b/applet/src/livewp-scene.c index a0f62fc..73aac03 100644 --- a/applet/src/livewp-scene.c +++ b/applet/src/livewp-scene.c @@ -192,16 +192,13 @@ init_scene_Xsnow(AWallpaperPlugin *desktop_plugin){ g_free(run_string); } /*******************************************************************************/ -gboolean cb_timeout0(AWallpaperPlugin *desktop_plugin) { - GstFormat fmt = GST_FORMAT_TIME; - gboolean test; - gint64 len; - gint len_seconds = 0; +gboolean +cb_timeout0(AWallpaperPlugin *desktop_plugin) { if (!desktop_plugin || !desktop_plugin->priv->pipeline) return FALSE; if (desktop_plugin->priv->theme_int_parametr1 == 0){ - if (!gst_element_seek(GST_PIPELINE (desktop_plugin->priv->pipeline), 1.0, GST_FORMAT_TIME, + if (!gst_element_seek((GstElement *)GST_PIPELINE (desktop_plugin->priv->pipeline), 1.0, GST_FORMAT_TIME, GST_SEEK_FLAG_FLUSH, GST_SEEK_TYPE_SET, desktop_plugin->priv->theme_int_parametr1 * GST_SECOND, GST_SEEK_TYPE_NONE, GST_CLOCK_TIME_NONE)) @@ -212,7 +209,7 @@ gboolean cb_timeout0(AWallpaperPlugin *desktop_plugin) { if (gst_element_get_state (desktop_plugin->priv->pipeline, NULL, NULL, -1) == GST_STATE_CHANGE_FAILURE) return TRUE; else{ - if (!gst_element_seek(GST_PIPELINE (desktop_plugin->priv->pipeline), 1.0, GST_FORMAT_TIME, + if (!gst_element_seek((GstElement *)GST_PIPELINE (desktop_plugin->priv->pipeline), 1.0, GST_FORMAT_TIME, GST_SEEK_FLAG_FLUSH, GST_SEEK_TYPE_SET, desktop_plugin->priv->theme_int_parametr1 * GST_SECOND, GST_SEEK_TYPE_NONE, GST_CLOCK_TIME_NONE)) @@ -226,7 +223,6 @@ init_scene_Video(AWallpaperPlugin *desktop_plugin) { GstElement *bin; GstElement *videosink; - GstFormat format; gchar *file_plus_uri; @@ -240,7 +236,7 @@ init_scene_Video(AWallpaperPlugin *desktop_plugin) { GstBus *bus; bus = gst_pipeline_get_bus (GST_PIPELINE (desktop_plugin->priv->pipeline)); - gst_bus_add_watch(bus, bus_call, desktop_plugin); + gst_bus_add_watch(bus, (GstBusFunc)bus_call, desktop_plugin); gst_object_unref (bus); } file_plus_uri = g_strdup_printf("file://%s",desktop_plugin->priv->theme_string_parametr1); @@ -252,7 +248,7 @@ init_scene_Video(AWallpaperPlugin *desktop_plugin) if (desktop_plugin->priv->visible){ gst_element_set_state (desktop_plugin->priv->pipeline, GST_STATE_PLAYING); - g_timeout_add(100, cb_timeout0, desktop_plugin); + g_timeout_add(50, (GSourceFunc)cb_timeout0, desktop_plugin); } //gst_element_get_state(deskddtop_plugin->priv->pipeline, NULL, NULL, 100 * GST_MSECOND); diff --git a/applet/src/livewp-scene.h b/applet/src/livewp-scene.h index f5cab0a..0423f9c 100644 --- a/applet/src/livewp-scene.h +++ b/applet/src/livewp-scene.h @@ -30,7 +30,7 @@ #include #include "livewp-rules.h" #include - +#include void destroy_scene(AWallpaperPlugin *desktop_plugin); @@ -44,5 +44,6 @@ void init_scene_Accel(AWallpaperPlugin *desktop_plugin); void init_scene_Video(AWallpaperPlugin *desktop_plugin); void init_scene_Xsnow(AWallpaperPlugin *desktop_plugin); void init_scene_theme(AWallpaperPlugin *desktop_plugin); +void create_hildon_actor_text(Actor *actor, AWallpaperPlugin *desktop_plugin); #endif -- 1.7.9.5