From ad9b61ddf7bad8eeeef61c8fec22ff4df92f7587 Mon Sep 17 00:00:00 2001
From: Thomas Perl <thp@thpinfo.com>
Date: Mon, 1 Feb 2010 19:59:02 +0100
Subject: [PATCH] Fix and remove some obsolete OSSO/D-Bus stuff

---
 data/maepad.desktop | 12 +++---------
 src/main.c          |  5 +----
 src/ui/callbacks.c  | 36 ------------------------------------
 src/ui/callbacks.h  |  2 --
 4 files changed, 4 insertions(+), 51 deletions(-)

diff --git a/data/maepad.desktop b/data/maepad.desktop
index 37c28fc..0e720fd 100644
--- a/data/maepad.desktop
+++ b/data/maepad.desktop
@@ -1,13 +1,7 @@
 [Desktop Entry]
-Encoding=UTF-8
-Version=1.0
 Type=Application
+Version=1.0
 Name=MaePad
-Exec=/usr/bin/maepad
 Icon=maepad
-X-Window-Icon=maepad
-X-Window-Icon-Dimmed=maepad
-X-HildonDesk-ShowInToolbar=true
-X-Osso-Service=org.maemo.maepad
-X-Osso-Type=application/x-executable
-Terminal=false
+Exec=/usr/bin/maepad
+
diff --git a/src/main.c b/src/main.c
index 8ca0363..fed446f 100644
--- a/src/main.c
+++ b/src/main.c
@@ -43,7 +43,7 @@ app_data_new()
 
     app_data->app = HILDON_PROGRAM(hildon_program_get_instance());
     g_assert(app_data->app);
-    app_data->osso = osso_initialize("maepad", VERSION, FALSE, NULL);
+    app_data->osso = osso_initialize("org.maemo.maepad", VERSION, FALSE, NULL);
     g_assert(app_data->osso);
     app_data->gconf = gconf_client_get_default();
     g_assert(app_data->gconf);
@@ -81,9 +81,6 @@ int main(int argc, char *argv[])
     app_data = app_data_new();
     main_view = interface_main_view_new(app_data);
 
-    /* Add handler for hardware D-BUS messages */
-    g_assert(osso_hw_set_event_cb(app_data->osso, NULL, hw_event_handler, (gpointer)main_view) == OSSO_OK);
-
     /* Check if we can directly open the last document */
     gchar* last_document = gconf_client_get_string(app_data->gconf, MAEPAD_GCONF_LAST_DOCUMENT, NULL);
 
diff --git a/src/ui/callbacks.c b/src/ui/callbacks.c
index e3f357c..5b03902 100644
--- a/src/ui/callbacks.c
+++ b/src/ui/callbacks.c
@@ -3021,42 +3021,6 @@ g_assert(mainview != NULL && mainview->data != NULL);
 mainview->file_edited = TRUE;
 }
 
-/*
- * Callback for hardware D-BUS events 
- */
-void hw_event_handler(osso_hw_state_t * state, gpointer data)
-{
-	MainView *mainview = (MainView *) data;
-	g_assert(mainview != NULL && mainview->data != NULL);
-
-	/*
-	 * if (state->shutdown_ind)
-	 * {
-	 * gtk_infoprint(GTK_WINDOW(mainview->data->app),
-	 * "Shutdown event!");
-	 * }
-	 * if (state->memory_low_ind)
-	 * {
-	 * gtk_infoprint(GTK_WINDOW(mainview->data->app),
-	 * "Memory low event!");
-	 * }
-	 */
-	if (state->save_unsaved_data_ind)
-		{
-			fprintf(stderr, "Saving unsaved data!\n");
-			show_banner(mainview, _("Saving unsaved data"));
-			callback_file_save(NULL, mainview);
-		}
-
-	/*
-	 * if (state->system_inactivity_ind)
-	 * {
-	 * gtk_infoprint(GTK_WINDOW(mainview->data->app),
-	 * "Minimize application inactivity event!");
-	 * }
-	 */
-}
-
 GtkTreeRowReference *read_sqlite3_data(MainView * mainview, unsigned int parentid, GtkTreeRowReference * parenttree, unsigned int selected, GtkTreeStore * model)
 {
 	GtkTreeRowReference *resref = NULL;
diff --git a/src/ui/callbacks.h b/src/ui/callbacks.h
index dabb5f7..a76d0b8 100644
--- a/src/ui/callbacks.h
+++ b/src/ui/callbacks.h
@@ -130,8 +130,6 @@ void callback_checklist_delete_real(MainView* mainview);
  */
 void callback_buffer_modified(GtkAction * action, gpointer data);
 
-void hw_event_handler(osso_hw_state_t * state, gpointer data);
-
 
 /* UI helper functions needed in callbacks */
 gboolean
-- 
2.11.4.GIT