Sorry for the huge delay, applied. On Wed, Jun 9, 2010 at 11:59 PM, David Kozub <[email protected]> wrote:
> ui-utils: rename error_message_* to ui_utils_error_message_* > contact-list-view: clarify error message in contact-list-view.c > > Signed-off-by: David Kozub <[email protected]> > --- > src/util/ui-utils.c | 8 ++++---- > src/util/ui-utils.h | 4 ++-- > src/view/contact-list-view.c | 10 +++++++--- > src/view/contact-view.c | 6 +++--- > src/view/dialer-view.c | 2 +- > src/view/message-new-view.c | 2 +- > src/view/phone-log-view.c | 4 ++-- > src/view/quick-settings-view.c | 8 ++++---- > src/view/sim-manager-view.c | 8 ++++---- > 9 files changed, 28 insertions(+), 24 deletions(-) > > diff --git a/src/util/ui-utils.c b/src/util/ui-utils.c > index 8315bbd..5487038 100644 > --- a/src/util/ui-utils.c > +++ b/src/util/ui-utils.c > @@ -605,7 +605,7 @@ error_message_ok_cb(void *data, Evas_Object *obj, void > *event_info) > } > > void > -error_message_show(struct View *parent, const char *error_msg, const char > *detail_msg) > +ui_utils_error_message_show(struct View *parent, const char *error_msg, > const char *detail_msg) > { > Evas_Object *win = ui_utils_view_window_get(parent); > > @@ -657,16 +657,16 @@ error_message_show(struct View *parent, const char > *error_msg, const char *detai > } > > void > -error_message_show_from_gerror(struct View *parent, const char *msg, > +ui_utils_error_message_from_gerror_show(struct View *parent, const char > *msg, > const GError *err) > { > if (err) > { > gchar *detail_msg = g_strdup_printf("(%d) %s", > err->code, err->message); > - error_message_show(parent, msg, detail_msg); > + ui_utils_error_message_show(parent, msg, detail_msg); > g_free(detail_msg); > } > else > - error_message_show(parent, msg, NULL); > + ui_utils_error_message_show(parent, msg, NULL); > } > diff --git a/src/util/ui-utils.h b/src/util/ui-utils.h > index 48f4da5..4e975ec 100644 > --- a/src/util/ui-utils.h > +++ b/src/util/ui-utils.h > @@ -92,10 +92,10 @@ char * > ui_utils_entry_utf8_get(Evas_Object *entry); > > void > -error_message_show(struct View *parent, const char *error_msg, > +ui_utils_error_message_show(struct View *parent, const char *error_msg, > const char *detail_msg); > void > -error_message_show_from_gerror(struct View *parent, const char *msg, > +ui_utils_error_message_from_gerror_show(struct View *parent, const char > *msg, > const GError *err); > > #endif > diff --git a/src/view/contact-list-view.c b/src/view/contact-list-view.c > index 9a234c6..45adf37 100644 > --- a/src/view/contact-list-view.c > +++ b/src/view/contact-list-view.c > @@ -325,9 +325,13 @@ _add_contact_cb(GError *error, GHashTable *properties, > gpointer data) > (void) data; > Elm_Genlist_Item *it; > if (error || !properties) { > - g_warning("Failed adding a contact: (%d) %s", > - (error)? error->code : 0, (error)? error->message : > "NULL"); > - error_message_show_from_gerror(VIEW_PTR(view), > + if (error) > + g_warning("Failed adding contact: (%d) %s", > + error->code, error->message); > + else > + g_warning("Failed adding contact: call succeeded, " > + "but no properties were returned"); > + ui_utils_error_message_from_gerror_show(VIEW_PTR(view), > D_("Failed adding contact."), error); > return; > } > diff --git a/src/view/contact-view.c b/src/view/contact-view.c > index a85a7fe..7aa2e21 100644 > --- a/src/view/contact-view.c > +++ b/src/view/contact-view.c > @@ -691,7 +691,7 @@ _update_cb(GError *error, gpointer data) > if (error) { > g_warning("Updating contact %s failed: (%d) %s", view->path, > error->code, error->message); > - error_message_show_from_gerror(VIEW_PTR(view), > + ui_utils_error_message_from_gerror_show(VIEW_PTR(view), > D_("Updating contact failed."), error); > } > else { > @@ -706,7 +706,7 @@ _add_cb(GError *error, char *path, gpointer data) > if (error) { > g_warning("Adding the contact failed: (%d) %s", > error->code, error->message); > - error_message_show_from_gerror(VIEW_PTR(view), > + ui_utils_error_message_from_gerror_show(VIEW_PTR(view), > D_("Adding the contact failed."), error); > } > else { > @@ -724,7 +724,7 @@ _load_cb(GError *error, GHashTable *content, gpointer > data) > if (error || !content) { > g_critical("Failed loading data of saved contact: (%d) %s", > (error)? error->code : 0, (error)? error->message : > "NULL"); > - error_message_show_from_gerror(VIEW_PTR(view), > + ui_utils_error_message_from_gerror_show(VIEW_PTR(view), > D_("Failed loading data of saved contact."), error); > return; > } > diff --git a/src/view/dialer-view.c b/src/view/dialer-view.c > index 44cfc5d..05454fa 100644 > --- a/src/view/dialer-view.c > +++ b/src/view/dialer-view.c > @@ -381,7 +381,7 @@ _dialer_call_initiated_cb(GError * error, int call_id, > void *userdata) > { > g_warning("Cannot initiate call: (%d) %s", error->code, > error->message); > - error_message_show_from_gerror(VIEW_PTR(view), > + ui_utils_error_message_from_gerror_show(VIEW_PTR(view), > D_("Cannot initiate call."), error); > } > else > diff --git a/src/view/message-new-view.c b/src/view/message-new-view.c > index a027fe5..a6c003c 100644 > --- a/src/view/message-new-view.c > +++ b/src/view/message-new-view.c > @@ -743,7 +743,7 @@ _contact_lookup(GError *error, GHashTable *contact, > gpointer data) > if (error) { > g_warning("Error will trying to resolve number: (%d) %s", > error->code, error->message); > - error_message_show_from_gerror(VIEW_PTR(*pack->view), > + > ui_utils_error_message_from_gerror_show(VIEW_PTR(*pack->view), > D_("Error will trying to resolve number."), error); > return; > } > diff --git a/src/view/phone-log-view.c b/src/view/phone-log-view.c > index 1d6f707..f3e3baa 100644 > --- a/src/view/phone-log-view.c > +++ b/src/view/phone-log-view.c > @@ -274,7 +274,7 @@ _contact_lookup(GError *error, GHashTable *contact, > gpointer data) > { > if (error) { > g_warning("Contact lookup error: (%d) %s", error->code, > error->message); > - error_message_show_from_gerror(VIEW_PTR(view), > + ui_utils_error_message_from_gerror_show(VIEW_PTR(view), > D_("Contact lookup error."), error); > return; > } > @@ -311,7 +311,7 @@ _get_callback(GError* error, GHashTable** entry, int > count, gpointer data) > > if (error) { > g_warning("Cannot retrieve calls list: (%d) %s", > error->code, error->message); > - error_message_show_from_gerror(VIEW_PTR(view), > + ui_utils_error_message_from_gerror_show(VIEW_PTR(view), > D_("Cannot retrieve calls list."), error); > return; > } > diff --git a/src/view/quick-settings-view.c > b/src/view/quick-settings-view.c > index a8b6de5..83cb002 100644 > --- a/src/view/quick-settings-view.c > +++ b/src/view/quick-settings-view.c > @@ -265,7 +265,7 @@ _set_profile_cb(GError *error, gpointer data) > if (error) { > g_warning("Failed setting the profile: (%d) %s", > error->code, error->message); > - error_message_show_from_gerror(VIEW_PTR(view), > + ui_utils_error_message_from_gerror_show(VIEW_PTR(view), > D_("Failed setting the profile."), error); > } > } > @@ -304,7 +304,7 @@ _profiles_list_cb(GError *error, char **list, int > count, gpointer userdata) > if (error || !list) { > g_warning("Failed to retrieve profiles list: (%d) %s", > (error)? error->code : 0, (error)? error->message : > "NULL"); > - error_message_show_from_gerror(VIEW_PTR(view), > + ui_utils_error_message_from_gerror_show(VIEW_PTR(view), > D_("Failed to retrieve profiles list."), error); > return; > } > @@ -531,7 +531,7 @@ _pdp_activate_cb(GError *error, gpointer data) > if (error) { > g_warning("Activating PDP failed: (%d) %s", > error->code, error->message); > - error_message_show_from_gerror(VIEW_PTR(view), > + ui_utils_error_message_from_gerror_show(VIEW_PTR(view), > D_("Activating PDP failed."), error); > } > } > @@ -544,7 +544,7 @@ _pdp_deactivate_cb(GError *error, gpointer data) > if (error) { > g_warning("De-Activating PDP failed: (%d) %s", > error->code, error->message); > - error_message_show_from_gerror(VIEW_PTR(view), > + ui_utils_error_message_from_gerror_show(VIEW_PTR(view), > D_("De-Activating PDP failed."), error); > } > } > diff --git a/src/view/sim-manager-view.c b/src/view/sim-manager-view.c > index 6a9e888..f6c4341 100644 > --- a/src/view/sim-manager-view.c > +++ b/src/view/sim-manager-view.c > @@ -271,7 +271,7 @@ _number_add_add_to_sim(GError *error, gpointer pack) > if (error) { > g_warning("Failed to write to SIM: (%d) %s", error->code, > error->message); > - error_message_show_from_gerror(VIEW_PTR(view), > + ui_utils_error_message_from_gerror_show(VIEW_PTR(view), > D_("Failed to write to SIM."), error); > } else { > /* > @@ -332,7 +332,7 @@ _number_add_find_index_cb(GError *error, int max_index, > int number_length, > if (error) { > g_warning("Failed retrieving Phonebook Info: (%d) %s", > error->code, error->message); > - error_message_show_from_gerror(VIEW_PTR(view), > + ui_utils_error_message_from_gerror_show(VIEW_PTR(view), > D_("Failed retrieving Phonebook Info."), error); > g_timeout_add(0, _number_add_destruct, pack); > return; > @@ -387,7 +387,7 @@ _number_add_contact_get_cb(GError *error, GHashTable > *properties, gpointer data) > g_warning("Failed to retrieve contact: %s [error (%d) %s]", > pack->path, (error)? error->code : 0, > (error)? error->message : "NULL"); > - error_message_show_from_gerror(VIEW_PTR(view), > + ui_utils_error_message_from_gerror_show(VIEW_PTR(view), > D_("Failed to retrieve contact."), error); > g_timeout_add(0, _number_add_destruct, pack); > return; > @@ -736,7 +736,7 @@ _sim_contacts_get_callback(GError *error, > FreeSmartphoneGSMSIMEntry *entry, > if (error) { > g_warning("Failed retrieving SIM Phonebook: (%d) %s", > error->code, error->message); > - error_message_show_from_gerror(VIEW_PTR(view), > + ui_utils_error_message_from_gerror_show(VIEW_PTR(view), > D_("Failed retrieving SIM Phonebook."), error); > // FIXME: destroy SIM Manager > return; > -- > 1.6.4.4 > > _______________________________________________ > Shr-devel mailing list > [email protected] > http://lists.shr-project.org/mailman/listinfo/shr-devel > -- Tom.
_______________________________________________ Shr-devel mailing list [email protected] http://lists.shr-project.org/mailman/listinfo/shr-devel
