~tiagoporangaba/ubuntu/saucy/network-manager-applet/fix-for-981472

« back to all changes in this revision

Viewing changes to .pc/nm-applet-use-indicator.patch/src/applet-device-bt.c

  • Committer: Package Import Robot
  • Author(s): Mathieu Trudel-Lapierre
  • Date: 2013-03-08 11:47:45 UTC
  • mfrom: (105.1.1 raring-proposed)
  • Revision ID: package-import@ubuntu.com-20130308114745-7p3ns9ikmfcluod4
Tags: 0.9.8.0-1ubuntu2
debian/control: add docbook-to-man to Build-Depends, missing in the
previous upload.

Show diffs side-by-side

added added

removed removed

Lines of Context:
184
184
        if (new_state == NM_DEVICE_STATE_ACTIVATED) {
185
185
                NMConnection *connection;
186
186
                NMSettingConnection *s_con = NULL;
187
 
                char *str = NULL;
 
187
                const char *str = NULL;
188
188
 
189
189
                connection = applet_find_active_connection_for_device (device, applet, NULL);
190
190
                if (connection) {
191
 
                        const char *id;
192
191
                        s_con = nm_connection_get_setting_connection (connection);
193
 
                        id = s_con ? nm_setting_connection_get_id (s_con) : NULL;
194
 
                        if (id)
195
 
                                str = g_strdup_printf (_("You are now connected to '%s'."), id);
 
192
                        str = s_con ? nm_setting_connection_get_id (s_con) : NULL;
196
193
                }
197
194
 
198
195
                applet_do_notify_with_pref (applet,
199
 
                                            _("Connection Established"),
200
 
                                            str ? str : _("You are now connected to the mobile broadband network."),
 
196
                                            _("Connected"),
 
197
                                            str ? str : _("Mobile Broadband network"),
201
198
                                            "nm-device-wwan",
202
199
                                            PREF_DISABLE_CONNECTED_NOTIFICATIONS);
203
200
                g_free (str);