packaging/0001-desc-dbus-create-interfaces-when-modem-is-added.patch

   1 From ec42dbbe5a71887c55766891f9c340d824a07659 Mon Sep 17 00:00:00 2001
   2 From: Caiwen Zhang <caiwen.zhang@intel.com>
   3 Date: Thu, 27 Dec 2012 22:07:29 +0800
   4 Subject: [PATCH 1/2] desc-dbus: create interfaces when modem is added
   5 Content-Type: text/plain; charset="utf-8"
   6 Content-Transfer-Encoding: 8bit
   7
   8 Merge "Change Ic4376ea2: desc-dbus: Create interfaces when modem
   9 is added", Oct 16, submitted by Guillaume on master branch.
  10 ---
  11  src/desc-dbus.c |   51 ++++++---------------------------------------------
  12  1 file changed, 6 insertions(+), 45 deletions(-)
  13
  14 diff --git a/src/desc-dbus.c b/src/desc-dbus.c
  15 index a2a135f..42e4b0f 100644
  16 --- a/src/desc-dbus.c
  17 +++ b/src/desc-dbus.c
  18 @@ -135,43 +135,6 @@ OUT:
  19                 g_free(path);
  20  }
  21
  22 -static void refresh_object(struct custom_data *ctx)
  23 -{
  24 -       GSList *plugins;
  25 -       GSList *cur;
  26 -       GSList *co_list;
  27 -       TcorePlugin *p;
  28 -
  29 -       if (!ctx->manager) {
  30 -               dbg("not ready..");
  31 -               return;
  32 -       }
  33 -
  34 -       plugins = tcore_server_ref_plugins(ctx->server);
  35 -       if (!plugins)
  36 -               return;
  37 -
  38 -       cur = plugins;
  39 -       for (cur = plugins; cur; cur = cur->next) {
  40 -               p = cur->data;
  41 -               if (!p)
  42 -                       continue;
  43 -
  44 -               co_list = tcore_plugin_get_core_objects_bytype(p, CORE_OBJECT_TYPE_MODEM);
  45 -               if (!co_list)
  46 -                       continue;
  47 -
  48 -               if (!tcore_object_get_hal(co_list->data)) {
  49 -                       g_slist_free(co_list);
  50 -                       continue;
  51 -               }
  52 -
  53 -               g_slist_free(co_list);
  54 -
  55 -               add_modem(ctx, p);
  56 -       }
  57 -}
  58 -
  59  static TReturn send_response(Communicator *comm, UserRequest *ur, enum tcore_response_command command, unsigned int data_len, const void *data)
  60  {
  61         struct custom_data *ctx = NULL;
  62 @@ -247,6 +210,7 @@ static TReturn send_notification(Communicator *comm, CoreObject *source, enum tc
  63         char *plugin_name;
  64         char *path;
  65         TelephonyObjectSkeleton *object;
  66 +       TcorePlugin *p = tcore_object_ref_plugin(source);
  67
  68         dbg("notification !!! (command = 0x%x, data_len = %d)", command, data_len);
  69
  70 @@ -256,7 +220,7 @@ static TReturn send_notification(Communicator *comm, CoreObject *source, enum tc
  71                 return FALSE;
  72         }
  73
  74 -       plugin_name = tcore_plugin_ref_plugin_name(tcore_object_ref_plugin(source));
  75 +       plugin_name = tcore_plugin_ref_plugin_name(p);
  76         if (plugin_name) {
  77                 path = g_strdup_printf("%s/%s", MY_DBUS_PATH, plugin_name);
  78         }
  79 @@ -293,7 +257,10 @@ static TReturn send_notification(Communicator *comm, CoreObject *source, enum tc
  80                         break;
  81
  82                 case TNOTI_MODEM:
  83 -                       dbus_plugin_modem_notification(ctx, plugin_name, object, command, data_len, data);
  84 +                       if (command == TNOTI_MODEM_ADDED)
  85 +                               add_modem(ctx, p);
  86 +                       else
  87 +                               dbus_plugin_modem_notification(ctx, plugin_name, object, command, data_len, data);
  88                         break;
  89
  90                 case TNOTI_SMS:
  91 @@ -315,9 +282,6 @@ static TReturn send_notification(Communicator *comm, CoreObject *source, enum tc
  92                         break;
  93
  94                 case TNOTI_SERVER:
  95 -                       if (command == TNOTI_SERVER_RUN) {
  96 -                               refresh_object(ctx);
  97 -                       }
  98                         break;
  99
 100                 default:
 101 @@ -394,8 +358,6 @@ static void on_bus_acquired(GDBusConnection *conn, const gchar *name, gpointer u
 102
 103         info("dbus registered");
 104
 105 -       refresh_object(ctx);
 106 -
 107         /* Add interface to default object path */
 108         mgr = telephony_manager_skeleton_new();
 109         g_signal_connect (mgr,
 110 @@ -468,7 +430,6 @@ static gboolean on_init(TcorePlugin *p)
 111                         NULL);
 112
 113         data->manager = g_dbus_object_manager_server_new (MY_DBUS_PATH);
 114 -       refresh_object(data);
 115
 116         return TRUE;
 117  }
 118 --
 119 1.7.10.4
 120