applications/gnome-control-center
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

network: remove evil tabs

Browse source 
The control center style does not use tabs.
This commit is contained in:
William Jon McCann 2011-01-24 15:46:58 -05:00
parent ca533af8f3
commit 308db2da1a
8 changed files with 1707 additions and 1707 deletions
Download patch file Download diff file Expand all files Collapse all files

2722
panels/network/cc-network-panel.c
View file

File diff suppressed because it is too large Load diff

26
panels/network/cc-network-panel.h
View file

@ -29,24 +29,24 @@ G_BEGIN_DECLS
#define CC_TYPE_NETWORK_PANEL cc_network_panel_get_type() #define CC_TYPE_NETWORK_PANEL cc_network_panel_get_type()
#define CC_NETWORK_PANEL(obj) \ #define CC_NETWORK_PANEL(obj) \
(G_TYPE_CHECK_INSTANCE_CAST ((obj), \ (G_TYPE_CHECK_INSTANCE_CAST ((obj), \
CC_TYPE_NETWORK_PANEL, CcNetworkPanel)) CC_TYPE_NETWORK_PANEL, CcNetworkPanel))
#define CC_NETWORK_PANEL_CLASS(klass) \ #define CC_NETWORK_PANEL_CLASS(klass) \
(G_TYPE_CHECK_CLASS_CAST ((klass), \ (G_TYPE_CHECK_CLASS_CAST ((klass), \
CC_TYPE_NETWORK_PANEL, CcNetworkPanelClass)) CC_TYPE_NETWORK_PANEL, CcNetworkPanelClass))
#define CC_IS_NETWORK_PANEL(obj) \ #define CC_IS_NETWORK_PANEL(obj) \
(G_TYPE_CHECK_INSTANCE_TYPE ((obj), \ (G_TYPE_CHECK_INSTANCE_TYPE ((obj), \
CC_TYPE_NETWORK_PANEL)) CC_TYPE_NETWORK_PANEL))
#define CC_IS_NETWORK_PANEL_CLASS(klass) \ #define CC_IS_NETWORK_PANEL_CLASS(klass) \
(G_TYPE_CHECK_CLASS_TYPE ((klass), \ (G_TYPE_CHECK_CLASS_TYPE ((klass), \
CC_TYPE_NETWORK_PANEL)) CC_TYPE_NETWORK_PANEL))
#define CC_NETWORK_PANEL_GET_CLASS(obj) \ #define CC_NETWORK_PANEL_GET_CLASS(obj) \
(G_TYPE_INSTANCE_GET_CLASS ((obj), \ (G_TYPE_INSTANCE_GET_CLASS ((obj), \
CC_TYPE_NETWORK_PANEL, CcNetworkPanelClass)) CC_TYPE_NETWORK_PANEL, CcNetworkPanelClass))
typedef struct _CcNetworkPanel CcNetworkPanel; typedef struct _CcNetworkPanel CcNetworkPanel;
typedef struct _CcNetworkPanelClass CcNetworkPanelClass; typedef struct _CcNetworkPanelClass CcNetworkPanelClass;
@ -54,13 +54,13 @@ typedef struct _CcNetworkPanelPrivate CcNetworkPanelPrivate;
struct _CcNetworkPanel struct _CcNetworkPanel
{ {
CcPanel parent; CcPanel parent;
CcNetworkPanelPrivate *priv; CcNetworkPanelPrivate *priv;
}; };
struct _CcNetworkPanelClass struct _CcNetworkPanelClass
{ {
CcPanelClass parent_class; CcPanelClass parent_class;
}; };
GType cc_network_panel_get_type (void) G_GNUC_CONST; GType cc_network_panel_get_type (void) G_GNUC_CONST;

92
panels/network/panel-cell-renderer-mode.c
View file

@ -1,4 +1,4 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- /* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
* *
* Copyright (C) 2010 Richard Hughes <richard@hughsie.com> * Copyright (C) 2010 Richard Hughes <richard@hughsie.com>
* *
@ -28,9 +28,9 @@
#include "panel-cell-renderer-mode.h" #include "panel-cell-renderer-mode.h"
enum { enum {
PROP_0, PROP_0,
PROP_MODE, PROP_MODE,
PROP_LAST PROP_LAST
}; };
G_DEFINE_TYPE (PanelCellRendererMode, panel_cell_renderer_mode, GTK_TYPE_CELL_RENDERER_PIXBUF) G_DEFINE_TYPE (PanelCellRendererMode, panel_cell_renderer_mode, GTK_TYPE_CELL_RENDERER_PIXBUF)
@ -42,18 +42,18 @@ static gpointer parent_class = NULL;
**/ **/
static void static void
panel_cell_renderer_mode_get_property (GObject *object, guint param_id, panel_cell_renderer_mode_get_property (GObject *object, guint param_id,
GValue *value, GParamSpec *pspec) GValue *value, GParamSpec *pspec)
{ {
PanelCellRendererMode *renderer = PANEL_CELL_RENDERER_MODE (object); PanelCellRendererMode *renderer = PANEL_CELL_RENDERER_MODE (object);
switch (param_id) { switch (param_id) {
case PROP_MODE: case PROP_MODE:
g_value_set_uint (value, renderer->mode); g_value_set_uint (value, renderer->mode);
break; break;
default: default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, pspec); G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, pspec);
break; break;
} }
} }
/** /**
@ -62,12 +62,12 @@ panel_cell_renderer_mode_get_property (GObject *object, guint param_id,
static void static void
panel_cell_renderer_set_name (PanelCellRendererMode *renderer) panel_cell_renderer_set_name (PanelCellRendererMode *renderer)
{ {
const gchar *icon_name = NULL; const gchar *icon_name = NULL;
if (renderer->mode == NM_802_11_MODE_ADHOC) if (renderer->mode == NM_802_11_MODE_ADHOC)
icon_name = "network-workgroup"; icon_name = "network-workgroup";
g_object_set (renderer, "icon-name", icon_name, NULL); g_object_set (renderer, "icon-name", icon_name, NULL);
} }
/** /**
@ -75,19 +75,19 @@ panel_cell_renderer_set_name (PanelCellRendererMode *renderer)
**/ **/
static void static void
panel_cell_renderer_mode_set_property (GObject *object, guint param_id, panel_cell_renderer_mode_set_property (GObject *object, guint param_id,
const GValue *value, GParamSpec *pspec) const GValue *value, GParamSpec *pspec)
{ {
PanelCellRendererMode *renderer = PANEL_CELL_RENDERER_MODE (object); PanelCellRendererMode *renderer = PANEL_CELL_RENDERER_MODE (object);
switch (param_id) { switch (param_id) {
case PROP_MODE: case PROP_MODE:
renderer->mode = g_value_get_uint (value); renderer->mode = g_value_get_uint (value);
panel_cell_renderer_set_name (renderer); panel_cell_renderer_set_name (renderer);
break; break;
default: default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, pspec); G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, pspec);
break; break;
} }
} }
/** /**
@ -96,10 +96,10 @@ panel_cell_renderer_mode_set_property (GObject *object, guint param_id,
static void static void
panel_cell_renderer_finalize (GObject *object) panel_cell_renderer_finalize (GObject *object)
{ {
PanelCellRendererMode *renderer; PanelCellRendererMode *renderer;
renderer = PANEL_CELL_RENDERER_MODE (object); renderer = PANEL_CELL_RENDERER_MODE (object);
g_free (renderer->icon_name); g_free (renderer->icon_name);
G_OBJECT_CLASS (parent_class)->finalize (object); G_OBJECT_CLASS (parent_class)->finalize (object);
} }
/** /**
@ -108,19 +108,19 @@ panel_cell_renderer_finalize (GObject *object)
static void static void
panel_cell_renderer_mode_class_init (PanelCellRendererModeClass *class) panel_cell_renderer_mode_class_init (PanelCellRendererModeClass *class)
{ {
GObjectClass *object_class = G_OBJECT_CLASS (class); GObjectClass *object_class = G_OBJECT_CLASS (class);
object_class->finalize = panel_cell_renderer_finalize; object_class->finalize = panel_cell_renderer_finalize;
parent_class = g_type_class_peek_parent (class); parent_class = g_type_class_peek_parent (class);
object_class->get_property = panel_cell_renderer_mode_get_property; object_class->get_property = panel_cell_renderer_mode_get_property;
object_class->set_property = panel_cell_renderer_mode_set_property; object_class->set_property = panel_cell_renderer_mode_set_property;
g_object_class_install_property (object_class, PROP_MODE, g_object_class_install_property (object_class, PROP_MODE,
g_param_spec_uint ("mode", NULL, g_param_spec_uint ("mode", NULL,
NULL, NULL,
0, G_MAXUINT, 0, 0, G_MAXUINT, 0,
G_PARAM_READWRITE)); G_PARAM_READWRITE));
} }
/** /**
@ -129,8 +129,8 @@ panel_cell_renderer_mode_class_init (PanelCellRendererModeClass *class)
static void static void
panel_cell_renderer_mode_init (PanelCellRendererMode *renderer) panel_cell_renderer_mode_init (PanelCellRendererMode *renderer)
{ {
renderer->mode = 0; renderer->mode = 0;
renderer->icon_name = NULL; renderer->icon_name = NULL;
} }
/** /**
@ -139,6 +139,6 @@ panel_cell_renderer_mode_init (PanelCellRendererMode *renderer)
GtkCellRenderer * GtkCellRenderer *
panel_cell_renderer_mode_new (void) panel_cell_renderer_mode_new (void)
{ {
return g_object_new (PANEL_TYPE_CELL_RENDERER_MODE, NULL); return g_object_new (PANEL_TYPE_CELL_RENDERER_MODE, NULL);
} }

30
panels/network/panel-cell-renderer-mode.h
View file

@ -1,4 +1,4 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- /* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
* *
* Copyright (C) 2010 Richard Hughes <richard@hughsie.com> * Copyright (C) 2010 Richard Hughes <richard@hughsie.com>
* *
@ -27,32 +27,32 @@
#include "panel-common.h" #include "panel-common.h"
#define PANEL_TYPE_CELL_RENDERER_MODE (panel_cell_renderer_mode_get_type()) #define PANEL_TYPE_CELL_RENDERER_MODE (panel_cell_renderer_mode_get_type())
#define PANEL_CELL_RENDERER_MODE(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), PANEL_TYPE_CELL_RENDERER_MODE, PanelCellRendererMode)) #define PANEL_CELL_RENDERER_MODE(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), PANEL_TYPE_CELL_RENDERER_MODE, PanelCellRendererMode))
#define PANEL_CELL_RENDERER_MODE_CLASS(cls) (G_TYPE_CHECK_CLASS_CAST((cls), PANEL_TYPE_CELL_RENDERER_MODE, PanelCellRendererModeClass)) #define PANEL_CELL_RENDERER_MODE_CLASS(cls) (G_TYPE_CHECK_CLASS_CAST((cls), PANEL_TYPE_CELL_RENDERER_MODE, PanelCellRendererModeClass))
#define PANEL_IS_CELL_RENDERER_MODE(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), PANEL_TYPE_CELL_RENDERER_MODE)) #define PANEL_IS_CELL_RENDERER_MODE(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), PANEL_TYPE_CELL_RENDERER_MODE))
#define PANEL_IS_CELL_RENDERER_MODE_CLASS(cls) (G_TYPE_CHECK_CLASS_TYPE((cls), PANEL_TYPE_CELL_RENDERER_MODE)) #define PANEL_IS_CELL_RENDERER_MODE_CLASS(cls) (G_TYPE_CHECK_CLASS_TYPE((cls), PANEL_TYPE_CELL_RENDERER_MODE))
#define PANEL_CELL_RENDERER_MODE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), PANEL_TYPE_CELL_RENDERER_MODE, PanelCellRendererModeClass)) #define PANEL_CELL_RENDERER_MODE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), PANEL_TYPE_CELL_RENDERER_MODE, PanelCellRendererModeClass))
G_BEGIN_DECLS G_BEGIN_DECLS
typedef struct _PanelCellRendererMode PanelCellRendererMode; typedef struct _PanelCellRendererMode PanelCellRendererMode;
typedef struct _PanelCellRendererModeClass PanelCellRendererModeClass; typedef struct _PanelCellRendererModeClass PanelCellRendererModeClass;
struct _PanelCellRendererMode struct _PanelCellRendererMode
{ {
GtkCellRendererPixbuf parent; GtkCellRendererPixbuf parent;
guint mode; guint mode;
gchar *icon_name; gchar *icon_name;
}; };
struct _PanelCellRendererModeClass struct _PanelCellRendererModeClass
{ {
GtkCellRendererPixbufClass parent_class; GtkCellRendererPixbufClass parent_class;
}; };
GType panel_cell_renderer_mode_get_type (void); GType panel_cell_renderer_mode_get_type (void);
GtkCellRenderer *panel_cell_renderer_mode_new (void); GtkCellRenderer *panel_cell_renderer_mode_new (void);
G_END_DECLS G_END_DECLS

114
panels/network/panel-cell-renderer-signal.c
View file

@ -1,4 +1,4 @@
/* -*- Signal: C; tab-width: 8; indent-tabs-signal: t; c-basic-offset: 8 -*- /* -*- Mode: C; tab-width: 8; indent-tabs-signal: nil; c-basic-offset: 8 -*-
* *
* Copyright (C) 2010 Richard Hughes <richard@hughsie.com> * Copyright (C) 2010 Richard Hughes <richard@hughsie.com>
* *
@ -28,9 +28,9 @@
#include "panel-cell-renderer-signal.h" #include "panel-cell-renderer-signal.h"
enum { enum {
PROP_0, PROP_0,
PROP_SIGNAL, PROP_SIGNAL,
PROP_LAST PROP_LAST
}; };
G_DEFINE_TYPE (PanelCellRendererSignal, panel_cell_renderer_signal, GTK_TYPE_CELL_RENDERER_PIXBUF) G_DEFINE_TYPE (PanelCellRendererSignal, panel_cell_renderer_signal, GTK_TYPE_CELL_RENDERER_PIXBUF)
@ -42,18 +42,18 @@ static gpointer parent_class = NULL;
**/ **/
static void static void
panel_cell_renderer_signal_get_property (GObject *object, guint param_id, panel_cell_renderer_signal_get_property (GObject *object, guint param_id,
GValue *value, GParamSpec *pspec) GValue *value, GParamSpec *pspec)
{ {
PanelCellRendererSignal *renderer = PANEL_CELL_RENDERER_SIGNAL (object); PanelCellRendererSignal *renderer = PANEL_CELL_RENDERER_SIGNAL (object);
switch (param_id) { switch (param_id) {
case PROP_SIGNAL: case PROP_SIGNAL:
g_value_set_uint (value, renderer->signal); g_value_set_uint (value, renderer->signal);
break; break;
default: default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, pspec); G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, pspec);
break; break;
} }
} }
/** /**
@ -62,23 +62,23 @@ panel_cell_renderer_signal_get_property (GObject *object, guint param_id,
static void static void
panel_cell_renderer_set_name (PanelCellRendererSignal *renderer) panel_cell_renderer_set_name (PanelCellRendererSignal *renderer)
{ {
const gchar *icon_name = NULL; const gchar *icon_name = NULL;
GIcon *icon; GIcon *icon;
if (renderer->signal < 20) if (renderer->signal < 20)
icon_name = "network-wireless-signal-none-symbolic"; icon_name = "network-wireless-signal-none-symbolic";
else if (renderer->signal < 40) else if (renderer->signal < 40)
icon_name = "network-wireless-signal-weak-symbolic"; icon_name = "network-wireless-signal-weak-symbolic";
else if (renderer->signal < 50) else if (renderer->signal < 50)
icon_name = "network-wireless-signal-ok-symbolic"; icon_name = "network-wireless-signal-ok-symbolic";
else if (renderer->signal < 80) else if (renderer->signal < 80)
icon_name = "network-wireless-signal-good-symbolic"; icon_name = "network-wireless-signal-good-symbolic";
else else
icon_name = "network-wireless-signal-excellent-symbolic"; icon_name = "network-wireless-signal-excellent-symbolic";
icon = g_themed_icon_new_with_default_fallbacks (icon_name); icon = g_themed_icon_new_with_default_fallbacks (icon_name);
g_object_set (renderer, "gicon", icon, NULL); g_object_set (renderer, "gicon", icon, NULL);
g_object_unref (icon); g_object_unref (icon);
} }
/** /**
@ -86,19 +86,19 @@ panel_cell_renderer_set_name (PanelCellRendererSignal *renderer)
**/ **/
static void static void
panel_cell_renderer_signal_set_property (GObject *object, guint param_id, panel_cell_renderer_signal_set_property (GObject *object, guint param_id,
const GValue *value, GParamSpec *pspec) const GValue *value, GParamSpec *pspec)
{ {
PanelCellRendererSignal *renderer = PANEL_CELL_RENDERER_SIGNAL (object); PanelCellRendererSignal *renderer = PANEL_CELL_RENDERER_SIGNAL (object);
switch (param_id) { switch (param_id) {
case PROP_SIGNAL: case PROP_SIGNAL:
renderer->signal = g_value_get_uint (value); renderer->signal = g_value_get_uint (value);
panel_cell_renderer_set_name (renderer); panel_cell_renderer_set_name (renderer);
break; break;
default: default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, pspec); G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, pspec);
break; break;
} }
} }
/** /**
@ -107,10 +107,10 @@ panel_cell_renderer_signal_set_property (GObject *object, guint param_id,
static void static void
panel_cell_renderer_finalize (GObject *object) panel_cell_renderer_finalize (GObject *object)
{ {
PanelCellRendererSignal *renderer; PanelCellRendererSignal *renderer;
renderer = PANEL_CELL_RENDERER_SIGNAL (object); renderer = PANEL_CELL_RENDERER_SIGNAL (object);
g_free (renderer->icon_name); g_free (renderer->icon_name);
G_OBJECT_CLASS (parent_class)->finalize (object); G_OBJECT_CLASS (parent_class)->finalize (object);
} }
/** /**
@ -119,19 +119,19 @@ panel_cell_renderer_finalize (GObject *object)
static void static void
panel_cell_renderer_signal_class_init (PanelCellRendererSignalClass *class) panel_cell_renderer_signal_class_init (PanelCellRendererSignalClass *class)
{ {
GObjectClass *object_class = G_OBJECT_CLASS (class); GObjectClass *object_class = G_OBJECT_CLASS (class);
object_class->finalize = panel_cell_renderer_finalize; object_class->finalize = panel_cell_renderer_finalize;
parent_class = g_type_class_peek_parent (class); parent_class = g_type_class_peek_parent (class);
object_class->get_property = panel_cell_renderer_signal_get_property; object_class->get_property = panel_cell_renderer_signal_get_property;
object_class->set_property = panel_cell_renderer_signal_set_property; object_class->set_property = panel_cell_renderer_signal_set_property;
g_object_class_install_property (object_class, PROP_SIGNAL, g_object_class_install_property (object_class, PROP_SIGNAL,
g_param_spec_uint ("signal", NULL, g_param_spec_uint ("signal", NULL,
NULL, NULL,
0, G_MAXUINT, 0, 0, G_MAXUINT, 0,
G_PARAM_READWRITE)); G_PARAM_READWRITE));
} }
/** /**
@ -140,8 +140,8 @@ panel_cell_renderer_signal_class_init (PanelCellRendererSignalClass *class)
static void static void
panel_cell_renderer_signal_init (PanelCellRendererSignal *renderer) panel_cell_renderer_signal_init (PanelCellRendererSignal *renderer)
{ {
renderer->signal = 0; renderer->signal = 0;
renderer->icon_name = NULL; renderer->icon_name = NULL;
} }
/** /**
@ -150,6 +150,6 @@ panel_cell_renderer_signal_init (PanelCellRendererSignal *renderer)
GtkCellRenderer * GtkCellRenderer *
panel_cell_renderer_signal_new (void) panel_cell_renderer_signal_new (void)
{ {
return g_object_new (PANEL_TYPE_CELL_RENDERER_SIGNAL, NULL); return g_object_new (PANEL_TYPE_CELL_RENDERER_SIGNAL, NULL);
} }

30
panels/network/panel-cell-renderer-signal.h
View file

@ -1,4 +1,4 @@
/* -*- Signal: C; tab-width: 8; indent-tabs-signal: t; c-basic-offset: 8 -*- /* -*- Mode: C; tab-width: 8; indent-tabs-signal: nil; c-basic-offset: 8 -*-
* *
* Copyright (C) 2010 Richard Hughes <richard@hughsie.com> * Copyright (C) 2010 Richard Hughes <richard@hughsie.com>
* *
@ -27,32 +27,32 @@
#include "panel-common.h" #include "panel-common.h"
#define PANEL_TYPE_CELL_RENDERER_SIGNAL (panel_cell_renderer_signal_get_type()) #define PANEL_TYPE_CELL_RENDERER_SIGNAL (panel_cell_renderer_signal_get_type())
#define PANEL_CELL_RENDERER_SIGNAL(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), PANEL_TYPE_CELL_RENDERER_SIGNAL, PanelCellRendererSignal)) #define PANEL_CELL_RENDERER_SIGNAL(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), PANEL_TYPE_CELL_RENDERER_SIGNAL, PanelCellRendererSignal))
#define PANEL_CELL_RENDERER_SIGNAL_CLASS(cls) (G_TYPE_CHECK_CLASS_CAST((cls), PANEL_TYPE_CELL_RENDERER_SIGNAL, PanelCellRendererSignalClass)) #define PANEL_CELL_RENDERER_SIGNAL_CLASS(cls) (G_TYPE_CHECK_CLASS_CAST((cls), PANEL_TYPE_CELL_RENDERER_SIGNAL, PanelCellRendererSignalClass))
#define PANEL_IS_CELL_RENDERER_SIGNAL(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), PANEL_TYPE_CELL_RENDERER_SIGNAL)) #define PANEL_IS_CELL_RENDERER_SIGNAL(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), PANEL_TYPE_CELL_RENDERER_SIGNAL))
#define PANEL_IS_CELL_RENDERER_SIGNAL_CLASS(cls) (G_TYPE_CHECK_CLASS_TYPE((cls), PANEL_TYPE_CELL_RENDERER_SIGNAL)) #define PANEL_IS_CELL_RENDERER_SIGNAL_CLASS(cls) (G_TYPE_CHECK_CLASS_TYPE((cls), PANEL_TYPE_CELL_RENDERER_SIGNAL))
#define PANEL_CELL_RENDERER_SIGNAL_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), PANEL_TYPE_CELL_RENDERER_SIGNAL, PanelCellRendererSignalClass)) #define PANEL_CELL_RENDERER_SIGNAL_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), PANEL_TYPE_CELL_RENDERER_SIGNAL, PanelCellRendererSignalClass))
G_BEGIN_DECLS G_BEGIN_DECLS
typedef struct _PanelCellRendererSignal PanelCellRendererSignal; typedef struct _PanelCellRendererSignal PanelCellRendererSignal;
typedef struct _PanelCellRendererSignalClass PanelCellRendererSignalClass; typedef struct _PanelCellRendererSignalClass PanelCellRendererSignalClass;
struct _PanelCellRendererSignal struct _PanelCellRendererSignal
{ {
GtkCellRendererPixbuf parent; GtkCellRendererPixbuf parent;
guint signal; guint signal;
gchar *icon_name; gchar *icon_name;
}; };
struct _PanelCellRendererSignalClass struct _PanelCellRendererSignalClass
{ {
GtkCellRendererPixbufClass parent_class; GtkCellRendererPixbufClass parent_class;
}; };
GType panel_cell_renderer_signal_get_type (void); GType panel_cell_renderer_signal_get_type (void);
GtkCellRenderer *panel_cell_renderer_signal_new (void); GtkCellRenderer *panel_cell_renderer_signal_new (void);
G_END_DECLS G_END_DECLS

344
panels/network/panel-common.c
View file

@ -1,4 +1,4 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- /* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
* *
* Copyright (C) 2010 Richard Hughes <richard@hughsie.com> * Copyright (C) 2010 Richard Hughes <richard@hughsie.com>
* *
@ -34,22 +34,22 @@
const gchar * const gchar *
panel_device_type_to_icon_name (guint type) panel_device_type_to_icon_name (guint type)
{ {
const gchar *value = NULL; const gchar *value = NULL;
switch (type) { switch (type) {
case NM_DEVICE_TYPE_ETHERNET: case NM_DEVICE_TYPE_ETHERNET:
value = "network-wired"; value = "network-wired";
break; break;
case NM_DEVICE_TYPE_WIFI: case NM_DEVICE_TYPE_WIFI:
case NM_DEVICE_TYPE_GSM: case NM_DEVICE_TYPE_GSM:
case NM_DEVICE_TYPE_CDMA: case NM_DEVICE_TYPE_CDMA:
case NM_DEVICE_TYPE_BLUETOOTH: case NM_DEVICE_TYPE_BLUETOOTH:
case NM_DEVICE_TYPE_MESH: case NM_DEVICE_TYPE_MESH:
value = "network-wireless"; value = "network-wireless";
break; break;
default: default:
break; break;
} }
return value; return value;
} }
/** /**
@ -58,38 +58,38 @@ panel_device_type_to_icon_name (guint type)
const gchar * const gchar *
panel_device_type_to_localized_string (guint type) panel_device_type_to_localized_string (guint type)
{ {
const gchar *value = NULL; const gchar *value = NULL;
switch (type) { switch (type) {
case NM_DEVICE_TYPE_UNKNOWN: case NM_DEVICE_TYPE_UNKNOWN:
/* TRANSLATORS: device type */ /* TRANSLATORS: device type */
value = _("Unknown"); value = _("Unknown");
break; break;
case NM_DEVICE_TYPE_ETHERNET: case NM_DEVICE_TYPE_ETHERNET:
/* TRANSLATORS: device type */ /* TRANSLATORS: device type */
value = _("Wired"); value = _("Wired");
break; break;
case NM_DEVICE_TYPE_WIFI: case NM_DEVICE_TYPE_WIFI:
/* TRANSLATORS: device type */ /* TRANSLATORS: device type */
value = _("Wireless"); value = _("Wireless");
break; break;
case NM_DEVICE_TYPE_GSM: case NM_DEVICE_TYPE_GSM:
case NM_DEVICE_TYPE_CDMA: case NM_DEVICE_TYPE_CDMA:
/* TRANSLATORS: device type */ /* TRANSLATORS: device type */
value = _("Mobile broadband"); value = _("Mobile broadband");
break; break;
case NM_DEVICE_TYPE_BLUETOOTH: case NM_DEVICE_TYPE_BLUETOOTH:
/* TRANSLATORS: device type */ /* TRANSLATORS: device type */
value = _("Bluetooth"); value = _("Bluetooth");
break; break;
case NM_DEVICE_TYPE_MESH: case NM_DEVICE_TYPE_MESH:
/* TRANSLATORS: device type */ /* TRANSLATORS: device type */
value = _("Mesh"); value = _("Mesh");
break; break;
default: default:
break; break;
} }
return value; return value;
} }
/** /**
@ -100,29 +100,29 @@ panel_device_type_to_localized_string (guint type)
const gchar * const gchar *
panel_device_type_to_sortable_string (guint type) panel_device_type_to_sortable_string (guint type)
{ {
const gchar *value = NULL; const gchar *value = NULL;
switch (type) { switch (type) {
case NM_DEVICE_TYPE_ETHERNET: case NM_DEVICE_TYPE_ETHERNET:
value = "1"; value = "1";
break; break;
case NM_DEVICE_TYPE_WIFI: case NM_DEVICE_TYPE_WIFI:
value = "2"; value = "2";
break; break;
case NM_DEVICE_TYPE_GSM: case NM_DEVICE_TYPE_GSM:
case NM_DEVICE_TYPE_CDMA: case NM_DEVICE_TYPE_CDMA:
value = "3"; value = "3";
break; break;
case NM_DEVICE_TYPE_BLUETOOTH: case NM_DEVICE_TYPE_BLUETOOTH:
value = "4"; value = "4";
break; break;
case NM_DEVICE_TYPE_MESH: case NM_DEVICE_TYPE_MESH:
value = "5"; value = "5";
break; break;
default: default:
value = "6"; value = "6";
break; break;
} }
return value; return value;
} }
/** /**
@ -131,24 +131,24 @@ panel_device_type_to_sortable_string (guint type)
const gchar * const gchar *
panel_ap_mode_to_localized_string (guint mode) panel_ap_mode_to_localized_string (guint mode)
{ {
const gchar *value = NULL; const gchar *value = NULL;
switch (mode) { switch (mode) {
case NM_802_11_MODE_UNKNOWN: case NM_802_11_MODE_UNKNOWN:
/* TRANSLATORS: AP type */ /* TRANSLATORS: AP type */
value = _("Unknown"); value = _("Unknown");
break; break;
case NM_802_11_MODE_ADHOC: case NM_802_11_MODE_ADHOC:
/* TRANSLATORS: AP type */ /* TRANSLATORS: AP type */
value = _("Ad-hoc"); value = _("Ad-hoc");
break; break;
case NM_802_11_MODE_INFRA: case NM_802_11_MODE_INFRA:
/* TRANSLATORS: AP type */ /* TRANSLATORS: AP type */
value = _("Infrastructure"); value = _("Infrastructure");
break; break;
default: default:
break; break;
} }
return value; return value;
} }
/** /**
@ -157,52 +157,52 @@ panel_ap_mode_to_localized_string (guint mode)
const gchar * const gchar *
panel_device_state_to_localized_string (guint type) panel_device_state_to_localized_string (guint type)
{ {
const gchar *value = NULL; const gchar *value = NULL;
switch (type) { switch (type) {
case NM_DEVICE_STATE_UNKNOWN: case NM_DEVICE_STATE_UNKNOWN:
/* TRANSLATORS: device status */ /* TRANSLATORS: device status */
value = _("Status unknown"); value = _("Status unknown");
break; break;
case NM_DEVICE_STATE_UNMANAGED: case NM_DEVICE_STATE_UNMANAGED:
/* TRANSLATORS: device status */ /* TRANSLATORS: device status */
value = _("Unmanaged"); value = _("Unmanaged");
break; break;
case NM_DEVICE_STATE_UNAVAILABLE: case NM_DEVICE_STATE_UNAVAILABLE:
/* TRANSLATORS: device status */ /* TRANSLATORS: device status */
value = _("Unavailable"); value = _("Unavailable");
break; break;
case NM_DEVICE_STATE_DISCONNECTED: case NM_DEVICE_STATE_DISCONNECTED:
/* TRANSLATORS: device status */ /* TRANSLATORS: device status */
value = _("Disconnected"); value = _("Disconnected");
break; break;
case NM_DEVICE_STATE_PREPARE: case NM_DEVICE_STATE_PREPARE:
/* TRANSLATORS: device status */ /* TRANSLATORS: device status */
value = _("Preparing connection"); value = _("Preparing connection");
break; break;
case NM_DEVICE_STATE_CONFIG: case NM_DEVICE_STATE_CONFIG:
/* TRANSLATORS: device status */ /* TRANSLATORS: device status */
value = _("Configuring connection"); value = _("Configuring connection");
break; break;
case NM_DEVICE_STATE_NEED_AUTH: case NM_DEVICE_STATE_NEED_AUTH:
/* TRANSLATORS: device status */ /* TRANSLATORS: device status */
value = _("Authenticating"); value = _("Authenticating");
break; break;
case NM_DEVICE_STATE_IP_CONFIG: case NM_DEVICE_STATE_IP_CONFIG:
/* TRANSLATORS: device status */ /* TRANSLATORS: device status */
value = _("Getting network address"); value = _("Getting network address");
break; break;
case NM_DEVICE_STATE_ACTIVATED: case NM_DEVICE_STATE_ACTIVATED:
/* TRANSLATORS: device status */ /* TRANSLATORS: device status */
value = _("Connected"); value = _("Connected");
break; break;
case NM_DEVICE_STATE_FAILED: case NM_DEVICE_STATE_FAILED:
/* TRANSLATORS: device status */ /* TRANSLATORS: device status */
value = _("Failed to connect"); value = _("Failed to connect");
break; break;
default: default:
break; break;
} }
return value; return value;
} }
/** /**
@ -211,16 +211,16 @@ panel_device_state_to_localized_string (guint type)
gchar * gchar *
panel_ipv4_to_string (GVariant *variant) panel_ipv4_to_string (GVariant *variant)
{ {
gchar *ip_str; gchar *ip_str;
guint32 ip; guint32 ip;
g_variant_get (variant, "u", &ip); g_variant_get (variant, "u", &ip);
ip_str = g_strdup_printf ("%i.%i.%i.%i", ip_str = g_strdup_printf ("%i.%i.%i.%i",
ip & 0x000000ff, ip & 0x000000ff,
(ip & 0x0000ff00) / 0x100, (ip & 0x0000ff00) / 0x100,
(ip & 0x00ff0000) / 0x10000, (ip & 0x00ff0000) / 0x10000,
(ip & 0xff000000) / 0x1000000); (ip & 0xff000000) / 0x1000000);
return ip_str; return ip_str;
} }
/** /**
@ -232,34 +232,34 @@ panel_ipv4_to_string (GVariant *variant)
gchar * gchar *
panel_ipv6_to_string (GVariant *variant) panel_ipv6_to_string (GVariant *variant)
{ {
gchar tmp1; gchar tmp1;
gchar tmp2; gchar tmp2;
guint i = 0; guint i = 0;
gboolean ret = FALSE; gboolean ret = FALSE;
GString *string; GString *string;
if (g_variant_n_children (variant) != 16) if (g_variant_n_children (variant) != 16)
return NULL; return NULL;
string = g_string_new (""); string = g_string_new ("");
for (i=0; i<16; i+=2) { for (i=0; i<16; i+=2) {
g_variant_get_child (variant, i+0, "y", &tmp1); g_variant_get_child (variant, i+0, "y", &tmp1);
g_variant_get_child (variant, i+1, "y", &tmp2); g_variant_get_child (variant, i+1, "y", &tmp2);
if (tmp1 == 0 && tmp2 == 0) { if (tmp1 == 0 && tmp2 == 0) {
if (!ret) { if (!ret) {
g_string_append (string, ":"); g_string_append (string, ":");
ret = TRUE; ret = TRUE;
} }
} else { } else {
g_string_append_printf (string, g_string_append_printf (string,
"%x%x%x%x:", "%x%x%x%x:",
(tmp1 & 0xf0) / 16, (tmp1 & 0xf0) / 16,
tmp1 & 0x0f, tmp1 & 0x0f,
(tmp2 & 0xf0) / 16, (tmp2 & 0xf0) / 16,
tmp2 & 0x0f); tmp2 & 0x0f);
ret = FALSE; ret = FALSE;
} }
} }
g_string_set_size (string, string->len - 1); g_string_set_size (string, string->len - 1);
return g_string_free (string, FALSE); return g_string_free (string, FALSE);
} }

56
panels/network/panel-common.h
View file

@ -1,4 +1,4 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- /* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
* *
* Copyright (C) 2010 Richard Hughes <richard@hughsie.com> * Copyright (C) 2010 Richard Hughes <richard@hughsie.com>
* *
@ -27,41 +27,41 @@
G_BEGIN_DECLS G_BEGIN_DECLS
typedef enum { typedef enum {
NM_DEVICE_TYPE_UNKNOWN, NM_DEVICE_TYPE_UNKNOWN,
NM_DEVICE_TYPE_ETHERNET, NM_DEVICE_TYPE_ETHERNET,
NM_DEVICE_TYPE_WIFI, NM_DEVICE_TYPE_WIFI,
NM_DEVICE_TYPE_GSM, NM_DEVICE_TYPE_GSM,
NM_DEVICE_TYPE_CDMA, NM_DEVICE_TYPE_CDMA,
NM_DEVICE_TYPE_BLUETOOTH, NM_DEVICE_TYPE_BLUETOOTH,
NM_DEVICE_TYPE_MESH NM_DEVICE_TYPE_MESH
} NMDeviceType; } NMDeviceType;
typedef enum { typedef enum {
NM_DEVICE_STATE_UNKNOWN, NM_DEVICE_STATE_UNKNOWN,
NM_DEVICE_STATE_UNMANAGED, NM_DEVICE_STATE_UNMANAGED,
NM_DEVICE_STATE_UNAVAILABLE, NM_DEVICE_STATE_UNAVAILABLE,
NM_DEVICE_STATE_DISCONNECTED, NM_DEVICE_STATE_DISCONNECTED,
NM_DEVICE_STATE_PREPARE, NM_DEVICE_STATE_PREPARE,
NM_DEVICE_STATE_CONFIG, NM_DEVICE_STATE_CONFIG,
NM_DEVICE_STATE_NEED_AUTH, NM_DEVICE_STATE_NEED_AUTH,
NM_DEVICE_STATE_IP_CONFIG, NM_DEVICE_STATE_IP_CONFIG,
NM_DEVICE_STATE_ACTIVATED, NM_DEVICE_STATE_ACTIVATED,
NM_DEVICE_STATE_FAILED NM_DEVICE_STATE_FAILED
} NMDeviceState; } NMDeviceState;
typedef enum { typedef enum {
NM_802_11_MODE_UNKNOWN = 0, NM_802_11_MODE_UNKNOWN = 0,
NM_802_11_MODE_ADHOC, NM_802_11_MODE_ADHOC,
NM_802_11_MODE_INFRA NM_802_11_MODE_INFRA
} NM80211Mode; } NM80211Mode;
const gchar *panel_device_type_to_icon_name (guint type); const gchar *panel_device_type_to_icon_name (guint type);
const gchar *panel_device_type_to_localized_string (guint type); const gchar *panel_device_type_to_localized_string (guint type);
const gchar *panel_device_type_to_sortable_string (guint type); const gchar *panel_device_type_to_sortable_string (guint type);
const gchar *panel_ap_mode_to_localized_string (guint mode); const gchar *panel_ap_mode_to_localized_string (guint mode);
const gchar *panel_device_state_to_localized_string (guint type); const gchar *panel_device_state_to_localized_string (guint type);
gchar *panel_ipv4_to_string (GVariant *variant); gchar *panel_ipv4_to_string (GVariant *variant);
gchar *panel_ipv6_to_string (GVariant *variant); gchar *panel_ipv6_to_string (GVariant *variant);
G_END_DECLS G_END_DECLS