next step for application

diff --git a/applet/data/livewp.desktop.in b/applet/data/livewp.desktop.in
index 76b6bf6..e288eb6 100644 (file)
--- a/applet/data/livewp.desktop.in
+++ b/applet/data/livewp.desktop.in
@@ -2,7 +2,7 @@
 Encoding=UTF-8
 Version=__VERSION__
 Type=Application
-Name=livewp
+Name=LiveWallpaper
 Comment=Configuring Live Wallpaoer
 Exec=/usr/bin/livewp
 Icon=livewp

diff --git a/applet/src/livewp-main.c b/applet/src/livewp-main.c
index 9911dec..ecdd230 100644 (file)
--- a/applet/src/livewp-main.c
+++ b/applet/src/livewp-main.c
@@ -33,7 +33,7 @@ main(int argc, char *argv[])
     GtkWidget *window;
     gint result;
     HildonProgram       *app;
-    osso_context_t  *osso_context;
+    osso_context_t  *osso_context=NULL;
 
 #ifdef ENABLE_NLS
     setlocale(LC_ALL, "");
@@ -42,6 +42,9 @@ main(int argc, char *argv[])
     textdomain(GETTEXT_PACKAGE);
 #endif
     hildon_gtk_init (&argc, &argv);
+    app = HILDON_PROGRAM (hildon_program_get_instance());
+    g_set_application_name (PACKAGE);
+ 
     osso_context = osso_initialize("org.maemo.livewp", VERSION, TRUE, NULL);
     if(!osso_context){
         fprintf(stderr,"osso_initialize failed\n");
@@ -49,12 +52,11 @@ main(int argc, char *argv[])
     }
 
 
-    app = HILDON_PROGRAM ( hildon_program_get_instance () );
-    g_set_application_name (PACKAGE);
- 
+
     main_widget = hildon_stackable_window_new ();
     gtk_window_set_title(GTK_WINDOW(main_widget), PACKAGE);
     hildon_program_add_window(app, HILDON_WINDOW(main_widget));
+
     gtk_widget_show_all(GTK_WIDGET(main_widget));
 #if 0
     window = create_settings();