← Back to branch summary

~ubuntu-branches/ubuntu/saucy/network-manager-applet/saucy-updates

« back to all changes in this revision

Viewing changes to .pc/lp829673_gconf_hide_applet.patch/src/applet.h

  • Committer: Package Import Robot
  • Author(s): Mathieu Trudel-Lapierre
  • Date: 2013-02-05 16:15:00 UTC
  • mfrom: (1.2.33)
  • Revision ID: package-import@ubuntu.com-20130205161500-nax1yrh7klr0o8ir
Tags: 0.9.7.995+git201301311844.0376019-0ubuntu1
* upstream snapshot 2013-01-31 18:44:13 (GMT)
  + 03760194e54eaeaf493e9b45c4835e84524d8650
* debian/patches/nm-applet-use-indicator.patch: refreshed.
* debian/patches/lp1048516_dont_req_keyring_in_greeter.patch: refreshed.
* debian/patches/lp289466_always_show_tray_icon.patch: refreshed.
* debian/patches/lp829673_gconf_hide_applet.patch: refreshed.
* debian/patches/position_dialogs_to_center_of_the_screen.patch: refreshed.
* debian/patches/hide_policy_items_env_var.patch: refreshed.
* debian/patches/lp1048520_delay_pin_dialog_in_greeter.patch: refreshed.
* debian/patches/nm-applet-use-indicator.patch: fix the addition of separator
  menu items to avoid multiple separators added in a block.
* debian/control: bump network-manager Depends and Build-Depends to the
  appropriate snapshot version.

Show diffs side-by-side

added added

removed removed

Lines of Context:
.pc/lp829673_gconf_hide_applet.patch/src/applet.h
47
47
#include "applet-agent.h"
48
48
#include "shell-watcher.h"
49
49
 
 
50
#if WITH_MODEM_MANAGER_1
 
51
#include <libmm-glib.h>
 
52
#endif
 
53
 
50
54
#define NM_TYPE_APPLET                  (nma_get_type())
51
55
#define NM_APPLET(object)               (G_TYPE_CHECK_INSTANCE_CAST((object), NM_TYPE_APPLET, NMApplet))
52
56
#define NM_APPLET_CLASS(klass)  (G_TYPE_CHECK_CLASS_CAST((klass), NM_TYPE_APPLET, NMAppletClass))
95
99
 
96
100
        GSettings *gsettings;
97
101
 
 
102
#if WITH_MODEM_MANAGER_1
 
103
        MMManager *mm1;
 
104
        gboolean   mm1_running;
 
105
#endif
 
106
 
98
107
        /* Permissions */
99
108
        NMClientPermissionResult permissions[NM_CLIENT_PERMISSION_LAST + 1];
100
109
 
103
112
        NMADeviceClass *wifi_class;
104
113
        NMADeviceClass *gsm_class;
105
114
        NMADeviceClass *cdma_class;
 
115
#if WITH_MODEM_MANAGER_1
 
116
        NMADeviceClass *broadband_class;
 
117
#endif
106
118
        NMADeviceClass *bt_class;
107
119
        NMADeviceClass *wimax_class;
108
120