[Merge] lp:~tiagosh/telephony-service/authentication-handler into lp:telephony-service

[Gustavo Pichorim Boiko]

Review: Needs Fixing

One more problem to fix.

Diff comments:

> 
> === renamed file 'indicator/ussdmenu.cpp' => 'indicator/notificationmenu.cpp'
> --- indicator/ussdmenu.cpp	2014-03-31 19:37:40 +0000
> +++ indicator/notificationmenu.cpp	2015-11-03 13:43:31 +0000
> @@ -62,26 +62,26 @@
>  	// menu
>  	GMenu *menu(g_menu_new());
>  
> -	GMenuItem *ussdItem(g_menu_item_new("", "notifications.ussd"));
> +	GMenuItem *item(g_menu_item_new("", QString("notifications.%1").arg(id).toLatin1().data()));
>          if (needsResponse) {
> -            g_menu_item_set_attribute_value(ussdItem, "x-canonical-type",
> +            g_menu_item_set_attribute_value(item, "x-canonical-type",
>                              g_variant_new_string("com.canonical.snapdecision.textfield"));
> -            g_menu_item_set_attribute_value(ussdItem, "x-echo-mode-password",
> -                            g_variant_new_boolean(false));
> -            g_menu_append_item(menu, ussdItem);
> +            g_menu_item_set_attribute_value(item, "x-echo-mode-password",

I think you should set password mode only when the "password" bool is true

> +                            g_variant_new_boolean(password));
> +            g_menu_append_item(menu, item);
>          }
>  
>  	// actions
>  	GActionGroup *actions(G_ACTION_GROUP(g_simple_action_group_new()));
> -	GAction *ussdAction(G_ACTION(
> -			g_simple_action_new_stateful("ussd", G_VARIANT_TYPE_STRING,
> +	GAction *action(G_ACTION(
> +			g_simple_action_new_stateful(id.toLatin1().data(), G_VARIANT_TYPE_STRING,
>  					g_variant_new_string(""))));
>  
> -	g_signal_connect(G_OBJECT(ussdAction), "change-state",
> -			G_CALLBACK(USSDMenuPriv::responseChangedCallback),
> +	g_signal_connect(G_OBJECT(action), "change-state",
> +			G_CALLBACK(NotificationMenuPriv::responseChangedCallback),
>  			reinterpret_cast<gpointer>(p.data()));
>  
> -	g_action_map_add_action(G_ACTION_MAP(actions), ussdAction);
> +	g_action_map_add_action(G_ACTION_MAP(actions), action);
>  
>  	/* Export the actions group.  If we can't get a name, keep trying to
>  	   use increasing numbers.  There is possible races on fast import/exports.


-- 
https://code.launchpad.net/~tiagosh/telephony-service/authentication-handler/+merge/262992
Your team Ubuntu Phablet Team is subscribed to branch lp:telephony-service.