[pkg-fso-commits] [SCM] libframeworkd-phonegui branch, upstream, updated. 640da47bfcff755388d0fb8f443eb34e0dea3c72

[montgoss (none)]

The following commit has been merged in the upstream branch:
commit a8bc14376f2b8fd761e31f5a13fd3136bb35f1b7
Author: montgoss <montgoss at montgoss-1.(none)>
Date:   Mon Dec 22 16:57:18 2008 -0600

    Fixed build errors in libframeworkd-phonegui-gtk.

diff --git a/libframeworkd-phonegui-gtk/src/history.c b/libframeworkd-phonegui-gtk/src/history.c
index a859d8f..7cea603 100644
--- a/libframeworkd-phonegui-gtk/src/history.c
+++ b/libframeworkd-phonegui-gtk/src/history.c
@@ -32,15 +32,15 @@
 
 #include <libebook/e-book.h>
 
-#include <hito-contact-view.h>
-#include <hito-contact-store.h>
-#include <hito-group-store.h>
-#include <hito-group-combo.h>
-#include <hito-all-group.h>
-#include <hito-separator-group.h>
-#include <hito-group.h>
-#include <hito-no-category-group.h>
-#include <hito-vcard-util.h>
+#include <libhito/hito-contact-view.h>
+#include <libhito/hito-contact-store.h>
+#include <libhito/hito-group-store.h>
+#include <libhito/hito-group-combo.h>
+#include <libhito/hito-all-group.h>
+#include <libhito/hito-separator-group.h>
+#include <libhito/hito-group.h>
+#include <libhito/hito-no-category-group.h>
+#include <libhito/hito-vcard-util.h>
 
 #include "contacts.h"
 #include "history.h"
diff --git a/libframeworkd-phonegui-gtk/src/pin.c b/libframeworkd-phonegui-gtk/src/pin.c
index b95b459..0d86ed6 100644
--- a/libframeworkd-phonegui-gtk/src/pin.c
+++ b/libframeworkd-phonegui-gtk/src/pin.c
@@ -19,7 +19,7 @@
 
 #include "dialer-textview.h"
 #include "dialer-panel.h"
-#include <frameworkd-glib/frameworkd-glib-sim.h>
+#include <frameworkd-glib/ogsmd/frameworkd-glib-ogsmd-sim.h>
 #include <frameworkd-glib/frameworkd-glib-dbus.h>
 #include "pin.h"
 
@@ -137,7 +137,7 @@ display_pin_error (const char *message)
                 if (gtk_dialog_run (GTK_DIALOG (staticData.dialog)) == GTK_RESPONSE_OK)
                 {
                         set_code_ui_state_busy ();
-                        sim_send_auth_code (staticData.code, sim_pin_puk_callback, NULL);
+                        ogsmd_sim_send_auth_code (staticData.code, sim_pin_puk_callback, NULL);
                 }
         }
 
@@ -160,7 +160,7 @@ void display_puk_dialog() {
                 return;
         }
         set_code_ui_state_busy ();
-        sim_unlock (puk, pin, sim_pin_puk_callback, NULL);
+        ogsmd_sim_unlock (puk, pin, sim_pin_puk_callback, NULL);
         
         g_free (pin);
         g_free (puk);
@@ -170,11 +170,11 @@ void display_puk_dialog() {
 sim_pin_puk_callback (GError *error, gpointer userdata)
 {
         if(error != NULL) {
-                if(IS_SIM_ERROR(error, SIM_ERROR_BLOCKED)) {
-                        /* display_pin_error("") */                    
-                } else if (IS_SIM_ERROR(error, SIM_ERROR_AUTH_FAILED)) {
-                        /* display_pin_error("") */
-                }
+//                if(IS_SIM_ERROR(error, SIM_ERROR_BLOCKED)) {
+//                        /* display_pin_error("") */                    
+//                } else if (IS_SIM_ERROR(error, SIM_ERROR_AUTH_FAILED)) {
+//                        /* display_pin_error("") */
+//                }
                 display_pin_puk_dialog();
         } else {
                 /* We should have SIM_READY then UI should be destroyed. */
diff --git a/libframeworkd-phonegui-gtk/src/talking.c b/libframeworkd-phonegui-gtk/src/talking.c
index 29d4a9b..391e57a 100644
--- a/libframeworkd-phonegui-gtk/src/talking.c
+++ b/libframeworkd-phonegui-gtk/src/talking.c
@@ -28,7 +28,7 @@
 #include <dbus/dbus-glib.h>
 #include <dbus/dbus-glib-bindings.h>
 #include <frameworkd-glib/frameworkd-glib-dbus.h>
-#include <frameworkd-glib/frameworkd-glib-call.h>
+#include <frameworkd-glib/ogsmd/frameworkd-glib-ogsmd-call.h>
 
 #include <libmokoui2/moko-stock.h>
 

-- 
libframeworkd-phonegui