From ace80ceb5719fb636f92fca5ef27a28f6dbc90c9 Mon Sep 17 00:00:00 2001 From: Vlad Date: Thu, 29 Jul 2010 09:22:21 +0300 Subject: [PATCH] fixed gcc's warnings --- applet/src/livewp-control-widget.c | 1 + applet/src/livewp-scene.c | 2 ++ applet/src/livewp-settings.c | 14 ++++++-------- applet/src/livewp-settings.h | 6 ++++++ 4 files changed, 15 insertions(+), 8 deletions(-) diff --git a/applet/src/livewp-control-widget.c b/applet/src/livewp-control-widget.c index e67fca4..922959c 100644 --- a/applet/src/livewp-control-widget.c +++ b/applet/src/livewp-control-widget.c @@ -29,6 +29,7 @@ osso_return_t execute(osso_context_t *osso, gpointer data, gboolean user_activated){ Animation_WallpaperPrivate *priv = g_new0 (Animation_WallpaperPrivate, 1); + priv->theme_string_parametr1 = NULL; priv->osso = osso_initialize("org.maemo.livewp", VERSION, TRUE, NULL); /* Load config */ read_config(priv); diff --git a/applet/src/livewp-scene.c b/applet/src/livewp-scene.c index be068b5..6b79953 100644 --- a/applet/src/livewp-scene.c +++ b/applet/src/livewp-scene.c @@ -92,7 +92,9 @@ bus_call (GstBus *bus, GstMessage *msg, AWallpaperPlugin *desktop_plugin) switch (GST_MESSAGE_TYPE (msg)) { case GST_MESSAGE_EOS: + fprintf(stderr,"GST_MESSAGE_EOS:\n"); if (desktop_plugin->priv->rich_animation){ + fprintf(stderr,"GST_MESSAGE_EOS222222222222222222222222\n"); gst_element_set_start_time(desktop_plugin->priv->pipeline, 0); gst_element_set_state (desktop_plugin->priv->pipeline, GST_STATE_PLAYING); } diff --git a/applet/src/livewp-settings.c b/applet/src/livewp-settings.c index 11496ca..aa5af85 100644 --- a/applet/src/livewp-settings.c +++ b/applet/src/livewp-settings.c @@ -69,7 +69,7 @@ create_theme_selector (void){ void theme_button_clicked(GtkButton *button, Animation_WallpaperPrivate *priv){ - lw_theme_settings(priv, button); + lw_theme_settings(GTK_WIDGET(button), priv); } /********************************************************************************/ void @@ -100,9 +100,6 @@ set_button_image(GtkWidget * button, gchar *theme, gboolean enable){ GtkWidget * create_image_button (gint view, DBusConnection *conn_sess){ GtkWidget *button; - GtkWidget *image; - gchar * str; - GdkPixbuf * pixbuf; Animation_WallpaperPrivate *priv = g_new0(Animation_WallpaperPrivate, 1); priv->view = view; @@ -276,7 +273,7 @@ file_button_clicked(GtkButton *button, Animation_WallpaperPrivate *priv){ if (gtk_dialog_run(GTK_DIALOG(dialog)) == GTK_RESPONSE_OK) { - hildon_button_set_value (button, gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(dialog))); + hildon_button_set_value (HILDON_BUTTON(button), gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(dialog))); } gtk_widget_destroy (dialog); @@ -303,7 +300,7 @@ additional_parametr_for_theme_video(GtkWidget *vbox, Animation_WallpaperPrivate _("Play file"), priv->theme_string_parametr1); else file_button = hildon_button_new_with_text (HILDON_SIZE_FINGER_HEIGHT,HILDON_BUTTON_ARRANGEMENT_VERTICAL, - _("Play file"),""); + _("Play file")," "); g_signal_connect (file_button, "clicked", G_CALLBACK (file_button_clicked), priv); @@ -315,7 +312,7 @@ additional_parametr_for_theme_video(GtkWidget *vbox, Animation_WallpaperPrivate } /*******************************************************************************/ void -lw_theme_settings(Animation_WallpaperPrivate *priv, GtkWidget *button){ +lw_theme_settings(GtkWidget *button, Animation_WallpaperPrivate *priv) { gint result; GtkWidget *window = NULL; GtkWidget *save_button; @@ -356,6 +353,7 @@ lw_theme_settings(Animation_WallpaperPrivate *priv, GtkWidget *button){ if (!strcmp(hildon_button_get_value(HILDON_BUTTON (theme_button)), _("Video"))){ additional_parametr_for_theme_video(vbox, priv); } + gtk_widget_show (enable_button); gtk_widget_show (theme_button); gtk_widget_show (vbox); @@ -384,7 +382,7 @@ lw_theme_settings(Animation_WallpaperPrivate *priv, GtkWidget *button){ if (button1){ if (priv->theme_string_parametr1) g_free(priv->theme_string_parametr1); - priv->theme_string_parametr1 = hildon_button_get_value (button1); + priv->theme_string_parametr1 = hildon_button_get_value (HILDON_BUTTON(button1)); } } diff --git a/applet/src/livewp-settings.h b/applet/src/livewp-settings.h index 0b5cc39..2c66d3f 100644 --- a/applet/src/livewp-settings.h +++ b/applet/src/livewp-settings.h @@ -35,4 +35,10 @@ void start_applet(gint number); void stop_applet(gint number); void send_dbus_signal (Animation_WallpaperPrivate *priv, const gchar *interface, const gchar *path, const gchar *member); +gint read_config(Animation_WallpaperPrivate *priv); +void lw_theme_settings(GtkWidget *button, Animation_WallpaperPrivate *priv); +void theme_button_clicked(GtkButton *button, Animation_WallpaperPrivate *priv); +void rich_animation_additional_parametr(GtkWidget *vbox, Animation_WallpaperPrivate *priv); +void additional_parametr_for_theme_video(GtkWidget *vbox, Animation_WallpaperPrivate *priv); + -- 1.7.9.5