← Back to branch summary

~ubuntu-branches/ubuntu/utopic/network-manager-applet/utopic-proposed

« back to all changes in this revision

Viewing changes to src/applet-device-cdma.c

  • Committer: Package Import Robot
  • Author(s): Mathieu Trudel-Lapierre
  • Date: 2012-11-19 14:46:29 UTC
  • mfrom: (1.2.31)
  • Revision ID: package-import@ubuntu.com-20121119144629-5423hii02a4vrh2n
Tags: 0.9.6.2+git201211052130.2d666bc-0ubuntu1
* upstream snapshot 2012-11-05 21:30:03 (GMT)
  + 2d666bc7aa6f0b731d131319b36f07b0f2bdce16
* debian/patches/git_fix_some_leaks_80ef61b.patch,
  debian/patches/git_indicate_hspa+_lte_tech_dbe3b12.patch,
  debian/patches/git_mac_addr_string_leakage_6dae878.patch: dropped, included
  in upstream tarball.
* debian/patches/lp328572-dxteam-connect-text.patch: refreshed.
* debian/patches/lp330571_dxteam_wired_connect_text.patch: refreshed.
* debian/patches/lp337960_dxteam_notification_icon_names.diff,
  debian/patches/lp337960_dxteam_notification_icon_names_part2-images.diff:
  disabled patches, they don't seem to be used (the icons don't match up with
  what is currently observable on the desktop). Let's see if someone screams.
* debian/patches/applet-wifi-menu-before-vpn.patch: refreshed.
* debian/patches/lp830178_adhoc_ip6_ignore.patch: refreshed.
* debian/patches/lp829673_gconf_hide_applet.patch: refreshed.
* debian/patches/nm-applet-use-indicator.patch: refreshed.
* debian/patches/hide_policy_items_env_var.patch: refreshed.
* debian/patches/applet_adhoc_use_wpa_rsn_part1.patch: refreshed.
* debian/patches/lp341684_device_sensitive_disconnect_notify.patch:
  refreshed.
* debian/patches/lp460144_correctly_update_notification.patch: refreshed.
* debian/patches/make_menu_items_insensitive_based_on_permissions.patch:
  refreshed.
* debian/control:
  - add gobject-introspection to Build-Depends.
  - add gudev-dev to Build-Depends.
  - bump network-manager and libnm-* Build-Depends and Depends to require
    at least 0.9.6.0+git201211131441.e9e2c56-0ubuntu1.
* debian/rules:
  - use autogen.sh with dh_autoreconf instead of calling intltoolize and
    gtkdocize manually.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/applet-device-cdma.c
1
1
/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
2
 
/* NetworkManager Wireless Applet -- Display wireless access points and allow user control
 
2
/* NetworkManager Applet -- allow user control over networking
3
3
 *
4
4
 * Dan Williams <dcbw@redhat.com>
5
5
 *
44
44
#include "nma-marshal.h"
45
45
#include "nmn-mobile-providers.h"
46
46
#include "mb-menu-item.h"
 
47
#include "nm-ui-utils.h"
47
48
 
48
49
typedef struct {
49
50
        NMApplet *applet;
337
338
        g_slist_free (all);
338
339
 
339
340
        if (n_devices > 1) {
340
 
                char *desc;
341
 
 
342
 
                desc = (char *) utils_get_device_description (device);
343
 
                if (!desc)
344
 
                        desc = (char *) nm_device_get_iface (device);
345
 
                g_assert (desc);
346
 
 
 
341
                const char *desc;
 
342
 
 
343
                desc = nma_utils_get_device_description (device);
347
344
                text = g_strdup_printf (_("Mobile Broadband (%s)"), desc);
348
345
        } else {
349
346
                text = g_strdup (_("Mobile Broadband"));