From 28746145ec16438e8d6dbf1f3b0a44cdfb2cd9a9 Mon Sep 17 00:00:00 2001 From: Richard Hughes Date: Thu, 2 Dec 2010 16:02:50 +0000 Subject: [PATCH] Rename the network panel to 'proxy' so we can work on a true network panel that uses NetworkManager --- configure.ac | 4 +- panels/Makefile.am | 2 +- panels/{network => proxy}/Makefile.am | 32 +++++------ .../cc-proxy-panel.c} | 50 +++++++++--------- .../cc-proxy-panel.h} | 44 +++++++-------- .../gnome-proxy-panel.desktop.in.in} | 0 .../gnome-proxy-properties.c} | 4 +- .../gnome-proxy-properties.ui} | 0 .../icons/16x16/gnome-proxy-properties.png} | Bin .../icons/22x22/gnome-proxy-properties.png} | Bin .../icons/24x24/gnome-proxy-properties.png} | Bin .../icons/32x32/gnome-proxy-properties.png} | Bin .../icons/48x48/gnome-proxy-properties.png} | Bin .../scalable/gnome-proxy-properties.svg} | 0 .../network-module.c => proxy/proxy-module.c} | 4 +- po/POTFILES.in | 6 +-- 16 files changed, 73 insertions(+), 73 deletions(-) rename panels/{network => proxy}/Makefile.am (60%) rename panels/{network/cc-network-panel.c => proxy/cc-proxy-panel.c} (61%) rename panels/{network/cc-network-panel.h => proxy/cc-proxy-panel.h} (57%) rename panels/{network/gnome-network-panel.desktop.in.in => proxy/gnome-proxy-panel.desktop.in.in} (100%) rename panels/{network/gnome-network-properties.c => proxy/gnome-proxy-properties.c} (99%) rename panels/{network/gnome-network-properties.ui => proxy/gnome-proxy-properties.ui} (100%) rename panels/{network/icons/16x16/gnome-network-properties.png => proxy/icons/16x16/gnome-proxy-properties.png} (100%) rename panels/{network/icons/22x22/gnome-network-properties.png => proxy/icons/22x22/gnome-proxy-properties.png} (100%) rename panels/{network/icons/24x24/gnome-network-properties.png => proxy/icons/24x24/gnome-proxy-properties.png} (100%) rename panels/{network/icons/32x32/gnome-network-properties.png => proxy/icons/32x32/gnome-proxy-properties.png} (100%) rename panels/{network/icons/48x48/gnome-network-properties.png => proxy/icons/48x48/gnome-proxy-properties.png} (100%) rename panels/{network/icons/scalable/gnome-network-properties.svg => proxy/icons/scalable/gnome-proxy-properties.svg} (100%) rename panels/{network/network-module.c => proxy/proxy-module.c} (94%) diff --git a/configure.ac b/configure.ac index e43738596..b4fb16637 100644 --- a/configure.ac +++ b/configure.ac @@ -343,8 +343,8 @@ panels/media/Makefile panels/media/gnome-media-panel.desktop.in panels/mouse/Makefile panels/mouse/gnome-mouse-panel.desktop.in -panels/network/Makefile -panels/network/gnome-network-panel.desktop.in +panels/proxy/Makefile +panels/proxy/gnome-proxy-panel.desktop.in panels/sound/Makefile panels/sound/data/Makefile panels/sound/data/gnome-sound-panel.desktop.in diff --git a/panels/Makefile.am b/panels/Makefile.am index 39c5e4b35..b4b6f89a2 100644 --- a/panels/Makefile.am +++ b/panels/Makefile.am @@ -6,7 +6,7 @@ SUBDIRS= \ media \ mouse \ region \ - network \ + proxy \ sound \ default-applications \ keyboard \ diff --git a/panels/network/Makefile.am b/panels/proxy/Makefile.am similarity index 60% rename from panels/network/Makefile.am rename to panels/proxy/Makefile.am index a515ef230..5a8d37324 100644 --- a/panels/network/Makefile.am +++ b/panels/proxy/Makefile.am @@ -1,38 +1,38 @@ # This is used in GNOMECC_CAPPLETS_CFLAGS -cappletname = network +cappletname = proxy ccpanelsdir = $(PANELS_DIR) -ccpanels_LTLIBRARIES = libnetwork.la +ccpanels_LTLIBRARIES = libproxy.la -libnetwork_la_SOURCES = gnome-network-properties.c \ - cc-network-panel.c \ - cc-network-panel.h \ - network-module.c -libnetwork_la_LIBADD = $(PANEL_LIBS) $(GNOMECC_CAPPLETS_LIBS) -libnetwork_la_LDFLAGS = $(PANEL_LDFLAGS) +libproxy_la_SOURCES = gnome-proxy-properties.c \ + cc-proxy-panel.c \ + cc-proxy-panel.h \ + proxy-module.c +libproxy_la_LIBADD = $(PANEL_LIBS) $(GNOMECC_CAPPLETS_LIBS) +libproxy_la_LDFLAGS = $(PANEL_LDFLAGS) @INTLTOOL_DESKTOP_RULE@ uidir = $(pkgdatadir)/ui -dist_ui_DATA = gnome-network-properties.ui +dist_ui_DATA = gnome-proxy-properties.ui icons16dir = $(datadir)/icons/hicolor/16x16/apps -dist_icons16_DATA = icons/16x16/gnome-network-properties.png +dist_icons16_DATA = icons/16x16/gnome-proxy-properties.png icons22dir = $(datadir)/icons/hicolor/22x22/apps -dist_icons22_DATA = icons/22x22/gnome-network-properties.png +dist_icons22_DATA = icons/22x22/gnome-proxy-properties.png icons24dir = $(datadir)/icons/hicolor/24x24/apps -dist_icons24_DATA = icons/24x24/gnome-network-properties.png +dist_icons24_DATA = icons/24x24/gnome-proxy-properties.png icons32dir = $(datadir)/icons/hicolor/32x32/apps -dist_icons32_DATA = icons/32x32/gnome-network-properties.png +dist_icons32_DATA = icons/32x32/gnome-proxy-properties.png icons48dir = $(datadir)/icons/hicolor/48x48/apps -dist_icons48_DATA = icons/48x48/gnome-network-properties.png +dist_icons48_DATA = icons/48x48/gnome-proxy-properties.png iconssvgdir = $(datadir)/icons/hicolor/scalable/apps -dist_iconssvg_DATA = icons/scalable/gnome-network-properties.svg +dist_iconssvg_DATA = icons/scalable/gnome-proxy-properties.svg desktopdir = $(datadir)/applications -desktop_in_files = gnome-network-panel.desktop.in +desktop_in_files = gnome-proxy-panel.desktop.in desktop_DATA = $(desktop_in_files:.desktop.in=.desktop) INCLUDES = \ diff --git a/panels/network/cc-network-panel.c b/panels/proxy/cc-proxy-panel.c similarity index 61% rename from panels/network/cc-network-panel.c rename to panels/proxy/cc-proxy-panel.c index 2be760032..05ce32af6 100644 --- a/panels/network/cc-network-panel.c +++ b/panels/proxy/cc-proxy-panel.c @@ -21,21 +21,21 @@ * */ -#include "cc-network-panel.h" +#include "cc-proxy-panel.h" -G_DEFINE_DYNAMIC_TYPE (CcNetworkPanel, cc_network_panel, CC_TYPE_PANEL) +G_DEFINE_DYNAMIC_TYPE (CcProxyPanel, cc_proxy_panel, CC_TYPE_PANEL) -#define NETWORK_PANEL_PRIVATE(o) \ - (G_TYPE_INSTANCE_GET_PRIVATE ((o), CC_TYPE_NETWORK_PANEL, CcNetworkPanelPrivate)) +#define PROXY_PANEL_PRIVATE(o) \ + (G_TYPE_INSTANCE_GET_PRIVATE ((o), CC_TYPE_PROXY_PANEL, CcProxyPanelPrivate)) -struct _CcNetworkPanelPrivate +struct _CcProxyPanelPrivate { GtkBuilder *builder; }; static void -cc_network_panel_get_property (GObject *object, +cc_proxy_panel_get_property (GObject *object, guint property_id, GValue *value, GParamSpec *pspec) @@ -48,7 +48,7 @@ cc_network_panel_get_property (GObject *object, } static void -cc_network_panel_set_property (GObject *object, +cc_proxy_panel_set_property (GObject *object, guint property_id, const GValue *value, GParamSpec *pspec) @@ -61,9 +61,9 @@ cc_network_panel_set_property (GObject *object, } static void -cc_network_panel_dispose (GObject *object) +cc_proxy_panel_dispose (GObject *object) { - CcNetworkPanelPrivate *priv = CC_NETWORK_PANEL (object)->priv; + CcProxyPanelPrivate *priv = CC_PROXY_PANEL (object)->priv; if (!priv->builder) { @@ -71,40 +71,40 @@ cc_network_panel_dispose (GObject *object) priv->builder = NULL; } - G_OBJECT_CLASS (cc_network_panel_parent_class)->dispose (object); + G_OBJECT_CLASS (cc_proxy_panel_parent_class)->dispose (object); } static void -cc_network_panel_finalize (GObject *object) +cc_proxy_panel_finalize (GObject *object) { - G_OBJECT_CLASS (cc_network_panel_parent_class)->finalize (object); + G_OBJECT_CLASS (cc_proxy_panel_parent_class)->finalize (object); } static void -cc_network_panel_class_init (CcNetworkPanelClass *klass) +cc_proxy_panel_class_init (CcProxyPanelClass *klass) { GObjectClass *object_class = G_OBJECT_CLASS (klass); - g_type_class_add_private (klass, sizeof (CcNetworkPanelPrivate)); + g_type_class_add_private (klass, sizeof (CcProxyPanelPrivate)); - object_class->get_property = cc_network_panel_get_property; - object_class->set_property = cc_network_panel_set_property; - object_class->dispose = cc_network_panel_dispose; - object_class->finalize = cc_network_panel_finalize; + object_class->get_property = cc_proxy_panel_get_property; + object_class->set_property = cc_proxy_panel_set_property; + object_class->dispose = cc_proxy_panel_dispose; + object_class->finalize = cc_proxy_panel_finalize; } static void -cc_network_panel_class_finalize (CcNetworkPanelClass *klass) +cc_proxy_panel_class_finalize (CcProxyPanelClass *klass) { } static void -cc_network_panel_init (CcNetworkPanel *self) +cc_proxy_panel_init (CcProxyPanel *self) { - CcNetworkPanelPrivate *priv; + CcProxyPanelPrivate *priv; GtkWidget *widget; - priv = self->priv = NETWORK_PANEL_PRIVATE (self); + priv = self->priv = PROXY_PANEL_PRIVATE (self); priv->builder = gtk_builder_new (); @@ -117,11 +117,11 @@ cc_network_panel_init (CcNetworkPanel *self) } void -cc_network_panel_register (GIOModule *module) +cc_proxy_panel_register (GIOModule *module) { - cc_network_panel_register_type (G_TYPE_MODULE (module)); + cc_proxy_panel_register_type (G_TYPE_MODULE (module)); g_io_extension_point_implement (CC_SHELL_PANEL_EXTENSION_POINT, - CC_TYPE_NETWORK_PANEL, + CC_TYPE_PROXY_PANEL, "network", 0); } diff --git a/panels/network/cc-network-panel.h b/panels/proxy/cc-proxy-panel.h similarity index 57% rename from panels/network/cc-network-panel.h rename to panels/proxy/cc-proxy-panel.h index 31013f3e4..19b526a9b 100644 --- a/panels/network/cc-network-panel.h +++ b/panels/proxy/cc-proxy-panel.h @@ -20,58 +20,58 @@ */ -#ifndef _CC_NETWORK_PANEL_H -#define _CC_NETWORK_PANEL_H +#ifndef _CC_PROXY_PANEL_H +#define _CC_PROXY_PANEL_H #include G_BEGIN_DECLS -#define CC_TYPE_NETWORK_PANEL cc_network_panel_get_type() +#define CC_TYPE_PROXY_PANEL cc_proxy_panel_get_type() -#define CC_NETWORK_PANEL(obj) \ +#define CC_PROXY_PANEL(obj) \ (G_TYPE_CHECK_INSTANCE_CAST ((obj), \ - CC_TYPE_NETWORK_PANEL, CcNetworkPanel)) + CC_TYPE_PROXY_PANEL, CcProxyPanel)) -#define CC_NETWORK_PANEL_CLASS(klass) \ +#define CC_PROXY_PANEL_CLASS(klass) \ (G_TYPE_CHECK_CLASS_CAST ((klass), \ - CC_TYPE_NETWORK_PANEL, CcNetworkPanelClass)) + CC_TYPE_PROXY_PANEL, CcProxyPanelClass)) -#define CC_IS_NETWORK_PANEL(obj) \ +#define CC_IS_PROXY_PANEL(obj) \ (G_TYPE_CHECK_INSTANCE_TYPE ((obj), \ - CC_TYPE_NETWORK_PANEL)) + CC_TYPE_PROXY_PANEL)) -#define CC_IS_NETWORK_PANEL_CLASS(klass) \ +#define CC_IS_PROXY_PANEL_CLASS(klass) \ (G_TYPE_CHECK_CLASS_TYPE ((klass), \ - CC_TYPE_NETWORK_PANEL)) + CC_TYPE_PROXY_PANEL)) -#define CC_NETWORK_PANEL_GET_CLASS(obj) \ +#define CC_PROXY_PANEL_GET_CLASS(obj) \ (G_TYPE_INSTANCE_GET_CLASS ((obj), \ - CC_TYPE_NETWORK_PANEL, CcNetworkPanelClass)) + CC_TYPE_PROXY_PANEL, CcProxyPanelClass)) -typedef struct _CcNetworkPanel CcNetworkPanel; -typedef struct _CcNetworkPanelClass CcNetworkPanelClass; -typedef struct _CcNetworkPanelPrivate CcNetworkPanelPrivate; +typedef struct _CcProxyPanel CcProxyPanel; +typedef struct _CcProxyPanelClass CcProxyPanelClass; +typedef struct _CcProxyPanelPrivate CcProxyPanelPrivate; -struct _CcNetworkPanel +struct _CcProxyPanel { CcPanel parent; - CcNetworkPanelPrivate *priv; + CcProxyPanelPrivate *priv; }; -struct _CcNetworkPanelClass +struct _CcProxyPanelClass { CcPanelClass parent_class; }; -GType cc_network_panel_get_type (void) G_GNUC_CONST; +GType cc_proxy_panel_get_type (void) G_GNUC_CONST; -void cc_network_panel_register (GIOModule *module); +void cc_proxy_panel_register (GIOModule *module); int gnome_network_properties_init (GtkBuilder *builder); G_END_DECLS -#endif /* _CC_NETWORK_PANEL_H */ +#endif /* _CC_PROXY_PANEL_H */ diff --git a/panels/network/gnome-network-panel.desktop.in.in b/panels/proxy/gnome-proxy-panel.desktop.in.in similarity index 100% rename from panels/network/gnome-network-panel.desktop.in.in rename to panels/proxy/gnome-proxy-panel.desktop.in.in diff --git a/panels/network/gnome-network-properties.c b/panels/proxy/gnome-proxy-properties.c similarity index 99% rename from panels/network/gnome-network-properties.c rename to panels/proxy/gnome-proxy-properties.c index d8275acaa..074616fa1 100644 --- a/panels/network/gnome-network-properties.c +++ b/panels/proxy/gnome-proxy-properties.c @@ -25,7 +25,7 @@ # include #endif -#include "cc-network-panel.h" +#include "cc-proxy-panel.h" #include #include @@ -62,7 +62,7 @@ enum { #define LOCATION_DIR "/apps/control-center/network" #define CURRENT_LOCATION "/apps/control-center/network/current_location" -#define GNOMECC_GNP_UI_FILE (GNOMECC_UI_DIR "/gnome-network-properties.ui") +#define GNOMECC_GNP_UI_FILE (GNOMECC_UI_DIR "/gnome-proxy-properties.ui") static GtkWidget *details_dialog = NULL; static GPtrArray *ignore_hosts = NULL; diff --git a/panels/network/gnome-network-properties.ui b/panels/proxy/gnome-proxy-properties.ui similarity index 100% rename from panels/network/gnome-network-properties.ui rename to panels/proxy/gnome-proxy-properties.ui diff --git a/panels/network/icons/16x16/gnome-network-properties.png b/panels/proxy/icons/16x16/gnome-proxy-properties.png similarity index 100% rename from panels/network/icons/16x16/gnome-network-properties.png rename to panels/proxy/icons/16x16/gnome-proxy-properties.png diff --git a/panels/network/icons/22x22/gnome-network-properties.png b/panels/proxy/icons/22x22/gnome-proxy-properties.png similarity index 100% rename from panels/network/icons/22x22/gnome-network-properties.png rename to panels/proxy/icons/22x22/gnome-proxy-properties.png diff --git a/panels/network/icons/24x24/gnome-network-properties.png b/panels/proxy/icons/24x24/gnome-proxy-properties.png similarity index 100% rename from panels/network/icons/24x24/gnome-network-properties.png rename to panels/proxy/icons/24x24/gnome-proxy-properties.png diff --git a/panels/network/icons/32x32/gnome-network-properties.png b/panels/proxy/icons/32x32/gnome-proxy-properties.png similarity index 100% rename from panels/network/icons/32x32/gnome-network-properties.png rename to panels/proxy/icons/32x32/gnome-proxy-properties.png diff --git a/panels/network/icons/48x48/gnome-network-properties.png b/panels/proxy/icons/48x48/gnome-proxy-properties.png similarity index 100% rename from panels/network/icons/48x48/gnome-network-properties.png rename to panels/proxy/icons/48x48/gnome-proxy-properties.png diff --git a/panels/network/icons/scalable/gnome-network-properties.svg b/panels/proxy/icons/scalable/gnome-proxy-properties.svg similarity index 100% rename from panels/network/icons/scalable/gnome-network-properties.svg rename to panels/proxy/icons/scalable/gnome-proxy-properties.svg diff --git a/panels/network/network-module.c b/panels/proxy/proxy-module.c similarity index 94% rename from panels/network/network-module.c rename to panels/proxy/proxy-module.c index 6cde13c44..d3f63f605 100644 --- a/panels/network/network-module.c +++ b/panels/proxy/proxy-module.c @@ -21,7 +21,7 @@ #include -#include "cc-network-panel.h" +#include "cc-proxy-panel.h" #include @@ -32,7 +32,7 @@ g_io_module_load (GIOModule *module) bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); /* register the panel */ - cc_network_panel_register (module); + cc_proxy_panel_register (module); } void diff --git a/po/POTFILES.in b/po/POTFILES.in index a67460821..0a08d6e71 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -44,9 +44,9 @@ panels/region/gnome-region-panel.desktop.in.in panels/mouse/gnome-mouse-properties.c [type: gettext/glade]panels/mouse/gnome-mouse-properties.ui panels/mouse/gnome-mouse-panel.desktop.in.in -panels/network/gnome-network-properties.c -panels/network/gnome-network-panel.desktop.in.in -[type: gettext/glade]panels/network/gnome-network-properties.ui +panels/proxy/gnome-proxy-properties.c +panels/proxy/gnome-proxy-panel.desktop.in.in +[type: gettext/glade]panels/proxy/gnome-proxy-properties.ui panels/screen/gnome-screen-panel.desktop.in.in panels/power/gnome-power-panel.desktop.in.in panels/power/cc-power-panel.c