[network-manager-netbook] The great rename, part 2.
- From: Tambet Ingo <tambeti src gnome org>
- To: svn-commits-list gnome org
- Subject: [network-manager-netbook] The great rename, part 2.
- Date: Thu, 21 May 2009 06:33:23 -0400 (EDT)
commit 2b3dd19bd617139f4505b2aecc8d46263f4edf69
Author: Tambet Ingo <tambet gmail com>
Date: Thu May 21 13:32:40 2009 +0300
The great rename, part 2.
---
.gitignore | 2 +-
Makefile.am | 2 +-
autogen.sh | 2 +-
configure.in | 4 +-
src/Makefile.am | 76 +++++++++++-----------
src/gconf-helpers/Makefile.am | 4 +-
src/main.c | 18 +++---
src/marshallers/Makefile.am | 2 +-
src/nmn-applet.c | 94 +++++++++++++-------------
src/nmn-applet.h | 34 +++++-----
src/nmn-ethernet-item.c | 48 +++++++-------
src/nmn-ethernet-item.h | 34 +++++-----
src/nmn-icon-cache.c | 6 +-
src/nmn-icon-cache.h | 10 ++--
src/nmn-item.c | 124 +++++++++++++++++-----------------
src/nmn-item.h | 74 ++++++++++----------
src/nmn-list.c | 76 +++++++++++-----------
src/nmn-list.h | 30 ++++----
src/nmn-mobile-providers.c | 32 +++++-----
src/nmn-mobile-providers.h | 28 ++++----
src/nmn-network-item.c | 134 ++++++++++++++++++------------------
src/nmn-network-item.h | 56 ++++++++--------
src/nmn-networks.c | 120 ++++++++++++++++----------------
src/nmn-networks.h | 34 +++++-----
src/nmn-new-connection.c | 120 ++++++++++++++++----------------
src/nmn-new-connection.h | 32 +++++-----
src/nmn-nm-data.c | 44 ++++++------
src/nmn-nm-data.h | 30 ++++----
src/nmn-plug.c | 34 +++++-----
src/nmn-plug.h | 32 +++++-----
src/nmn-serial-item.c | 48 +++++++-------
src/nmn-serial-item.h | 34 +++++-----
src/nmn-status-icon.c | 76 +++++++++++-----------
src/nmn-status-icon.h | 28 ++++----
src/nmn-wifi-item.c | 134 ++++++++++++++++++------------------
src/nmn-wifi-item.h | 44 ++++++------
src/nmn-wifi-list.c | 80 +++++++++++-----------
src/nmn-wifi-list.h | 34 +++++-----
src/wireless-dialog.c | 18 +++---
src/wireless-dialog.h | 6 +-
src/wireless-security/Makefile.am | 4 +-
41 files changed, 921 insertions(+), 921 deletions(-)
diff --git a/.gitignore b/.gitignore
index b57f75c..b7b471a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,6 +21,6 @@ libtool
ltmain.sh
missing
src/marshallers/nma-marshal.[ch]
-src/carrick
+src/network-manager-netbook
stamp-h1
TAGS
diff --git a/Makefile.am b/Makefile.am
index 4b0e4f5..a8a9c11 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,7 +1,7 @@
SUBDIRS = icons src
autostartdir = $(sysconfdir)/xdg/autostart
-autostart_DATA = carrick.desktop
+autostart_DATA = network-manager-netbook.desktop
EXTRA_DIST = \
$(autostart_DATA)
diff --git a/autogen.sh b/autogen.sh
index 12d198c..6874f76 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -4,7 +4,7 @@
srcdir=`dirname $0`
test -z "$srcdir" && srcdir=.
REQUIRED_AUTOMAKE_VERSION=1.7
-PKG_NAME=carrick
+PKG_NAME=network-manager-netbook
(test -f $srcdir/configure.in \
&& test -f $srcdir/src/main.c) || {
diff --git a/configure.in b/configure.in
index ed4cd40..fdfe86a 100644
--- a/configure.in
+++ b/configure.in
@@ -1,6 +1,6 @@
AC_PREREQ(2.52)
-AC_INIT(carrick, 0.1, tambet novell com, carrick)
+AC_INIT(network-manager-netbook, 0.1, tambet novell com, network-manager-netbook)
AM_INIT_AUTOMAKE([])
AM_MAINTAINER_MODE
@@ -12,7 +12,7 @@ AM_PROG_CC_C_O
AC_PROG_INSTALL
AC_PROG_LIBTOOL
-PKG_CHECK_MODULES(CARRICK, dbus-glib-1 >= 0.75 gtk+-2.0 gconf-2.0 gnome-keyring-1 libnm-util libnm_glib mobile-broadband-provider-info mux)
+PKG_CHECK_MODULES(NMN, dbus-glib-1 >= 0.75 gtk+-2.0 gconf-2.0 gnome-keyring-1 libnm-util libnm_glib mobile-broadband-provider-info mux)
GLIB_GENMARSHAL=`pkg-config --variable=glib_genmarshal glib-2.0`
AC_SUBST(GLIB_GENMARSHAL)
diff --git a/src/Makefile.am b/src/Makefile.am
index 508f312..6c628e5 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -2,52 +2,52 @@ SUBDIRS = marshallers gconf-helpers wireless-security
NULL=
-bin_PROGRAMS = carrick
+bin_PROGRAMS = network-manager-netbook
-carrick_CPPFLAGS = \
- $(CARRICK_CFLAGS) \
+network_manager_netbook_CPPFLAGS = \
+ $(NMN_CFLAGS) \
-I${top_srcdir}/src/gconf-helpers \
-I${top_srcdir}/src/wireless-security \
-DGLADEDIR=\""$(gladedir)"\" \
$(NULL)
-carrick_LDADD = \
- $(CARRICK_LIBS) \
+network_manager_netbook_LDADD = \
+ $(NMN_LIBS) \
${top_builddir}/src/gconf-helpers/libgconf-helpers.la \
${top_builddir}/src/wireless-security/libwireless-security.la \
$(NULL)
-carrick_SOURCES = \
- carrick-applet.c \
- carrick-applet.h \
- carrick-ethernet-item.c \
- carrick-ethernet-item.h \
- carrick-icon-cache.c \
- carrick-icon-cache.h \
- carrick-item.c \
- carrick-item.h \
- carrick-list.c \
- carrick-list.h \
- carrick-mobile-providers.c \
- carrick-mobile-providers.h \
- carrick-network-item.c \
- carrick-network-item.h \
- carrick-networks.c \
- carrick-networks.h \
- carrick-new-connection.c \
- carrick-new-connection.h \
- carrick-nm-data.c \
- carrick-nm-data.h \
- carrick-plug.c \
- carrick-plug.h \
- carrick-serial-item.c \
- carrick-serial-item.h \
- carrick-status-icon.c \
- carrick-status-icon.h \
- carrick-wifi-item.c \
- carrick-wifi-item.h \
- carrick-wifi-list.c \
- carrick-wifi-list.h \
+network_manager_netbook_SOURCES = \
+ nmn-applet.c \
+ nmn-applet.h \
+ nmn-ethernet-item.c \
+ nmn-ethernet-item.h \
+ nmn-icon-cache.c \
+ nmn-icon-cache.h \
+ nmn-item.c \
+ nmn-item.h \
+ nmn-list.c \
+ nmn-list.h \
+ nmn-mobile-providers.c \
+ nmn-mobile-providers.h \
+ nmn-network-item.c \
+ nmn-network-item.h \
+ nmn-networks.c \
+ nmn-networks.h \
+ nmn-new-connection.c \
+ nmn-new-connection.h \
+ nmn-nm-data.c \
+ nmn-nm-data.h \
+ nmn-plug.c \
+ nmn-plug.h \
+ nmn-serial-item.c \
+ nmn-serial-item.h \
+ nmn-status-icon.c \
+ nmn-status-icon.h \
+ nmn-wifi-item.c \
+ nmn-wifi-item.h \
+ nmn-wifi-list.c \
+ nmn-wifi-list.h \
main.c \
moblin-netbook-system-tray.h \
utils.c \
@@ -56,8 +56,8 @@ carrick_SOURCES = \
wireless-dialog.h \
$(NULL)
-gladedir = $(datadir)/carrick
-glade_DATA = carrick.glade wireless-security.glade
+gladedir = $(datadir)/network-manager-netbook
+glade_DATA = network-manager-netbook.glade wireless-security.glade
EXTRA_DIST = \
$(glade_DATA) \
diff --git a/src/gconf-helpers/Makefile.am b/src/gconf-helpers/Makefile.am
index 65a09ac..a840abf 100644
--- a/src/gconf-helpers/Makefile.am
+++ b/src/gconf-helpers/Makefile.am
@@ -11,10 +11,10 @@ libgconf_helpers_la_SOURCES = \
utils.c
libgconf_helpers_la_CPPFLAGS = \
- $(CARRICK_CFLAGS) \
+ $(NMN_CFLAGS) \
-I${top_builddir}/src/marshallers
libgconf_helpers_la_LIBADD = \
- $(CARRICK_LIBS) \
+ $(NMN_LIBS) \
${top_builddir}/src/marshallers/libmarshallers.la
diff --git a/src/main.c b/src/main.c
index 248ce66..8aa9723 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1,8 +1,8 @@
/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
#include <gtk/gtk.h>
-#include "carrick-applet.h"
-#include "carrick-icon-cache.h"
+#include "nmn-applet.h"
+#include "nmn-icon-cache.h"
#include "utils.h"
#include "moblin-netbook-system-tray.h"
@@ -12,26 +12,26 @@ embedded_callback (GObject *plug,
GParamSpec *pspec,
gpointer user_data)
{
- CarrickApplet *applet = CARRICK_APPLET (user_data);
+ NmnApplet *applet = NMN_APPLET (user_data);
gboolean embedded;
g_object_get (plug, "embedded", &embedded, NULL);
- carrick_applet_set_visible (applet, embedded);
+ nmn_applet_set_visible (applet, embedded);
}
int
main (int argc, char *argv[])
{
- CarrickApplet *applet;
+ NmnApplet *applet;
GtkStatusIcon *status_icon;
GtkWidget *plug;
gtk_init (&argc, &argv);
- applet = carrick_applet_new ();
- plug = carrick_applet_get_plug (applet);
+ applet = nmn_applet_new ();
+ plug = nmn_applet_get_plug (applet);
utils_set_main_widget (plug);
- status_icon = carrick_applet_get_status_icon (applet);
+ status_icon = nmn_applet_get_status_icon (applet);
g_signal_connect (plug,
"notify::embedded",
(GCallback) embedded_callback,
@@ -41,7 +41,7 @@ main (int argc, char *argv[])
gtk_main ();
g_object_unref (applet);
- carrick_icon_cache_invalidate ();
+ nmn_icon_cache_invalidate ();
return 0;
}
diff --git a/src/marshallers/Makefile.am b/src/marshallers/Makefile.am
index b22b9e7..6ad83fc 100644
--- a/src/marshallers/Makefile.am
+++ b/src/marshallers/Makefile.am
@@ -8,7 +8,7 @@ libmarshallers_la_SOURCES = \
nma-marshal-main.c
libmarshallers_la_CPPFLAGS = \
- $(CARRICK_CFLAGS)
+ $(NMN_CFLAGS)
libmarshallers_la_LIBADD = $(GOBJECT_LIBS)
diff --git a/src/nmn-applet.c b/src/nmn-applet.c
index c7a3d34..a6af0b2 100644
--- a/src/nmn-applet.c
+++ b/src/nmn-applet.c
@@ -9,12 +9,12 @@
#include "nmn-networks.h"
#include "nmn-new-connection.h"
-G_DEFINE_TYPE (CarrickApplet, carrick_applet, G_TYPE_OBJECT)
+G_DEFINE_TYPE (NmnApplet, nmn_applet, G_TYPE_OBJECT)
-#define GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), CARRICK_TYPE_APPLET, CarrickAppletPrivate))
+#define GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), NMN_TYPE_APPLET, NmnAppletPrivate))
typedef struct {
- CarrickNMData *nm_data;
+ NmnNMData *nm_data;
GtkStatusIcon *status_icon;
GtkBuilder *builder;
@@ -34,26 +34,26 @@ typedef struct {
int pop_counter;
gboolean disposed;
-} CarrickAppletPrivate;
+} NmnAppletPrivate;
-CarrickApplet *
-carrick_applet_new ()
+NmnApplet *
+nmn_applet_new ()
{
- return CARRICK_APPLET (g_object_new (CARRICK_TYPE_APPLET, NULL));
+ return NMN_APPLET (g_object_new (NMN_TYPE_APPLET, NULL));
}
GtkStatusIcon *
-carrick_applet_get_status_icon (CarrickApplet *applet)
+nmn_applet_get_status_icon (NmnApplet *applet)
{
- g_return_val_if_fail (CARRICK_IS_APPLET (applet), NULL);
+ g_return_val_if_fail (NMN_IS_APPLET (applet), NULL);
return GET_PRIVATE (applet)->status_icon;
}
GtkWidget *
-carrick_applet_get_plug (CarrickApplet *applet)
+nmn_applet_get_plug (NmnApplet *applet)
{
- g_return_val_if_fail (CARRICK_IS_APPLET (applet), NULL);
+ g_return_val_if_fail (NMN_IS_APPLET (applet), NULL);
return GET_PRIVATE (applet)->plug;
}
@@ -65,7 +65,7 @@ enable_wifi_toggled (MuxLightSwitch *w,
gboolean active,
gpointer user_data)
{
- CarrickAppletPrivate *priv = GET_PRIVATE (user_data);
+ NmnAppletPrivate *priv = GET_PRIVATE (user_data);
nm_client_wireless_set_enabled (NM_CLIENT (priv->nm_data), active);
}
@@ -75,7 +75,7 @@ wireless_state_changed (NMClient *client,
GParamSpec *pspec,
gpointer user_data)
{
- CarrickAppletPrivate *priv = GET_PRIVATE (user_data);
+ NmnAppletPrivate *priv = GET_PRIVATE (user_data);
g_signal_handlers_block_by_func (priv->enable_wifi, enable_wifi_toggled, user_data);
mux_light_switch_set_active (MUX_LIGHT_SWITCH (priv->enable_wifi),
@@ -85,9 +85,9 @@ wireless_state_changed (NMClient *client,
}
static void
-enable_wifi_setup (CarrickApplet *applet)
+enable_wifi_setup (NmnApplet *applet)
{
- CarrickAppletPrivate *priv = GET_PRIVATE (applet);
+ NmnAppletPrivate *priv = GET_PRIVATE (applet);
priv->enable_wifi = mux_light_switch_new ();
gtk_table_attach (priv->switch_table,
@@ -122,9 +122,9 @@ enable_ethernet_toggled (MuxLightSwitch *w,
}
static void
-enable_ethernet_setup (CarrickApplet *applet)
+enable_ethernet_setup (NmnApplet *applet)
{
- CarrickAppletPrivate *priv = GET_PRIVATE (applet);
+ NmnAppletPrivate *priv = GET_PRIVATE (applet);
priv->enable_ethernet = mux_light_switch_new ();
gtk_table_attach (priv->switch_table,
@@ -151,9 +151,9 @@ enable_3g_toggled (MuxLightSwitch *w,
}
static void
-enable_3g_setup (CarrickApplet *applet)
+enable_3g_setup (NmnApplet *applet)
{
- CarrickAppletPrivate *priv = GET_PRIVATE (applet);
+ NmnAppletPrivate *priv = GET_PRIVATE (applet);
priv->enable_3g = mux_light_switch_new ();
gtk_table_attach (priv->switch_table,
@@ -176,7 +176,7 @@ enable_flightmode_toggled (MuxLightSwitch *w,
gboolean active,
gpointer user_data)
{
- CarrickAppletPrivate *priv = GET_PRIVATE (user_data);
+ NmnAppletPrivate *priv = GET_PRIVATE (user_data);
gtk_widget_set_sensitive (priv->enable_wifi, !active);
/* FIXME: Enable/disable 3G is not supported yet */
@@ -186,9 +186,9 @@ enable_flightmode_toggled (MuxLightSwitch *w,
}
static void
-enable_flightmode_setup (CarrickApplet *applet)
+enable_flightmode_setup (NmnApplet *applet)
{
- CarrickAppletPrivate *priv = GET_PRIVATE (applet);
+ NmnAppletPrivate *priv = GET_PRIVATE (applet);
priv->enable_flightmode = mux_light_switch_new ();
gtk_table_attach (priv->switch_table,
@@ -207,10 +207,10 @@ static void
add_new_connection_show (GtkButton *button,
gpointer user_data)
{
- CarrickAppletPrivate *priv = GET_PRIVATE (user_data);
+ NmnAppletPrivate *priv = GET_PRIVATE (user_data);
gtk_widget_show (priv->new_dialog);
- carrick_plug_push (CARRICK_PLUG (priv->plug), priv->new_dialog);
+ nmn_plug_push (NMN_PLUG (priv->plug), priv->new_dialog);
priv->pop_counter++;
}
@@ -218,18 +218,18 @@ static void
add_new_connection_hide (GtkWidget *widget,
gpointer user_data)
{
- CarrickAppletPrivate *priv = GET_PRIVATE (user_data);
+ NmnAppletPrivate *priv = GET_PRIVATE (user_data);
- carrick_plug_pop (CARRICK_PLUG (priv->plug));
+ nmn_plug_pop (NMN_PLUG (priv->plug));
priv->pop_counter--;
}
static void
-add_new_connection_setup (CarrickApplet *applet)
+add_new_connection_setup (NmnApplet *applet)
{
- CarrickAppletPrivate *priv = GET_PRIVATE (applet);
+ NmnAppletPrivate *priv = GET_PRIVATE (applet);
- priv->new_dialog = carrick_new_connection_create (priv->builder, priv->nm_data);
+ priv->new_dialog = nmn_new_connection_create (priv->builder, priv->nm_data);
g_object_ref_sink (priv->new_dialog);
g_signal_connect (priv->new_dialog, "hide", G_CALLBACK (add_new_connection_hide), applet);
@@ -238,19 +238,19 @@ add_new_connection_setup (CarrickApplet *applet)
}
void
-carrick_applet_set_visible (CarrickApplet *applet,
- gboolean visible)
+nmn_applet_set_visible (NmnApplet *applet,
+ gboolean visible)
{
- CarrickAppletPrivate *priv = GET_PRIVATE (applet);
+ NmnAppletPrivate *priv = GET_PRIVATE (applet);
if (visible) {
if (!priv->network_list_populated) {
- carrick_networks_populate (CARRICK_NETWORKS (priv->list));
+ nmn_networks_populate (NMN_NETWORKS (priv->list));
priv->network_list_populated = TRUE;
}
} else {
while (priv->pop_counter > 0) {
- carrick_plug_pop (CARRICK_PLUG (priv->plug));
+ nmn_plug_pop (NMN_PLUG (priv->plug));
priv->pop_counter--;
}
}
@@ -309,9 +309,9 @@ init_dbus (void)
}
static void
-carrick_applet_init (CarrickApplet *applet)
+nmn_applet_init (NmnApplet *applet)
{
- CarrickAppletPrivate *priv = GET_PRIVATE (applet);
+ NmnAppletPrivate *priv = GET_PRIVATE (applet);
DBusGConnection *bus;
GtkWidget *container;
@@ -319,22 +319,22 @@ carrick_applet_init (CarrickApplet *applet)
/* FIXME: Do something nicer here */
g_assert (bus);
- priv->nm_data = carrick_nm_data_new (bus);
+ priv->nm_data = nmn_nm_data_new (bus);
dbus_g_connection_unref (bus);
- priv->status_icon = carrick_status_icon_new (NM_CLIENT (priv->nm_data));
+ priv->status_icon = nmn_status_icon_new (NM_CLIENT (priv->nm_data));
dbus_g_connection_register_g_object (nm_object_get_connection (NM_OBJECT (priv->nm_data)),
NM_DBUS_PATH_SETTINGS,
- G_OBJECT (carrick_nm_data_get_user_settings (priv->nm_data)));
+ G_OBJECT (nmn_nm_data_get_user_settings (priv->nm_data)));
priv->builder = gtk_builder_new ();
- gtk_builder_add_from_file (priv->builder, GLADEDIR "/carrick.glade", NULL);
+ gtk_builder_add_from_file (priv->builder, GLADEDIR "/network-manager-netbook.glade", NULL);
priv->pane = GTK_WIDGET (gtk_builder_get_object (priv->builder, "main_container"));
gtk_widget_unparent (priv->pane);
- priv->list = carrick_networks_new (priv->nm_data);
+ priv->list = nmn_networks_new (priv->nm_data);
container = GTK_WIDGET (gtk_builder_get_object (priv->builder, "networks_container"));
gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (container), priv->list);
@@ -348,14 +348,14 @@ carrick_applet_init (CarrickApplet *applet)
enable_flightmode_setup (applet);
add_new_connection_setup (applet);
- priv->plug = carrick_plug_new ();
- carrick_plug_push (CARRICK_PLUG (priv->plug), priv->pane);
+ priv->plug = nmn_plug_new ();
+ nmn_plug_push (NMN_PLUG (priv->plug), priv->pane);
}
static void
dispose (GObject *object)
{
- CarrickAppletPrivate *priv = GET_PRIVATE (object);
+ NmnAppletPrivate *priv = GET_PRIVATE (object);
if (priv->disposed)
return;
@@ -377,15 +377,15 @@ dispose (GObject *object)
if (priv->plug)
g_object_unref (priv->plug);
- G_OBJECT_CLASS (carrick_applet_parent_class)->dispose (object);
+ G_OBJECT_CLASS (nmn_applet_parent_class)->dispose (object);
}
static void
-carrick_applet_class_init (CarrickAppletClass *class)
+nmn_applet_class_init (NmnAppletClass *class)
{
GObjectClass *object_class = G_OBJECT_CLASS (class);
- g_type_class_add_private (object_class, sizeof (CarrickAppletPrivate));
+ g_type_class_add_private (object_class, sizeof (NmnAppletPrivate));
object_class->dispose = dispose;
}
diff --git a/src/nmn-applet.h b/src/nmn-applet.h
index f3d7e4f..174ea07 100644
--- a/src/nmn-applet.h
+++ b/src/nmn-applet.h
@@ -1,36 +1,36 @@
/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-#ifndef CARRICK_APPLET_H
-#define CARRICK_APPLET_H
+#ifndef NMN_APPLET_H
+#define NMN_APPLET_H
#include <glib-object.h>
#include <gtk/gtk.h>
G_BEGIN_DECLS
-#define CARRICK_TYPE_APPLET (carrick_applet_get_type ())
-#define CARRICK_APPLET(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), CARRICK_TYPE_APPLET, CarrickApplet))
-#define CARRICK_APPLET_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), CARRICK_TYPE_APPLET, CarrickAppletClass))
-#define CARRICK_IS_APPLET(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), CARRICK_TYPE_APPLET))
-#define CARRICK_IS_APPLET_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), CARRICK_TYPE_APPLET))
-#define CARRICK_APPLET_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), CARRICK_TYPE_APPLET, CarrickAppletClass))
+#define NMN_TYPE_APPLET (nmn_applet_get_type ())
+#define NMN_APPLET(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NMN_TYPE_APPLET, NmnApplet))
+#define NMN_APPLET_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NMN_TYPE_APPLET, NmnAppletClass))
+#define NMN_IS_APPLET(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NMN_TYPE_APPLET))
+#define NMN_IS_APPLET_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), NMN_TYPE_APPLET))
+#define NMN_APPLET_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), NMN_TYPE_APPLET, NmnAppletClass))
typedef struct {
GObject parent;
-} CarrickApplet;
+} NmnApplet;
typedef struct {
GObjectClass parent;
-} CarrickAppletClass;
+} NmnAppletClass;
-GType carrick_applet_get_type (void);
+GType nmn_applet_get_type (void);
-CarrickApplet *carrick_applet_new (void);
-GtkStatusIcon *carrick_applet_get_status_icon (CarrickApplet *applet);
-GtkWidget *carrick_applet_get_plug (CarrickApplet *applet);
-void carrick_applet_set_visible (CarrickApplet *applet,
- gboolean visible);
+NmnApplet *nmn_applet_new (void);
+GtkStatusIcon *nmn_applet_get_status_icon (NmnApplet *applet);
+GtkWidget *nmn_applet_get_plug (NmnApplet *applet);
+void nmn_applet_set_visible (NmnApplet *applet,
+ gboolean visible);
G_END_DECLS
-#endif /* CARRICK_APPLET_H */
+#endif /* NMN_APPLET_H */
diff --git a/src/nmn-ethernet-item.c b/src/nmn-ethernet-item.c
index 097d41d..947295c 100644
--- a/src/nmn-ethernet-item.c
+++ b/src/nmn-ethernet-item.c
@@ -8,24 +8,24 @@
#include "nma-gconf-connection.h"
#include "utils.h"
-G_DEFINE_TYPE (CarrickEthernetItem, carrick_ethernet_item, CARRICK_TYPE_NETWORK_ITEM)
+G_DEFINE_TYPE (NmnEthernetItem, nmn_ethernet_item, NMN_TYPE_NETWORK_ITEM)
-#define GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), CARRICK_TYPE_ETHERNET_ITEM, CarrickEthernetItemPrivate))
+#define GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), NMN_TYPE_ETHERNET_ITEM, NmnEthernetItemPrivate))
typedef struct {
GSList *signal_handlers;
gboolean disposed;
-} CarrickEthernetItemPrivate;
+} NmnEthernetItemPrivate;
static void
-update_item (CarrickEthernetItem *self)
+update_item (NmnEthernetItem *self)
{
const char *icon;
NMDevice *device;
- device = carrick_network_item_get_device (CARRICK_NETWORK_ITEM (self));
+ device = nmn_network_item_get_device (NMN_NETWORK_ITEM (self));
switch (nm_device_get_state (device)) {
case NM_DEVICE_STATE_ACTIVATED:
icon = "nm-device-wired";
@@ -35,7 +35,7 @@ update_item (CarrickEthernetItem *self)
break;
}
- carrick_item_set_icon (CARRICK_ITEM (self), icon);
+ nmn_item_set_icon (NMN_ITEM (self), icon);
}
static void
@@ -45,7 +45,7 @@ state_changed (NMDevice *device,
NMDeviceStateReason reason,
gpointer user_data)
{
- update_item (CARRICK_ETHERNET_ITEM (user_data));
+ update_item (NMN_ETHERNET_ITEM (user_data));
}
static void
@@ -54,13 +54,13 @@ carrier_changed (NMDeviceEthernet *device,
gpointer user_data)
{
if (!nm_device_ethernet_get_carrier (device))
- carrick_item_remove_request (CARRICK_ITEM (user_data));
+ nmn_item_remove_request (NMN_ITEM (user_data));
}
static void
add_signal_handler (gpointer item, gulong id)
{
- CarrickEthernetItemPrivate *priv = GET_PRIVATE (item);
+ NmnEthernetItemPrivate *priv = GET_PRIVATE (item);
gulong *p;
p = g_new (gulong, 1);
@@ -69,14 +69,14 @@ add_signal_handler (gpointer item, gulong id)
}
GtkWidget *
-carrick_ethernet_item_create (CarrickNMData *nm_data,
- NMDeviceEthernet *device,
- NMExportedConnection *exported)
+nmn_ethernet_item_create (NmnNMData *nm_data,
+ NMDeviceEthernet *device,
+ NMExportedConnection *exported)
{
NMConnection *wrapped;
GtkWidget *item;
- g_return_val_if_fail (CARRICK_IS_NM_DATA (nm_data), NULL);
+ g_return_val_if_fail (NMN_IS_NM_DATA (nm_data), NULL);
g_return_val_if_fail (NM_IS_DEVICE_ETHERNET (device), NULL);
g_return_val_if_fail (NM_IS_EXPORTED_CONNECTION (exported), NULL);
@@ -88,13 +88,13 @@ carrick_ethernet_item_create (CarrickNMData *nm_data,
if (utils_connection_valid_for_device (wrapped, NM_DEVICE (device), NULL)) {
gulong id;
- item = GTK_WIDGET (g_object_new (CARRICK_TYPE_ETHERNET_ITEM,
- CARRICK_NETWORK_ITEM_NM_DATA, nm_data,
- CARRICK_NETWORK_ITEM_DEVICE, device,
- CARRICK_NETWORK_ITEM_CONNECTION, exported,
+ item = GTK_WIDGET (g_object_new (NMN_TYPE_ETHERNET_ITEM,
+ NMN_NETWORK_ITEM_NM_DATA, nm_data,
+ NMN_NETWORK_ITEM_DEVICE, device,
+ NMN_NETWORK_ITEM_CONNECTION, exported,
NULL));
- update_item (CARRICK_ETHERNET_ITEM (item));
+ update_item (NMN_ETHERNET_ITEM (item));
id = g_signal_connect (device, "state-changed", G_CALLBACK (state_changed), item);
add_signal_handler (item, id);
@@ -109,20 +109,20 @@ carrick_ethernet_item_create (CarrickNMData *nm_data,
}
static void
-carrick_ethernet_item_init (CarrickEthernetItem *item)
+nmn_ethernet_item_init (NmnEthernetItem *item)
{
}
static void
dispose (GObject *object)
{
- CarrickEthernetItemPrivate *priv = GET_PRIVATE (object);
+ NmnEthernetItemPrivate *priv = GET_PRIVATE (object);
NMDevice *device;
if (priv->disposed)
return;
- device = carrick_network_item_get_device (CARRICK_NETWORK_ITEM (object));
+ device = nmn_network_item_get_device (NMN_NETWORK_ITEM (object));
while (priv->signal_handlers) {
gulong *id = (gulong *) priv->signal_handlers->data;
@@ -134,15 +134,15 @@ dispose (GObject *object)
priv->disposed = TRUE;
- G_OBJECT_CLASS (carrick_ethernet_item_parent_class)->dispose (object);
+ G_OBJECT_CLASS (nmn_ethernet_item_parent_class)->dispose (object);
}
static void
-carrick_ethernet_item_class_init (CarrickEthernetItemClass *class)
+nmn_ethernet_item_class_init (NmnEthernetItemClass *class)
{
GObjectClass *object_class = G_OBJECT_CLASS (class);
- g_type_class_add_private (object_class, sizeof (CarrickEthernetItemPrivate));
+ g_type_class_add_private (object_class, sizeof (NmnEthernetItemPrivate));
object_class->dispose = dispose;
}
diff --git a/src/nmn-ethernet-item.h b/src/nmn-ethernet-item.h
index b87dbca..26e6d60 100644
--- a/src/nmn-ethernet-item.h
+++ b/src/nmn-ethernet-item.h
@@ -1,32 +1,32 @@
/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-#ifndef CARRICK_ETHERNET_ITEM_H
-#define CARRICK_ETHERNET_ITEM_H
+#ifndef NMN_ETHERNET_ITEM_H
+#define NMN_ETHERNET_ITEM_H
#include <nmn-network-item.h>
#include <nm-device-ethernet.h>
#include "nmn-nm-data.h"
-#define CARRICK_TYPE_ETHERNET_ITEM (carrick_ethernet_item_get_type ())
-#define CARRICK_ETHERNET_ITEM(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), CARRICK_TYPE_ETHERNET_ITEM, CarrickEthernetItem))
-#define CARRICK_ETHERNET_ITEM_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), CARRICK_TYPE_ETHERNET_ITEM, CarrickEthernetItemClass))
-#define CARRICK_IS_ETHERNET_ITEM(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), CARRICK_TYPE_ETHERNET_ITEM))
-#define CARRICK_IS_ETHERNET_ITEM_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), CARRICK_TYPE_ETHERNET_ITEM))
-#define CARRICK_ETHERNET_ITEM_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), CARRICK_TYPE_ETHERNET_ITEM, CarrickEthernetItemClass))
+#define NMN_TYPE_ETHERNET_ITEM (nmn_ethernet_item_get_type ())
+#define NMN_ETHERNET_ITEM(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NMN_TYPE_ETHERNET_ITEM, NmnEthernetItem))
+#define NMN_ETHERNET_ITEM_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NMN_TYPE_ETHERNET_ITEM, NmnEthernetItemClass))
+#define NMN_IS_ETHERNET_ITEM(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NMN_TYPE_ETHERNET_ITEM))
+#define NMN_IS_ETHERNET_ITEM_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), NMN_TYPE_ETHERNET_ITEM))
+#define NMN_ETHERNET_ITEM_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), NMN_TYPE_ETHERNET_ITEM, NmnEthernetItemClass))
typedef struct {
- CarrickNetworkItem parent;
-} CarrickEthernetItem;
+ NmnNetworkItem parent;
+} NmnEthernetItem;
typedef struct {
- CarrickNetworkItemClass parent;
-} CarrickEthernetItemClass;
+ NmnNetworkItemClass parent;
+} NmnEthernetItemClass;
-GType carrick_ethernet_item_get_type (void);
+GType nmn_ethernet_item_get_type (void);
GtkWidget *
-carrick_ethernet_item_create (CarrickNMData *nm_data,
- NMDeviceEthernet *device,
- NMExportedConnection *exported);
+nmn_ethernet_item_create (NmnNMData *nm_data,
+ NMDeviceEthernet *device,
+ NMExportedConnection *exported);
-#endif /* CARRICK_ETHERNET_ITEM_H */
+#endif /* NMN_ETHERNET_ITEM_H */
diff --git a/src/nmn-icon-cache.c b/src/nmn-icon-cache.c
index fd83995..6f6baf0 100644
--- a/src/nmn-icon-cache.c
+++ b/src/nmn-icon-cache.c
@@ -7,7 +7,7 @@ static GtkIconTheme *icon_theme = NULL;
static GHashTable *cache = NULL;
void
-carrick_icon_cache_invalidate (void)
+nmn_icon_cache_invalidate (void)
{
if (cache) {
g_hash_table_destroy (cache);
@@ -21,7 +21,7 @@ carrick_icon_cache_invalidate (void)
}
GdkPixbuf *
-carrick_icon_cache_get (const char *icon_name)
+nmn_icon_cache_get (const char *icon_name)
{
GdkPixbuf *pixbuf;
GError *error = NULL;
@@ -30,7 +30,7 @@ carrick_icon_cache_get (const char *icon_name)
if (G_UNLIKELY (icon_theme == NULL)) {
icon_theme = gtk_icon_theme_get_for_screen (gdk_screen_get_default ());
- g_signal_connect (icon_theme, "changed", G_CALLBACK (carrick_icon_cache_invalidate), NULL);
+ g_signal_connect (icon_theme, "changed", G_CALLBACK (nmn_icon_cache_invalidate), NULL);
}
if (G_UNLIKELY (cache == NULL)) {
diff --git a/src/nmn-icon-cache.h b/src/nmn-icon-cache.h
index bcebb03..006860c 100644
--- a/src/nmn-icon-cache.h
+++ b/src/nmn-icon-cache.h
@@ -1,11 +1,11 @@
/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-#ifndef CARRICK_ICON_CACHE_H
-#define CARRICK_ICON_CACHE_H
+#ifndef NMN_ICON_CACHE_H
+#define NMN_ICON_CACHE_H
#include <gdk-pixbuf/gdk-pixbuf.h>
-GdkPixbuf *carrick_icon_cache_get (const char *icon_name);
-void carrick_icon_cache_invalidate (void);
+GdkPixbuf *nmn_icon_cache_get (const char *icon_name);
+void nmn_icon_cache_invalidate (void);
-#endif /* CARRICK_ICON_CACHE_H */
+#endif /* NMN_ICON_CACHE_H */
diff --git a/src/nmn-item.c b/src/nmn-item.c
index 6f798ef..976714d 100644
--- a/src/nmn-item.c
+++ b/src/nmn-item.c
@@ -3,7 +3,7 @@
#include "nmn-item.h"
#include "nmn-icon-cache.h"
-G_DEFINE_TYPE (CarrickItem, carrick_item, GTK_TYPE_HBOX)
+G_DEFINE_TYPE (NmnItem, nmn_item, GTK_TYPE_HBOX)
enum {
CONNECT_REQUESTED,
@@ -14,7 +14,7 @@ enum {
static guint signals[LAST_SIGNAL];
-#define CARRICK_ITEM_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), CARRICK_TYPE_ITEM, CarrickItemPrivate))
+#define NMN_ITEM_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), NMN_TYPE_ITEM, NmnItemPrivate))
typedef struct {
GtkWidget *icon;
@@ -25,26 +25,26 @@ typedef struct {
GtkLabel *advanced;
GtkButton *connect;
GtkWidget *remove;
- CarrickItemStatus status;
-} CarrickItemPrivate;
+ NmnItemStatus status;
+} NmnItemPrivate;
GtkWidget *
-carrick_item_new (void)
+nmn_item_new (void)
{
- return GTK_WIDGET (g_object_new (CARRICK_TYPE_ITEM, NULL));
+ return GTK_WIDGET (g_object_new (NMN_TYPE_ITEM, NULL));
}
void
-carrick_item_set_name (CarrickItem *item,
- const char *name)
+nmn_item_set_name (NmnItem *item,
+ const char *name)
{
- CarrickItemPrivate *priv;
+ NmnItemPrivate *priv;
char *s;
- g_return_if_fail (CARRICK_IS_ITEM (item));
+ g_return_if_fail (NMN_IS_ITEM (item));
g_return_if_fail (name != NULL);
- priv = CARRICK_ITEM_GET_PRIVATE (item);
+ priv = NMN_ITEM_GET_PRIVATE (item);
s = g_strdup_printf ("<big><b>%s</b></big>", name);
gtk_label_set_markup (GTK_LABEL (priv->name), s);
@@ -52,14 +52,14 @@ carrick_item_set_name (CarrickItem *item,
}
void
-carrick_item_set_status_visible (CarrickItem *item,
- gboolean visible)
+nmn_item_set_status_visible (NmnItem *item,
+ gboolean visible)
{
- CarrickItemPrivate *priv;
+ NmnItemPrivate *priv;
- g_return_if_fail (CARRICK_IS_ITEM (item));
+ g_return_if_fail (NMN_IS_ITEM (item));
- priv = CARRICK_ITEM_GET_PRIVATE (item);
+ priv = NMN_ITEM_GET_PRIVATE (item);
if (visible) {
gtk_widget_show (priv->status_separator);
gtk_widget_show (GTK_WIDGET (priv->status_label));
@@ -70,27 +70,27 @@ carrick_item_set_status_visible (CarrickItem *item,
}
void
-carrick_item_set_status (CarrickItem *item,
- CarrickItemStatus status)
+nmn_item_set_status (NmnItem *item,
+ NmnItemStatus status)
{
- CarrickItemPrivate *priv;
+ NmnItemPrivate *priv;
- g_return_if_fail (CARRICK_IS_ITEM (item));
+ g_return_if_fail (NMN_IS_ITEM (item));
- priv = CARRICK_ITEM_GET_PRIVATE (item);
+ priv = NMN_ITEM_GET_PRIVATE (item);
if (priv->status != status) {
priv->status = status;
switch (status) {
- case CARRICK_ITEM_STATUS_DISCONNECTED:
+ case NMN_ITEM_STATUS_DISCONNECTED:
gtk_label_set_markup (priv->status_label, "<big><b>Disconnected</b></big>");
gtk_button_set_label (priv->connect, "Connect");
break;
- case CARRICK_ITEM_STATUS_CONNECTING:
+ case NMN_ITEM_STATUS_CONNECTING:
gtk_label_set_markup (priv->status_label, "<big><b>Connecting...</b></big>");
gtk_button_set_label (priv->connect, "Disconnect");
break;
- case CARRICK_ITEM_STATUS_CONNECTED:
+ case NMN_ITEM_STATUS_CONNECTED:
gtk_label_set_markup (priv->status_label, "<big><b>Connected</b></big>");
gtk_button_set_label (priv->connect, "Disconnect");
break;
@@ -99,20 +99,20 @@ carrick_item_set_status (CarrickItem *item,
}
void
-carrick_item_set_icon (CarrickItem *item,
- const char *icon_name)
+nmn_item_set_icon (NmnItem *item,
+ const char *icon_name)
{
GtkImage *image;
GdkPixbuf *pixbuf;
- g_return_if_fail (CARRICK_IS_ITEM (item));
+ g_return_if_fail (NMN_IS_ITEM (item));
g_return_if_fail (icon_name != NULL);
- pixbuf = carrick_icon_cache_get (icon_name);
+ pixbuf = nmn_icon_cache_get (icon_name);
if (!pixbuf)
return;
- image = GTK_IMAGE (CARRICK_ITEM_GET_PRIVATE (item)->icon);
+ image = GTK_IMAGE (NMN_ITEM_GET_PRIVATE (item)->icon);
if (gtk_image_get_storage_type (image) == GTK_IMAGE_PIXBUF && gtk_image_get_pixbuf (image) == pixbuf)
return;
@@ -121,22 +121,22 @@ carrick_item_set_icon (CarrickItem *item,
}
void
-carrick_item_set_security (CarrickItem *item,
- const char *security_string)
+nmn_item_set_security (NmnItem *item,
+ const char *security_string)
{
- g_return_if_fail (CARRICK_IS_ITEM (item));
+ g_return_if_fail (NMN_IS_ITEM (item));
- gtk_label_set_text (GTK_LABEL (CARRICK_ITEM_GET_PRIVATE (item)->security),
+ gtk_label_set_text (GTK_LABEL (NMN_ITEM_GET_PRIVATE (item)->security),
security_string ? security_string : "");
}
void
-carrick_item_set_remove_visible (CarrickItem *item,
- gboolean visible)
+nmn_item_set_remove_visible (NmnItem *item,
+ gboolean visible)
{
- CarrickItemPrivate *priv = CARRICK_ITEM_GET_PRIVATE (item);
+ NmnItemPrivate *priv = NMN_ITEM_GET_PRIVATE (item);
- g_return_if_fail (CARRICK_IS_ITEM (item));
+ g_return_if_fail (NMN_IS_ITEM (item));
if (visible && !priv->remove) {
priv->remove = gtk_button_new ();
@@ -145,7 +145,7 @@ carrick_item_set_remove_visible (CarrickItem *item,
gtk_box_pack_end (GTK_BOX (item), priv->remove, FALSE, FALSE, 0);
g_signal_connect_swapped (priv->remove, "clicked",
- G_CALLBACK (carrick_item_remove_request),
+ G_CALLBACK (nmn_item_remove_request),
item);
} else if (!visible && priv->remove) {
gtk_container_remove (GTK_CONTAINER (item), priv->remove);
@@ -154,37 +154,37 @@ carrick_item_set_remove_visible (CarrickItem *item,
}
void
-carrick_item_connect_request (CarrickItem *self)
+nmn_item_connect_request (NmnItem *self)
{
- g_return_if_fail (CARRICK_IS_ITEM (self));
+ g_return_if_fail (NMN_IS_ITEM (self));
g_signal_emit (self, signals[CONNECT_REQUESTED], 0);
}
void
-carrick_item_disconnect_request (CarrickItem *self)
+nmn_item_disconnect_request (NmnItem *self)
{
- g_return_if_fail (CARRICK_IS_ITEM (self));
+ g_return_if_fail (NMN_IS_ITEM (self));
g_signal_emit (self, signals[DISCONNECT_REQUESTED], 0);
}
void
-carrick_item_remove_request (CarrickItem *self)
+nmn_item_remove_request (NmnItem *self)
{
- g_return_if_fail (CARRICK_IS_ITEM (self));
+ g_return_if_fail (NMN_IS_ITEM (self));
g_signal_emit (self, signals[REMOVE_REQUESTED], 0);
}
static void
-carrick_item_connect (CarrickItem *item)
+nmn_item_connect (NmnItem *item)
{
g_warning ("Connect not overriden");
}
static void
-carrick_item_disconnect (CarrickItem *item)
+nmn_item_disconnect (NmnItem *item)
{
g_warning ("Disconnect not overriden");
}
@@ -192,22 +192,22 @@ carrick_item_disconnect (CarrickItem *item)
static void
connect_clicked (GtkButton *button, gpointer user_data)
{
- CarrickItem *item = CARRICK_ITEM (user_data);
- CarrickItemPrivate *priv = CARRICK_ITEM_GET_PRIVATE (item);
+ NmnItem *item = NMN_ITEM (user_data);
+ NmnItemPrivate *priv = NMN_ITEM_GET_PRIVATE (item);
- if (priv->status == CARRICK_ITEM_STATUS_DISCONNECTED) {
- CARRICK_ITEM_GET_CLASS (item)->connect (item);
- carrick_item_connect_request (item);
+ if (priv->status == NMN_ITEM_STATUS_DISCONNECTED) {
+ NMN_ITEM_GET_CLASS (item)->connect (item);
+ nmn_item_connect_request (item);
} else {
- CARRICK_ITEM_GET_CLASS (item)->disconnect (item);
- carrick_item_disconnect_request (item);
+ NMN_ITEM_GET_CLASS (item)->disconnect (item);
+ nmn_item_disconnect_request (item);
}
}
static void
-carrick_item_init (CarrickItem *item)
+nmn_item_init (NmnItem *item)
{
- CarrickItemPrivate *priv = CARRICK_ITEM_GET_PRIVATE (item);
+ NmnItemPrivate *priv = NMN_ITEM_GET_PRIVATE (item);
GtkWidget *vbox;
GtkWidget *hbox;
GtkWidget *w;
@@ -259,21 +259,21 @@ carrick_item_init (CarrickItem *item)
}
static void
-carrick_item_class_init (CarrickItemClass *class)
+nmn_item_class_init (NmnItemClass *class)
{
GObjectClass *object_class = G_OBJECT_CLASS (class);
- g_type_class_add_private (object_class, sizeof (CarrickItemPrivate));
+ g_type_class_add_private (object_class, sizeof (NmnItemPrivate));
- class->connect = carrick_item_connect;
- class->disconnect = carrick_item_disconnect;
+ class->connect = nmn_item_connect;
+ class->disconnect = nmn_item_disconnect;
/* Signals */
signals[CONNECT_REQUESTED] = g_signal_new
("connect-requested",
G_OBJECT_CLASS_TYPE (class),
G_SIGNAL_RUN_LAST,
- G_STRUCT_OFFSET (CarrickItemClass, connect_requested),
+ G_STRUCT_OFFSET (NmnItemClass, connect_requested),
NULL, NULL,
g_cclosure_marshal_VOID__VOID,
G_TYPE_NONE, 0);
@@ -282,7 +282,7 @@ carrick_item_class_init (CarrickItemClass *class)
("disconnect-requested",
G_OBJECT_CLASS_TYPE (class),
G_SIGNAL_RUN_LAST,
- G_STRUCT_OFFSET (CarrickItemClass, disconnect_requested),
+ G_STRUCT_OFFSET (NmnItemClass, disconnect_requested),
NULL, NULL,
g_cclosure_marshal_VOID__VOID,
G_TYPE_NONE, 0);
@@ -291,7 +291,7 @@ carrick_item_class_init (CarrickItemClass *class)
("remove-requested",
G_OBJECT_CLASS_TYPE (class),
G_SIGNAL_RUN_LAST,
- G_STRUCT_OFFSET (CarrickItemClass, remove_requested),
+ G_STRUCT_OFFSET (NmnItemClass, remove_requested),
NULL, NULL,
g_cclosure_marshal_VOID__VOID,
G_TYPE_NONE, 0);
diff --git a/src/nmn-item.h b/src/nmn-item.h
index 33bcd4c..16954eb 100644
--- a/src/nmn-item.h
+++ b/src/nmn-item.h
@@ -1,64 +1,64 @@
/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-#ifndef CARRICK_ITEM_H
-#define CARRICK_ITEM_H
+#ifndef NMN_ITEM_H
+#define NMN_ITEM_H
#include <gtk/gtk.h>
-#define CARRICK_TYPE_ITEM (carrick_item_get_type ())
-#define CARRICK_ITEM(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), CARRICK_TYPE_ITEM, CarrickItem))
-#define CARRICK_ITEM_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), CARRICK_TYPE_ITEM, CarrickItemClass))
-#define CARRICK_IS_ITEM(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), CARRICK_TYPE_ITEM))
-#define CARRICK_IS_ITEM_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), CARRICK_TYPE_ITEM))
-#define CARRICK_ITEM_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), CARRICK_TYPE_ITEM, CarrickItemClass))
+#define NMN_TYPE_ITEM (nmn_item_get_type ())
+#define NMN_ITEM(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NMN_TYPE_ITEM, NmnItem))
+#define NMN_ITEM_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NMN_TYPE_ITEM, NmnItemClass))
+#define NMN_IS_ITEM(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NMN_TYPE_ITEM))
+#define NMN_IS_ITEM_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), NMN_TYPE_ITEM))
+#define NMN_ITEM_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), NMN_TYPE_ITEM, NmnItemClass))
typedef struct {
GtkHBox parent;
-} CarrickItem;
+} NmnItem;
typedef struct {
GtkHBoxClass parent;
/* Methods */
- void (*connect) (CarrickItem *self);
- void (*disconnect) (CarrickItem *self);
+ void (*connect) (NmnItem *self);
+ void (*disconnect) (NmnItem *self);
/* Signals */
- void (*connect_requested) (CarrickItem *self);
- void (*disconnect_requested) (CarrickItem *self);
- void (*remove_requested) (CarrickItem *self);
-} CarrickItemClass;
+ void (*connect_requested) (NmnItem *self);
+ void (*disconnect_requested) (NmnItem *self);
+ void (*remove_requested) (NmnItem *self);
+} NmnItemClass;
typedef enum {
- CARRICK_ITEM_STATUS_DISCONNECTED,
- CARRICK_ITEM_STATUS_CONNECTING,
- CARRICK_ITEM_STATUS_CONNECTED
-} CarrickItemStatus;
+ NMN_ITEM_STATUS_DISCONNECTED,
+ NMN_ITEM_STATUS_CONNECTING,
+ NMN_ITEM_STATUS_CONNECTED
+} NmnItemStatus;
-GType carrick_item_get_type (void);
+GType nmn_item_get_type (void);
-GtkWidget *carrick_item_new (void);
+GtkWidget *nmn_item_new (void);
-void carrick_item_set_name (CarrickItem *item,
- const char *name);
+void nmn_item_set_name (NmnItem *item,
+ const char *name);
-void carrick_item_set_status_visible (CarrickItem *item,
- gboolean visible);
+void nmn_item_set_status_visible (NmnItem *item,
+ gboolean visible);
-void carrick_item_set_status (CarrickItem *item,
- CarrickItemStatus status);
+void nmn_item_set_status (NmnItem *item,
+ NmnItemStatus status);
-void carrick_item_set_icon (CarrickItem *item,
- const char *icon_name);
+void nmn_item_set_icon (NmnItem *item,
+ const char *icon_name);
-void carrick_item_set_security (CarrickItem *item,
- const char *security_string);
+void nmn_item_set_security (NmnItem *item,
+ const char *security_string);
-void carrick_item_set_remove_visible (CarrickItem *item,
- gboolean visible);
+void nmn_item_set_remove_visible (NmnItem *item,
+ gboolean visible);
-void carrick_item_connect_request (CarrickItem *self);
-void carrick_item_disconnect_request (CarrickItem *self);
-void carrick_item_remove_request (CarrickItem *self);
+void nmn_item_connect_request (NmnItem *self);
+void nmn_item_disconnect_request (NmnItem *self);
+void nmn_item_remove_request (NmnItem *self);
-#endif /* CARRICK_ITEM_H */
+#endif /* NMN_ITEM_H */
diff --git a/src/nmn-list.c b/src/nmn-list.c
index b0e51d5..736b98d 100644
--- a/src/nmn-list.c
+++ b/src/nmn-list.c
@@ -2,23 +2,23 @@
#include "nmn-list.h"
-#define CARRICK_DRAG_TARGET "CARRICK_DRAG_TARGET"
-static const GtkTargetEntry carrick_list_targets [] = {
- { CARRICK_DRAG_TARGET, GTK_TARGET_SAME_APP, 0 },
+#define NMN_DRAG_TARGET "NMN_DRAG_TARGET"
+static const GtkTargetEntry nmn_list_targets [] = {
+ { NMN_DRAG_TARGET, GTK_TARGET_SAME_APP, 0 },
};
-G_DEFINE_TYPE (CarrickList, carrick_list, GTK_TYPE_VBOX)
+G_DEFINE_TYPE (NmnList, nmn_list, GTK_TYPE_VBOX)
-#define CARRICK_LIST_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), CARRICK_TYPE_LIST, CarrickListPrivate))
+#define NMN_LIST_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), NMN_TYPE_LIST, NmnListPrivate))
typedef struct {
GtkWidget *dnd_window;
-} CarrickListPrivate;
+} NmnListPrivate;
GtkWidget *
-carrick_list_new (void)
+nmn_list_new (void)
{
- return GTK_WIDGET (g_object_new (CARRICK_TYPE_LIST, NULL));
+ return GTK_WIDGET (g_object_new (NMN_TYPE_LIST, NULL));
}
typedef struct {
@@ -55,7 +55,7 @@ container_get_position (GtkContainer *container, GtkWidget *child)
static void
drag_begin (GtkWidget *widget, GdkDragContext *drag_context, gpointer user_data)
{
- CarrickListPrivate *priv = CARRICK_LIST_GET_PRIVATE (user_data);
+ NmnListPrivate *priv = NMN_LIST_GET_PRIVATE (user_data);
g_object_set_data (G_OBJECT (widget), "original-location",
GINT_TO_POINTER (container_get_position (GTK_CONTAINER (user_data), widget)));
@@ -77,7 +77,7 @@ drag_data_get (GtkWidget *widget,
guint info,
guint time)
{
- if (data->target == gdk_atom_intern_static_string (CARRICK_DRAG_TARGET)) {
+ if (data->target == gdk_atom_intern_static_string (NMN_DRAG_TARGET)) {
gtk_selection_data_set (data,
data->target,
8,
@@ -93,7 +93,7 @@ drag_failed (GtkWidget *widget,
gpointer user_data)
{
if (result != GTK_DRAG_RESULT_SUCCESS) {
- CarrickListPrivate *priv = CARRICK_LIST_GET_PRIVATE (user_data);
+ NmnListPrivate *priv = NMN_LIST_GET_PRIVATE (user_data);
g_debug ("drag failed");
g_object_ref (widget);
@@ -113,7 +113,7 @@ drag_failed (GtkWidget *widget,
static void
drag_end (GtkWidget *widget, GdkDragContext *drag_context, gpointer user_data)
{
- CarrickListPrivate *priv = CARRICK_LIST_GET_PRIVATE (user_data);
+ NmnListPrivate *priv = NMN_LIST_GET_PRIVATE (user_data);
g_debug ("drag end");
GTK_BIN (priv->dnd_window)->child = NULL;
@@ -121,14 +121,14 @@ drag_end (GtkWidget *widget, GdkDragContext *drag_context, gpointer user_data)
}
void
-carrick_list_add_item (CarrickList *list,
- GtkWidget *item)
+nmn_list_add_item (NmnList *list,
+ GtkWidget *item)
{
- g_return_if_fail (CARRICK_IS_LIST (list));
+ g_return_if_fail (NMN_IS_LIST (list));
g_return_if_fail (GTK_IS_WIDGET (item));
gtk_drag_source_set (item, GDK_BUTTON1_MASK,
- carrick_list_targets, G_N_ELEMENTS (carrick_list_targets),
+ nmn_list_targets, G_N_ELEMENTS (nmn_list_targets),
GDK_ACTION_MOVE);
g_signal_connect (item, "drag-begin",
@@ -192,17 +192,17 @@ find_active_item (GtkContainer *container, gint y, GtkWidget **active_widget, gi
}
static gboolean
-carrick_list_drag_drop (GtkWidget *widget,
- GdkDragContext *context,
- gint x,
- gint y,
- guint time)
+nmn_list_drag_drop (GtkWidget *widget,
+ GdkDragContext *context,
+ gint x,
+ gint y,
+ guint time)
{
GdkAtom target, item_target;
g_debug ("drag_drop1");
target = gtk_drag_dest_find_target (widget, context, NULL);
- item_target = gdk_atom_intern_static_string (CARRICK_DRAG_TARGET);
+ item_target = gdk_atom_intern_static_string (NMN_DRAG_TARGET);
if (target == item_target) {
gtk_drag_get_data (widget, context, target, time);
@@ -215,20 +215,20 @@ carrick_list_drag_drop (GtkWidget *widget,
}
static void
-carrick_list_drag_data_received (GtkWidget *widget,
- GdkDragContext *context,
- gint x,
- gint y,
- GtkSelectionData *data,
- guint info,
- guint time)
+nmn_list_drag_data_received (GtkWidget *widget,
+ GdkDragContext *context,
+ gint x,
+ gint y,
+ GtkSelectionData *data,
+ guint info,
+ guint time)
{
GtkWidget *source_widget;
- CarrickListPrivate *priv = CARRICK_LIST_GET_PRIVATE (widget);
+ NmnListPrivate *priv = NMN_LIST_GET_PRIVATE (widget);
g_debug ("data_received1");
source_widget = gtk_drag_get_source_widget (context);
- if (source_widget && data->target == gdk_atom_intern_static_string (CARRICK_DRAG_TARGET)) {
+ if (source_widget && data->target == gdk_atom_intern_static_string (NMN_DRAG_TARGET)) {
GtkWidget *active_widget;
gint active_position = -1;
@@ -252,12 +252,12 @@ carrick_list_drag_data_received (GtkWidget *widget,
}
static void
-carrick_list_init (CarrickList *list)
+nmn_list_init (NmnList *list)
{
gtk_drag_dest_set (GTK_WIDGET (list),
GTK_DEST_DEFAULT_ALL,
- carrick_list_targets,
- G_N_ELEMENTS (carrick_list_targets),
+ nmn_list_targets,
+ G_N_ELEMENTS (nmn_list_targets),
GDK_ACTION_MOVE);
gtk_box_set_homogeneous (GTK_BOX (list), TRUE);
@@ -265,13 +265,13 @@ carrick_list_init (CarrickList *list)
}
static void
-carrick_list_class_init (CarrickListClass *class)
+nmn_list_class_init (NmnListClass *class)
{
GObjectClass *object_class = G_OBJECT_CLASS (class);
GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (class);
- g_type_class_add_private (object_class, sizeof (CarrickListPrivate));
+ g_type_class_add_private (object_class, sizeof (NmnListPrivate));
- widget_class->drag_drop = carrick_list_drag_drop;
- widget_class->drag_data_received = carrick_list_drag_data_received;
+ widget_class->drag_drop = nmn_list_drag_drop;
+ widget_class->drag_data_received = nmn_list_drag_data_received;
}
diff --git a/src/nmn-list.h b/src/nmn-list.h
index 32bcbf5..d84d4c4 100644
--- a/src/nmn-list.h
+++ b/src/nmn-list.h
@@ -1,29 +1,29 @@
/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-#ifndef CARRICK_LIST_H
-#define CARRICK_LIST_H
+#ifndef NMN_LIST_H
+#define NMN_LIST_H
#include <gtk/gtk.h>
-#define CARRICK_TYPE_LIST (carrick_list_get_type ())
-#define CARRICK_LIST(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), CARRICK_TYPE_LIST, CarrickList))
-#define CARRICK_LIST_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), CARRICK_TYPE_LIST, CarrickListClass))
-#define CARRICK_IS_LIST(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), CARRICK_TYPE_LIST))
-#define CARRICK_IS_LIST_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), CARRICK_TYPE_LIST))
-#define CARRICK_LIST_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), CARRICK_TYPE_LIST, CarrickListClass))
+#define NMN_TYPE_LIST (nmn_list_get_type ())
+#define NMN_LIST(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NMN_TYPE_LIST, NmnList))
+#define NMN_LIST_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NMN_TYPE_LIST, NmnListClass))
+#define NMN_IS_LIST(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NMN_TYPE_LIST))
+#define NMN_IS_LIST_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), NMN_TYPE_LIST))
+#define NMN_LIST_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), NMN_TYPE_LIST, NmnListClass))
typedef struct {
GtkVBox parent;
-} CarrickList;
+} NmnList;
typedef struct {
GtkVBoxClass parent;
-} CarrickListClass;
+} NmnListClass;
-GType carrick_list_get_type (void);
+GType nmn_list_get_type (void);
-GtkWidget *carrick_list_new (void);
-void carrick_list_add_item (CarrickList *list,
- GtkWidget *item);
+GtkWidget *nmn_list_new (void);
+void nmn_list_add_item (NmnList *list,
+ GtkWidget *item);
-#endif /* CARRICK_LIST_H */
+#endif /* NMN_LIST_H */
diff --git a/src/nmn-mobile-providers.c b/src/nmn-mobile-providers.c
index 8d9f452..bd582a0 100644
--- a/src/nmn-mobile-providers.c
+++ b/src/nmn-mobile-providers.c
@@ -95,25 +95,25 @@ typedef struct {
char *current_country;
GSList *current_providers;
- CarrickMobileProvider *current_provider;
+ NmnMobileProvider *current_provider;
char *text_buffer;
MobileContextState state;
} MobileParser;
-static CarrickMobileProvider *
+static NmnMobileProvider *
provider_new (void)
{
- CarrickMobileProvider *provider;
+ NmnMobileProvider *provider;
- provider = g_slice_new0 (CarrickMobileProvider);
+ provider = g_slice_new0 (NmnMobileProvider);
provider->refs = 1;
return provider;
}
-CarrickMobileProvider *
-carrick_mobile_provider_ref (CarrickMobileProvider *provider)
+NmnMobileProvider *
+nmn_mobile_provider_ref (NmnMobileProvider *provider)
{
provider->refs++;
@@ -121,7 +121,7 @@ carrick_mobile_provider_ref (CarrickMobileProvider *provider)
}
void
-carrick_mobile_provider_unref (CarrickMobileProvider *provider)
+nmn_mobile_provider_unref (NmnMobileProvider *provider)
{
if (--provider->refs == 0) {
g_free (provider->name);
@@ -132,19 +132,19 @@ carrick_mobile_provider_unref (CarrickMobileProvider *provider)
g_slist_foreach (provider->dns, (GFunc) g_free, NULL);
g_slist_free (provider->dns);
- g_slice_free (CarrickMobileProvider, provider);
+ g_slice_free (NmnMobileProvider, provider);
}
}
GType
-carrick_mobile_provider_get_type (void)
+nmn_mobile_provider_get_type (void)
{
static GType type = 0;
if (G_UNLIKELY (type == 0))
- type = g_boxed_type_register_static ("CarrickMobileProvider",
- (GBoxedCopyFunc) carrick_mobile_provider_ref,
- (GBoxedFreeFunc) carrick_mobile_provider_unref);
+ type = g_boxed_type_register_static ("NmnMobileProvider",
+ (GBoxedCopyFunc) nmn_mobile_provider_ref,
+ (GBoxedFreeFunc) nmn_mobile_provider_unref);
return type;
}
@@ -155,7 +155,7 @@ provider_list_free (gpointer data)
GSList *list = (GSList *) data;
while (list) {
- carrick_mobile_provider_unref ((CarrickMobileProvider *) list->data);
+ nmn_mobile_provider_unref ((NmnMobileProvider *) list->data);
list = g_slist_delete_link (list, list);
}
}
@@ -266,7 +266,7 @@ parser_provider_end (MobileParser *parser,
parser->current_provider->apn = parser->text_buffer;
parser->text_buffer = NULL;
} else if (!strcmp (name, "cdma")) {
- parser->current_provider->type = CARRICK_PROVIDER_TYPE_CDMA;
+ parser->current_provider->type = NMN_PROVIDER_TYPE_CDMA;
} else if (!strcmp (name, "provider")) {
parser->current_provider->dns = g_slist_reverse (parser->current_provider->dns);
parser->current_providers = g_slist_prepend (parser->current_providers, parser->current_provider);
@@ -317,7 +317,7 @@ static const GMarkupParser mobile_parser = {
};
GHashTable *
-carrick_mobile_providers_parse (void)
+nmn_mobile_providers_parse (void)
{
GMarkupParseContext *ctx;
GIOChannel *channel;
@@ -378,7 +378,7 @@ carrick_mobile_providers_parse (void)
if (parser.current_provider) {
g_warning ("pending current provider");
- carrick_mobile_provider_unref (parser.current_provider);
+ nmn_mobile_provider_unref (parser.current_provider);
}
if (parser.current_providers) {
diff --git a/src/nmn-mobile-providers.h b/src/nmn-mobile-providers.h
index 6a471bd..5c0c158 100644
--- a/src/nmn-mobile-providers.h
+++ b/src/nmn-mobile-providers.h
@@ -19,18 +19,18 @@
* Author: Tambet Ingo (tambet gmail com).
*/
-#ifndef CARRICK_MOBILE_PROVIDERS_H
-#define CARRICK_MOBILE_PROVIDERS_H
+#ifndef NMN_MOBILE_PROVIDERS_H
+#define NMN_MOBILE_PROVIDERS_H
#include <glib.h>
#include <glib-object.h>
-#define CARRICK_TYPE_MOBILE_PROVIDER (carrick_mobile_provider_get_type ())
+#define NMN_TYPE_MOBILE_PROVIDER (nmn_mobile_provider_get_type ())
typedef enum {
- CARRICK_PROVIDER_TYPE_GSM = 0,
- CARRICK_PROVIDER_TYPE_CDMA
-} CarrickMobileProviderType;
+ NMN_PROVIDER_TYPE_GSM = 0,
+ NMN_PROVIDER_TYPE_CDMA
+} NmnMobileProviderType;
typedef struct {
char *name;
@@ -39,21 +39,21 @@ typedef struct {
char *gateway;
char *apn;
GSList *dns; /* GSList of 'char *' */
- CarrickMobileProviderType type;
+ NmnMobileProviderType type;
gint refs;
-} CarrickMobileProvider;
+} NmnMobileProvider;
-GType carrick_mobile_provider_get_type (void);
+GType nmn_mobile_provider_get_type (void);
-CarrickMobileProvider *carrick_mobile_provider_ref (CarrickMobileProvider *provider);
-void carrick_mobile_provider_unref (CarrickMobileProvider *provider);
+NmnMobileProvider *nmn_mobile_provider_ref (NmnMobileProvider *provider);
+void nmn_mobile_provider_unref (NmnMobileProvider *provider);
/* Returns a hash table where keys are country names 'char *',
- values are CarrickMobileProvider structures.
+ values are NmnMobileProvider structures.
Everything is destroyed with g_hash_table_destroy (). */
-GHashTable *carrick_mobile_providers_parse (void);
+GHashTable *nmn_mobile_providers_parse (void);
-#endif /* CARRICK_MOBILE_PROVIDERS_H */
+#endif /* NMN_MOBILE_PROVIDERS_H */
diff --git a/src/nmn-network-item.c b/src/nmn-network-item.c
index ef0f544..4779fab 100644
--- a/src/nmn-network-item.c
+++ b/src/nmn-network-item.c
@@ -10,7 +10,7 @@
#define DBUS_TYPE_G_MAP_OF_VARIANT (dbus_g_type_get_map ("GHashTable", G_TYPE_STRING, G_TYPE_VALUE))
#define DBUS_TYPE_G_MAP_OF_MAP_OF_VARIANT (dbus_g_type_get_map ("GHashTable", G_TYPE_STRING, DBUS_TYPE_G_MAP_OF_VARIANT))
-G_DEFINE_TYPE (CarrickNetworkItem, carrick_network_item, CARRICK_TYPE_ITEM)
+G_DEFINE_TYPE (NmnNetworkItem, nmn_network_item, NMN_TYPE_ITEM)
enum {
PROP_0,
@@ -22,10 +22,10 @@ enum {
LAST_PROP
};
-#define GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), CARRICK_TYPE_NETWORK_ITEM, CarrickNetworkItemPrivate))
+#define GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), NMN_TYPE_NETWORK_ITEM, NmnNetworkItemPrivate))
typedef struct {
- CarrickNMData *nm_data;
+ NmnNMData *nm_data;
NMDevice *device;
NMExportedConnection *connection;
NMActiveConnection *ac;
@@ -35,28 +35,28 @@ typedef struct {
gulong ac_state_changed_id;
gboolean disposed;
-} CarrickNetworkItemPrivate;
+} NmnNetworkItemPrivate;
-CarrickNMData *
-carrick_network_item_get_nm_data (CarrickNetworkItem *self)
+NmnNMData *
+nmn_network_item_get_nm_data (NmnNetworkItem *self)
{
- g_return_val_if_fail (CARRICK_IS_NETWORK_ITEM (self), NULL);
+ g_return_val_if_fail (NMN_IS_NETWORK_ITEM (self), NULL);
return GET_PRIVATE (self)->nm_data;
}
NMDevice *
-carrick_network_item_get_device (CarrickNetworkItem *self)
+nmn_network_item_get_device (NmnNetworkItem *self)
{
- g_return_val_if_fail (CARRICK_IS_NETWORK_ITEM (self), NULL);
+ g_return_val_if_fail (NMN_IS_NETWORK_ITEM (self), NULL);
return GET_PRIVATE (self)->device;
}
NMActiveConnection *
-carrick_network_item_get_active_connection (CarrickNetworkItem *self)
+nmn_network_item_get_active_connection (NmnNetworkItem *self)
{
- g_return_val_if_fail (CARRICK_IS_NETWORK_ITEM (self), NULL);
+ g_return_val_if_fail (NMN_IS_NETWORK_ITEM (self), NULL);
return GET_PRIVATE (self)->ac;
}
@@ -66,33 +66,33 @@ ac_state_changed (NMActiveConnection *ac,
GParamSpec *pspec,
gpointer user_data)
{
- CarrickItemStatus status;
+ NmnItemStatus status;
if (ac) {
switch (nm_active_connection_get_state (ac)) {
case NM_ACTIVE_CONNECTION_STATE_ACTIVATED:
- status = CARRICK_ITEM_STATUS_CONNECTED;
+ status = NMN_ITEM_STATUS_CONNECTED;
break;
case NM_ACTIVE_CONNECTION_STATE_ACTIVATING:
- status = CARRICK_ITEM_STATUS_CONNECTING;
+ status = NMN_ITEM_STATUS_CONNECTING;
break;
default:
- status = CARRICK_ITEM_STATUS_DISCONNECTED;
+ status = NMN_ITEM_STATUS_DISCONNECTED;
break;
}
} else
- status = CARRICK_ITEM_STATUS_DISCONNECTED;
+ status = NMN_ITEM_STATUS_DISCONNECTED;
- carrick_item_set_status (CARRICK_ITEM (user_data), status);
+ nmn_item_set_status (NMN_ITEM (user_data), status);
}
void
-carrick_network_item_set_active_connection (CarrickNetworkItem *self,
- NMActiveConnection *ac)
+nmn_network_item_set_active_connection (NmnNetworkItem *self,
+ NMActiveConnection *ac)
{
- CarrickNetworkItemPrivate *priv;
+ NmnNetworkItemPrivate *priv;
- g_return_if_fail (CARRICK_IS_NETWORK_ITEM (self));
+ g_return_if_fail (NMN_IS_NETWORK_ITEM (self));
priv = GET_PRIVATE (self);
if (priv->ac) {
@@ -114,10 +114,10 @@ carrick_network_item_set_active_connection (CarrickNetworkItem *self,
}
static void
-update_item (CarrickNetworkItem *self)
+update_item (NmnNetworkItem *self)
{
- CarrickNetworkItemPrivate *priv = GET_PRIVATE (self);
- CarrickItem *item = CARRICK_ITEM (self);
+ NmnNetworkItemPrivate *priv = GET_PRIVATE (self);
+ NmnItem *item = NMN_ITEM (self);
NMConnection *wrapped;
NMSettingConnection *s_con;
@@ -126,7 +126,7 @@ update_item (CarrickNetworkItem *self)
wrapped = nm_exported_connection_get_connection (priv->connection);
s_con = NM_SETTING_CONNECTION (nm_connection_get_setting (wrapped, NM_TYPE_SETTING_CONNECTION));
- carrick_item_set_name (item, nm_setting_connection_get_id (s_con));
+ nmn_item_set_name (item, nm_setting_connection_get_id (s_con));
}
static void
@@ -134,7 +134,7 @@ updated (NMExportedConnection *connection,
GHashTable *settings,
gpointer user_data)
{
- update_item (CARRICK_NETWORK_ITEM (user_data));
+ update_item (NMN_NETWORK_ITEM (user_data));
}
static void
@@ -145,10 +145,10 @@ connection_secrets_requested_cb (NMExportedConnection *connection,
DBusGMethodInvocation *context,
gpointer user_data)
{
- CarrickNetworkItem *self = CARRICK_NETWORK_ITEM (user_data);
+ NmnNetworkItem *self = NMN_NETWORK_ITEM (user_data);
- if (CARRICK_NETWORK_ITEM_GET_CLASS (self)->secrets_requested)
- CARRICK_NETWORK_ITEM_GET_CLASS (self)->secrets_requested (self, setting_name, hints, ask_user, context);
+ if (NMN_NETWORK_ITEM_GET_CLASS (self)->secrets_requested)
+ NMN_NETWORK_ITEM_GET_CLASS (self)->secrets_requested (self, setting_name, hints, ask_user, context);
else {
GError *error = NULL;
@@ -170,9 +170,9 @@ connect_cb (gpointer user_data,
}
static void
-connect (CarrickItem *item)
+connect (NmnItem *item)
{
- CarrickNetworkItemPrivate *priv = GET_PRIVATE (item);
+ NmnNetworkItemPrivate *priv = GET_PRIVATE (item);
NMConnection *wrapped;
const char *path;
const char *service_name;
@@ -191,8 +191,8 @@ connect (CarrickItem *item)
service_name = (scope == NM_CONNECTION_SCOPE_USER) ?
NM_DBUS_SERVICE_USER_SETTINGS : NM_DBUS_SERVICE_SYSTEM_SETTINGS;
- if (CARRICK_NETWORK_ITEM_GET_CLASS (item)->get_specific_object)
- specific_object = CARRICK_NETWORK_ITEM_GET_CLASS (item)->get_specific_object (CARRICK_NETWORK_ITEM (item));
+ if (NMN_NETWORK_ITEM_GET_CLASS (item)->get_specific_object)
+ specific_object = NMN_NETWORK_ITEM_GET_CLASS (item)->get_specific_object (NMN_NETWORK_ITEM (item));
else
specific_object = "/";
@@ -206,9 +206,9 @@ connect (CarrickItem *item)
}
static void
-disconnect (CarrickItem *item)
+disconnect (NmnItem *item)
{
- CarrickNetworkItemPrivate *priv = GET_PRIVATE (item);
+ NmnNetworkItemPrivate *priv = GET_PRIVATE (item);
if (!priv->ac) {
g_warning ("Can not disconnect, the item is not active?");
@@ -219,20 +219,20 @@ disconnect (CarrickItem *item)
}
NMExportedConnection *
-carrick_network_item_get_connection (CarrickNetworkItem *self)
+nmn_network_item_get_connection (NmnNetworkItem *self)
{
- g_return_val_if_fail (CARRICK_IS_NETWORK_ITEM (self), NULL);
+ g_return_val_if_fail (NMN_IS_NETWORK_ITEM (self), NULL);
return GET_PRIVATE (self)->connection;
}
void
-carrick_network_item_set_connection (CarrickNetworkItem *self,
- NMExportedConnection *connection)
+nmn_network_item_set_connection (NmnNetworkItem *self,
+ NMExportedConnection *connection)
{
- CarrickNetworkItemPrivate *priv;
+ NmnNetworkItemPrivate *priv;
- g_return_if_fail (CARRICK_IS_NETWORK_ITEM (self));
+ g_return_if_fail (NMN_IS_NETWORK_ITEM (self));
priv = GET_PRIVATE (self);
@@ -263,9 +263,9 @@ carrick_network_item_set_connection (CarrickNetworkItem *self,
}
static void
-remove_requested (CarrickItem *item)
+remove_requested (NmnItem *item)
{
- NMExportedConnection *exported = carrick_network_item_get_connection (CARRICK_NETWORK_ITEM (item));
+ NMExportedConnection *exported = nmn_network_item_get_connection (NMN_NETWORK_ITEM (item));
g_debug ("network item remove requested (%p)", exported);
if (exported)
@@ -273,7 +273,7 @@ remove_requested (CarrickItem *item)
}
static void
-carrick_network_item_init (CarrickNetworkItem *item)
+nmn_network_item_init (NmnNetworkItem *item)
{
/* Connect the signal here to be sure we're the first one called */
g_signal_connect (item, "remove-requested", G_CALLBACK (remove_requested), NULL);
@@ -285,9 +285,9 @@ constructor (GType type,
GObjectConstructParam *construct_params)
{
GObject *object;
- CarrickNetworkItemPrivate *priv;
+ NmnNetworkItemPrivate *priv;
- object = G_OBJECT_CLASS (carrick_network_item_parent_class)->constructor
+ object = G_OBJECT_CLASS (nmn_network_item_parent_class)->constructor
(type, n_construct_params, construct_params);
if (!object)
@@ -308,7 +308,7 @@ static void
set_property (GObject *object, guint prop_id,
const GValue *value, GParamSpec *pspec)
{
- CarrickNetworkItemPrivate *priv = GET_PRIVATE (object);
+ NmnNetworkItemPrivate *priv = GET_PRIVATE (object);
switch (prop_id) {
case PROP_NM_DATA:
@@ -320,12 +320,12 @@ set_property (GObject *object, guint prop_id,
priv->device = g_value_dup_object (value);
break;
case PROP_CONNECTION:
- carrick_network_item_set_connection (CARRICK_NETWORK_ITEM (object),
- (NMExportedConnection *) g_value_get_object (value));
+ nmn_network_item_set_connection (NMN_NETWORK_ITEM (object),
+ (NMExportedConnection *) g_value_get_object (value));
break;
case PROP_AC:
- carrick_network_item_set_active_connection (CARRICK_NETWORK_ITEM (object),
- (NMActiveConnection *) g_value_get_object (value));
+ nmn_network_item_set_active_connection (NMN_NETWORK_ITEM (object),
+ (NMActiveConnection *) g_value_get_object (value));
break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
@@ -337,7 +337,7 @@ static void
get_property (GObject *object, guint prop_id,
GValue *value, GParamSpec *pspec)
{
- CarrickNetworkItemPrivate *priv = GET_PRIVATE (object);
+ NmnNetworkItemPrivate *priv = GET_PRIVATE (object);
switch (prop_id) {
case PROP_NM_DATA:
@@ -361,34 +361,34 @@ get_property (GObject *object, guint prop_id,
static void
dispose (GObject *object)
{
- CarrickNetworkItem *self = CARRICK_NETWORK_ITEM (object);
- CarrickNetworkItemPrivate *priv = GET_PRIVATE (object);
+ NmnNetworkItem *self = NMN_NETWORK_ITEM (object);
+ NmnNetworkItemPrivate *priv = GET_PRIVATE (object);
if (priv->disposed)
return;
- carrick_network_item_set_connection (self, NULL);
+ nmn_network_item_set_connection (self, NULL);
if (priv->device)
g_object_unref (priv->device);
- carrick_network_item_set_connection (self, NULL);
+ nmn_network_item_set_connection (self, NULL);
if (priv->nm_data)
g_object_unref (priv->nm_data);
priv->disposed = TRUE;
- G_OBJECT_CLASS (carrick_network_item_parent_class)->dispose (object);
+ G_OBJECT_CLASS (nmn_network_item_parent_class)->dispose (object);
}
static void
-carrick_network_item_class_init (CarrickNetworkItemClass *class)
+nmn_network_item_class_init (NmnNetworkItemClass *class)
{
GObjectClass *object_class = G_OBJECT_CLASS (class);
- CarrickItemClass *item_class = CARRICK_ITEM_CLASS (class);
+ NmnItemClass *item_class = NMN_ITEM_CLASS (class);
- g_type_class_add_private (object_class, sizeof (CarrickNetworkItemPrivate));
+ g_type_class_add_private (object_class, sizeof (NmnNetworkItemPrivate));
object_class->constructor = constructor;
object_class->set_property = set_property;
@@ -401,15 +401,15 @@ carrick_network_item_class_init (CarrickNetworkItemClass *class)
/* properties */
g_object_class_install_property
(object_class, PROP_NM_DATA,
- g_param_spec_object (CARRICK_NETWORK_ITEM_NM_DATA,
- "CarrickNMData",
- "CarrickNMData",
- CARRICK_TYPE_NM_DATA,
+ g_param_spec_object (NMN_NETWORK_ITEM_NM_DATA,
+ "NmnNMData",
+ "NmnNMData",
+ NMN_TYPE_NM_DATA,
G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
g_object_class_install_property
(object_class, PROP_DEVICE,
- g_param_spec_object (CARRICK_NETWORK_ITEM_DEVICE,
+ g_param_spec_object (NMN_NETWORK_ITEM_DEVICE,
"NMDevice",
"NMDevice",
NM_TYPE_DEVICE,
@@ -417,7 +417,7 @@ carrick_network_item_class_init (CarrickNetworkItemClass *class)
g_object_class_install_property
(object_class, PROP_CONNECTION,
- g_param_spec_object (CARRICK_NETWORK_ITEM_CONNECTION,
+ g_param_spec_object (NMN_NETWORK_ITEM_CONNECTION,
"NMExportedConnection",
"NMExportedConnection",
NM_TYPE_EXPORTED_CONNECTION,
@@ -425,7 +425,7 @@ carrick_network_item_class_init (CarrickNetworkItemClass *class)
g_object_class_install_property
(object_class, PROP_AC,
- g_param_spec_object (CARRICK_NETWORK_ITEM_AC,
+ g_param_spec_object (NMN_NETWORK_ITEM_AC,
"NMActiveConnection",
"NMActiveConnection",
NM_TYPE_ACTIVE_CONNECTION,
diff --git a/src/nmn-network-item.h b/src/nmn-network-item.h
index 039c6cf..313c04b 100644
--- a/src/nmn-network-item.h
+++ b/src/nmn-network-item.h
@@ -1,51 +1,51 @@
/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-#ifndef CARRICK_NETWORK_ITEM_H
-#define CARRICK_NETWORK_ITEM_H
+#ifndef NMN_NETWORK_ITEM_H
+#define NMN_NETWORK_ITEM_H
#include <dbus/dbus-glib.h>
#include <nm-settings.h>
#include <nmn-item.h>
#include "nmn-nm-data.h"
-#define CARRICK_TYPE_NETWORK_ITEM (carrick_network_item_get_type ())
-#define CARRICK_NETWORK_ITEM(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), CARRICK_TYPE_NETWORK_ITEM, CarrickNetworkItem))
-#define CARRICK_NETWORK_ITEM_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), CARRICK_TYPE_NETWORK_ITEM, CarrickNetworkItemClass))
-#define CARRICK_IS_NETWORK_ITEM(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), CARRICK_TYPE_NETWORK_ITEM))
-#define CARRICK_IS_NETWORK_ITEM_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), CARRICK_TYPE_NETWORK_ITEM))
-#define CARRICK_NETWORK_ITEM_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), CARRICK_TYPE_NETWORK_ITEM, CarrickNetworkItemClass))
+#define NMN_TYPE_NETWORK_ITEM (nmn_network_item_get_type ())
+#define NMN_NETWORK_ITEM(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NMN_TYPE_NETWORK_ITEM, NmnNetworkItem))
+#define NMN_NETWORK_ITEM_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NMN_TYPE_NETWORK_ITEM, NmnNetworkItemClass))
+#define NMN_IS_NETWORK_ITEM(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NMN_TYPE_NETWORK_ITEM))
+#define NMN_IS_NETWORK_ITEM_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), NMN_TYPE_NETWORK_ITEM))
+#define NMN_NETWORK_ITEM_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), NMN_TYPE_NETWORK_ITEM, NmnNetworkItemClass))
-#define CARRICK_NETWORK_ITEM_NM_DATA "nm-data"
-#define CARRICK_NETWORK_ITEM_DEVICE "device"
-#define CARRICK_NETWORK_ITEM_CONNECTION "connection"
-#define CARRICK_NETWORK_ITEM_AC "active-connection"
+#define NMN_NETWORK_ITEM_NM_DATA "nm-data"
+#define NMN_NETWORK_ITEM_DEVICE "device"
+#define NMN_NETWORK_ITEM_CONNECTION "connection"
+#define NMN_NETWORK_ITEM_AC "active-connection"
typedef struct {
- CarrickItem parent;
-} CarrickNetworkItem;
+ NmnItem parent;
+} NmnNetworkItem;
typedef struct {
- CarrickItemClass parent;
+ NmnItemClass parent;
/* Methods */
- const char * (*get_specific_object) (CarrickNetworkItem *self);
- void (*secrets_requested) (CarrickNetworkItem *self,
+ const char * (*get_specific_object) (NmnNetworkItem *self);
+ void (*secrets_requested) (NmnNetworkItem *self,
const char *setting_name,
const char **hints,
gboolean ask_user,
DBusGMethodInvocation *context);
-} CarrickNetworkItemClass;
+} NmnNetworkItemClass;
-GType carrick_network_item_get_type (void);
+GType nmn_network_item_get_type (void);
-CarrickNMData *carrick_network_item_get_nm_data (CarrickNetworkItem *self);
-NMDevice *carrick_network_item_get_device (CarrickNetworkItem *self);
-NMExportedConnection *carrick_network_item_get_connection (CarrickNetworkItem *self);
-void carrick_network_item_set_connection (CarrickNetworkItem *self,
- NMExportedConnection *connection);
+NmnNMData *nmn_network_item_get_nm_data (NmnNetworkItem *self);
+NMDevice *nmn_network_item_get_device (NmnNetworkItem *self);
+NMExportedConnection *nmn_network_item_get_connection (NmnNetworkItem *self);
+void nmn_network_item_set_connection (NmnNetworkItem *self,
+ NMExportedConnection *connection);
-NMActiveConnection *carrick_network_item_get_active_connection (CarrickNetworkItem *self);
-void carrick_network_item_set_active_connection (CarrickNetworkItem *self,
- NMActiveConnection *ac);
+NMActiveConnection *nmn_network_item_get_active_connection (NmnNetworkItem *self);
+void nmn_network_item_set_active_connection (NmnNetworkItem *self,
+ NMActiveConnection *ac);
-#endif /* CARRICK_NETWORK_ITEM_H */
+#endif /* NMN_NETWORK_ITEM_H */
diff --git a/src/nmn-networks.c b/src/nmn-networks.c
index d8b124f..7bf2fe4 100644
--- a/src/nmn-networks.c
+++ b/src/nmn-networks.c
@@ -13,7 +13,7 @@
#define DBUS_TYPE_G_ARRAY_OF_OBJECT_PATH (dbus_g_type_get_collection ("GPtrArray", DBUS_TYPE_G_OBJECT_PATH))
-G_DEFINE_TYPE (CarrickNetworks, carrick_networks, CARRICK_TYPE_LIST)
+G_DEFINE_TYPE (NmnNetworks, nmn_networks, NMN_TYPE_LIST)
enum {
PROP_0,
@@ -22,34 +22,34 @@ enum {
LAST_PROP
};
-#define GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), CARRICK_TYPE_NETWORKS, CarrickNetworksPrivate))
+#define GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), NMN_TYPE_NETWORKS, NmnNetworksPrivate))
typedef struct {
- CarrickNMData *nm_data;
+ NmnNMData *nm_data;
gboolean populated;
gboolean disposed;
-} CarrickNetworksPrivate;
+} NmnNetworksPrivate;
-static void create_new_item (CarrickNetworks *self,
+static void create_new_item (NmnNetworks *self,
NMDevice *device,
NMExportedConnection *exported);
GtkWidget *
-carrick_networks_new (CarrickNMData *nm_data)
+nmn_networks_new (NmnNMData *nm_data)
{
- g_return_val_if_fail (CARRICK_IS_NM_DATA (nm_data), NULL);
+ g_return_val_if_fail (NMN_IS_NM_DATA (nm_data), NULL);
- return GTK_WIDGET (g_object_new (CARRICK_TYPE_NETWORKS,
- CARRICK_NETWORKS_NM_DATA, nm_data,
+ return GTK_WIDGET (g_object_new (NMN_TYPE_NETWORKS,
+ NMN_NETWORKS_NM_DATA, nm_data,
NULL));
}
static void
-find_ac_for_item (CarrickNetworks *self, CarrickNetworkItem *item)
+find_ac_for_item (NmnNetworks *self, NmnNetworkItem *item)
{
- CarrickNetworksPrivate *priv = GET_PRIVATE (self);
+ NmnNetworksPrivate *priv = GET_PRIVATE (self);
NMConnection *connection;
NMConnectionScope scope;
const char *path;
@@ -61,7 +61,7 @@ find_ac_for_item (CarrickNetworks *self, CarrickNetworkItem *item)
if (!acs)
return;
- connection = nm_exported_connection_get_connection (carrick_network_item_get_connection (item));
+ connection = nm_exported_connection_get_connection (nmn_network_item_get_connection (item));
path = nm_connection_get_path (connection);
scope = nm_connection_get_scope (connection);
@@ -75,11 +75,11 @@ find_ac_for_item (CarrickNetworks *self, CarrickNetworkItem *item)
}
}
- carrick_network_item_set_active_connection (item, this_ac);
+ nmn_network_item_set_active_connection (item, this_ac);
}
typedef struct {
- CarrickNetworks *networks;
+ NmnNetworks *networks;
NMDevice *device;
} DeviceAddedInfo;
@@ -97,8 +97,8 @@ device_added (NMClient *client,
NMDevice *device,
gpointer user_data)
{
- CarrickNetworks *self = CARRICK_NETWORKS (user_data);
- CarrickNetworksPrivate *priv = GET_PRIVATE (self);
+ NmnNetworks *self = NMN_NETWORKS (user_data);
+ NmnNetworksPrivate *priv = GET_PRIVATE (self);
NMSettings *settings;
GSList *list;
DeviceAddedInfo info;
@@ -106,14 +106,14 @@ device_added (NMClient *client,
info.networks = self;
info.device = device;
- settings = carrick_nm_data_get_user_settings (priv->nm_data);
+ settings = nmn_nm_data_get_user_settings (priv->nm_data);
if (settings) {
list = nm_settings_list_connections (NM_SETTINGS (settings));
g_slist_foreach (list, device_added_cb, &info);
g_slist_free (list);
}
- settings = carrick_nm_data_get_system_settings (priv->nm_data);
+ settings = nmn_nm_data_get_system_settings (priv->nm_data);
if (settings) {
list = nm_settings_list_connections (NM_SETTINGS (settings));
g_slist_foreach (list, device_added_cb, &info);
@@ -122,7 +122,7 @@ device_added (NMClient *client,
}
typedef struct {
- CarrickItem *item;
+ NmnItem *item;
NMExportedConnection *exported;
NMDevice *device;
GSList *items_to_remove;
@@ -132,19 +132,19 @@ static void
remove_connections_cb (GtkWidget *widget, gpointer data)
{
RemoveInfo *info = (RemoveInfo *) data;
- CarrickNetworkItem *item;
+ NmnNetworkItem *item;
- item = CARRICK_NETWORK_ITEM (gtk_bin_get_child (GTK_BIN (widget)));
- if ((info->item && (CarrickItem *) item == info->item) ||
- (info->exported && carrick_network_item_get_connection (item) == info->exported) ||
- (info->device && carrick_network_item_get_device (item) == info->device))
+ item = NMN_NETWORK_ITEM (gtk_bin_get_child (GTK_BIN (widget)));
+ if ((info->item && (NmnItem *) item == info->item) ||
+ (info->exported && nmn_network_item_get_connection (item) == info->exported) ||
+ (info->device && nmn_network_item_get_device (item) == info->device))
info->items_to_remove = g_slist_prepend (info->items_to_remove, g_object_ref (widget));
}
static void
-remove_connections (CarrickNetworks *self,
- CarrickItem *item,
+remove_connections (NmnNetworks *self,
+ NmnItem *item,
NMExportedConnection *connection,
NMDevice *device)
{
@@ -170,14 +170,14 @@ device_removed (NMClient *client,
NMDevice *device,
gpointer user_data)
{
- remove_connections (CARRICK_NETWORKS (user_data), NULL, NULL, device);
+ remove_connections (NMN_NETWORKS (user_data), NULL, NULL, device);
}
static void
acs_changed_cb (GtkWidget *widget, gpointer data)
{
- find_ac_for_item (CARRICK_NETWORKS (data),
- CARRICK_NETWORK_ITEM (gtk_bin_get_child (GTK_BIN (widget))));
+ find_ac_for_item (NMN_NETWORKS (data),
+ NMN_NETWORK_ITEM (gtk_bin_get_child (GTK_BIN (widget))));
}
static void
@@ -185,7 +185,7 @@ active_connections_changed (NMClient *client,
GParamSpec *pspec,
gpointer user_data)
{
- CarrickNetworks *self = CARRICK_NETWORKS (user_data);
+ NmnNetworks *self = NMN_NETWORKS (user_data);
gtk_container_foreach (GTK_CONTAINER (self), acs_changed_cb, self);
}
@@ -194,30 +194,30 @@ static void
connection_removed (NMExportedConnection *connection,
gpointer user_data)
{
- remove_connections (CARRICK_NETWORKS (user_data), NULL, connection, NULL);
+ remove_connections (NMN_NETWORKS (user_data), NULL, connection, NULL);
}
static void
-item_remove_requested (CarrickItem *item,
+item_remove_requested (NmnItem *item,
gpointer user_data)
{
- remove_connections (CARRICK_NETWORKS (user_data), item, NULL, NULL);
+ remove_connections (NMN_NETWORKS (user_data), item, NULL, NULL);
}
static void
-create_new_item (CarrickNetworks *self,
+create_new_item (NmnNetworks *self,
NMDevice *device,
NMExportedConnection *exported)
{
- CarrickNetworksPrivate *priv = GET_PRIVATE (self);
+ NmnNetworksPrivate *priv = GET_PRIVATE (self);
GtkWidget *item;
if (NM_IS_DEVICE_WIFI (device))
- item = carrick_wifi_item_create_for_connection (priv->nm_data, NM_DEVICE_WIFI (device), exported);
+ item = nmn_wifi_item_create_for_connection (priv->nm_data, NM_DEVICE_WIFI (device), exported);
else if (NM_IS_DEVICE_ETHERNET (device))
- item = carrick_ethernet_item_create (priv->nm_data, NM_DEVICE_ETHERNET (device), exported);
+ item = nmn_ethernet_item_create (priv->nm_data, NM_DEVICE_ETHERNET (device), exported);
else if (NM_IS_SERIAL_DEVICE (device))
- item = carrick_serial_item_create (priv->nm_data, NM_SERIAL_DEVICE (device), exported);
+ item = nmn_serial_item_create (priv->nm_data, NM_SERIAL_DEVICE (device), exported);
else {
item = NULL;
g_warning ("Unhandled device type: '%s'", G_OBJECT_TYPE_NAME (device));
@@ -229,10 +229,10 @@ create_new_item (CarrickNetworks *self,
event_box = gtk_event_box_new ();
gtk_container_add (GTK_CONTAINER (event_box), item);
gtk_widget_show_all (event_box);
- carrick_list_add_item (CARRICK_LIST (self), event_box);
+ nmn_list_add_item (NMN_LIST (self), event_box);
g_signal_connect (item, "remove-requested", G_CALLBACK (item_remove_requested), self);
- find_ac_for_item (self, CARRICK_NETWORK_ITEM (item));
+ find_ac_for_item (self, NMN_NETWORK_ITEM (item));
g_signal_connect (exported, "removed", G_CALLBACK (connection_removed), self);
}
}
@@ -242,8 +242,8 @@ connection_added (NMSettings *settings,
NMExportedConnection *exported,
gpointer user_data)
{
- CarrickNetworks *self = CARRICK_NETWORKS (user_data);
- CarrickNetworksPrivate *priv = GET_PRIVATE (self);
+ NmnNetworks *self = NMN_NETWORKS (user_data);
+ NmnNetworksPrivate *priv = GET_PRIVATE (self);
const GPtrArray *devices;
int i;
@@ -259,13 +259,13 @@ populate_one_connection (gpointer data, gpointer user_data)
}
void
-carrick_networks_populate (CarrickNetworks *self)
+nmn_networks_populate (NmnNetworks *self)
{
NMSettings *settings;
- CarrickNetworksPrivate *priv;
+ NmnNetworksPrivate *priv;
GSList *list;
- g_return_if_fail (CARRICK_IS_NETWORKS (self));
+ g_return_if_fail (NMN_IS_NETWORKS (self));
priv = GET_PRIVATE (self);
if (priv->populated)
@@ -285,7 +285,7 @@ carrick_networks_populate (CarrickNetworks *self)
G_CALLBACK (active_connections_changed),
self);
- settings = carrick_nm_data_get_user_settings (priv->nm_data);
+ settings = nmn_nm_data_get_user_settings (priv->nm_data);
if (settings) {
g_signal_connect (settings, "new-connection", G_CALLBACK (connection_added), self);
@@ -294,7 +294,7 @@ carrick_networks_populate (CarrickNetworks *self)
g_slist_free (list);
}
- settings = carrick_nm_data_get_system_settings (priv->nm_data);
+ settings = nmn_nm_data_get_system_settings (priv->nm_data);
if (settings) {
g_signal_connect (settings, "new-connection", G_CALLBACK (connection_added), self);
@@ -305,7 +305,7 @@ carrick_networks_populate (CarrickNetworks *self)
}
static void
-carrick_networks_init (CarrickNetworks *networks)
+nmn_networks_init (NmnNetworks *networks)
{
}
@@ -315,9 +315,9 @@ constructor (GType type,
GObjectConstructParam *construct_params)
{
GObject *object;
- CarrickNetworksPrivate *priv;
+ NmnNetworksPrivate *priv;
- object = G_OBJECT_CLASS (carrick_networks_parent_class)->constructor
+ object = G_OBJECT_CLASS (nmn_networks_parent_class)->constructor
(type, n_construct_params, construct_params);
if (!object)
@@ -338,7 +338,7 @@ static void
set_property (GObject *object, guint prop_id,
const GValue *value, GParamSpec *pspec)
{
- CarrickNetworksPrivate *priv = GET_PRIVATE (object);
+ NmnNetworksPrivate *priv = GET_PRIVATE (object);
switch (prop_id) {
case PROP_NM_DATA:
@@ -355,7 +355,7 @@ static void
get_property (GObject *object, guint prop_id,
GValue *value, GParamSpec *pspec)
{
- CarrickNetworksPrivate *priv = GET_PRIVATE (object);
+ NmnNetworksPrivate *priv = GET_PRIVATE (object);
switch (prop_id) {
case PROP_NM_DATA:
@@ -370,7 +370,7 @@ get_property (GObject *object, guint prop_id,
static void
dispose (GObject *object)
{
- CarrickNetworksPrivate *priv = GET_PRIVATE (object);
+ NmnNetworksPrivate *priv = GET_PRIVATE (object);
if (priv->disposed)
return;
@@ -379,15 +379,15 @@ dispose (GObject *object)
priv->disposed = TRUE;
- G_OBJECT_CLASS (carrick_networks_parent_class)->dispose (object);
+ G_OBJECT_CLASS (nmn_networks_parent_class)->dispose (object);
}
static void
-carrick_networks_class_init (CarrickNetworksClass *class)
+nmn_networks_class_init (NmnNetworksClass *class)
{
GObjectClass *object_class = G_OBJECT_CLASS (class);
- g_type_class_add_private (object_class, sizeof (CarrickNetworksPrivate));
+ g_type_class_add_private (object_class, sizeof (NmnNetworksPrivate));
object_class->constructor = constructor;
object_class->set_property = set_property;
@@ -397,9 +397,9 @@ carrick_networks_class_init (CarrickNetworksClass *class)
/* properties */
g_object_class_install_property
(object_class, PROP_NM_DATA,
- g_param_spec_object (CARRICK_NETWORKS_NM_DATA,
- "CarrickNMData",
- "CarrickNMData",
- CARRICK_TYPE_NM_DATA,
+ g_param_spec_object (NMN_NETWORKS_NM_DATA,
+ "NmnNMData",
+ "NmnNMData",
+ NMN_TYPE_NM_DATA,
G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
}
diff --git a/src/nmn-networks.h b/src/nmn-networks.h
index 3984b26..10aa6a9 100644
--- a/src/nmn-networks.h
+++ b/src/nmn-networks.h
@@ -1,31 +1,31 @@
/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-#ifndef CARRICK_NETWORKS_H
-#define CARRICK_NETWORKS_H
+#ifndef NMN_NETWORKS_H
+#define NMN_NETWORKS_H
#include <nmn-list.h>
#include "nmn-nm-data.h"
-#define CARRICK_TYPE_NETWORKS (carrick_networks_get_type ())
-#define CARRICK_NETWORKS(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), CARRICK_TYPE_NETWORKS, CarrickNetworks))
-#define CARRICK_NETWORKS_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), CARRICK_TYPE_NETWORKS, CarrickNetworksClass))
-#define CARRICK_IS_NETWORKS(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), CARRICK_TYPE_NETWORKS))
-#define CARRICK_IS_NETWORKS_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), CARRICK_TYPE_NETWORKS))
-#define CARRICK_NETWORKS_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), CARRICK_TYPE_NETWORKS, CarrickNetworksClass))
+#define NMN_TYPE_NETWORKS (nmn_networks_get_type ())
+#define NMN_NETWORKS(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NMN_TYPE_NETWORKS, NmnNetworks))
+#define NMN_NETWORKS_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NMN_TYPE_NETWORKS, NmnNetworksClass))
+#define NMN_IS_NETWORKS(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NMN_TYPE_NETWORKS))
+#define NMN_IS_NETWORKS_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), NMN_TYPE_NETWORKS))
+#define NMN_NETWORKS_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), NMN_TYPE_NETWORKS, NmnNetworksClass))
-#define CARRICK_NETWORKS_NM_DATA "nm-data"
+#define NMN_NETWORKS_NM_DATA "nm-data"
typedef struct {
- CarrickList parent;
-} CarrickNetworks;
+ NmnList parent;
+} NmnNetworks;
typedef struct {
- CarrickListClass parent;
-} CarrickNetworksClass;
+ NmnListClass parent;
+} NmnNetworksClass;
-GType carrick_networks_get_type (void);
+GType nmn_networks_get_type (void);
-GtkWidget *carrick_networks_new (CarrickNMData *nm_data);
-void carrick_networks_populate (CarrickNetworks *self);
+GtkWidget *nmn_networks_new (NmnNMData *nm_data);
+void nmn_networks_populate (NmnNetworks *self);
-#endif /* CARRICK_NETWORKS_H */
+#endif /* NMN_NETWORKS_H */
diff --git a/src/nmn-new-connection.c b/src/nmn-new-connection.c
index ebcf89a..dae6d1b 100644
--- a/src/nmn-new-connection.c
+++ b/src/nmn-new-connection.c
@@ -17,7 +17,7 @@
#include "nmn-wifi-list.h"
#include "nmn-mobile-providers.h"
-G_DEFINE_TYPE (CarrickNewConnection, carrick_new_connection, GTK_TYPE_EVENT_BOX)
+G_DEFINE_TYPE (NmnNewConnection, nmn_new_connection, GTK_TYPE_EVENT_BOX)
enum {
PROP_0,
@@ -27,11 +27,11 @@ enum {
LAST_PROP
};
-#define GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), CARRICK_TYPE_NEW_CONNECTION, CarrickNewConnectionPrivate))
+#define GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), NMN_TYPE_NEW_CONNECTION, NmnNewConnectionPrivate))
typedef struct {
GtkBuilder *builder;
- CarrickNMData *nm_data;
+ NmnNMData *nm_data;
/* WiFi widgets */
GtkWidget *wifi_list;
@@ -47,23 +47,23 @@ typedef struct {
GtkWidget *close;
gboolean disposed;
-} CarrickNewConnectionPrivate;
+} NmnNewConnectionPrivate;
GtkWidget *
-carrick_new_connection_create (GtkBuilder *builder,
- CarrickNMData *nm_data)
+nmn_new_connection_create (GtkBuilder *builder,
+ NmnNMData *nm_data)
{
g_return_val_if_fail (GTK_IS_BUILDER (builder), NULL);
- g_return_val_if_fail (CARRICK_IS_NM_DATA (nm_data), NULL);
+ g_return_val_if_fail (NMN_IS_NM_DATA (nm_data), NULL);
- return GTK_WIDGET (g_object_new (CARRICK_TYPE_NEW_CONNECTION,
- CARRICK_NEW_CONNECTION_BUILDER, builder,
- CARRICK_NEW_CONNECTION_NM_DATA, nm_data,
+ return GTK_WIDGET (g_object_new (NMN_TYPE_NEW_CONNECTION,
+ NMN_NEW_CONNECTION_BUILDER, builder,
+ NMN_NEW_CONNECTION_NM_DATA, nm_data,
NULL));
}
static void
-connect_requested (CarrickWifiList *wifi_list, gpointer user_data)
+connect_requested (NmnWifiList *wifi_list, gpointer user_data)
{
gtk_widget_hide (GTK_WIDGET (user_data));
}
@@ -74,13 +74,13 @@ wifi_search (GtkButton *button, gpointer user_data)
}
static void
-wifi_page_init (CarrickNewConnection *connection)
+wifi_page_init (NmnNewConnection *connection)
{
- CarrickNewConnectionPrivate *priv = GET_PRIVATE (connection);
+ NmnNewConnectionPrivate *priv = GET_PRIVATE (connection);
GtkWidget *container;
container = GTK_WIDGET (gtk_builder_get_object (priv->builder, "new_wifi_container"));
- priv->wifi_list = carrick_wifi_list_new (priv->nm_data);
+ priv->wifi_list = nmn_wifi_list_new (priv->nm_data);
g_signal_connect (priv->wifi_list, "connect-requested", G_CALLBACK (connect_requested), connection);
gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (container), priv->wifi_list);
gtk_widget_show_all (priv->wifi_list);
@@ -97,9 +97,9 @@ wifi_page_init (CarrickNewConnection *connection)
#define MOBILE_COL_DATA 1
static gboolean
-mobile_have_device (CarrickNewConnection *connection, CarrickMobileProviderType *type)
+mobile_have_device (NmnNewConnection *connection, NmnMobileProviderType *type)
{
- CarrickNewConnectionPrivate *priv = GET_PRIVATE (connection);
+ NmnNewConnectionPrivate *priv = GET_PRIVATE (connection);
const GPtrArray *devices;
int i;
gboolean found = FALSE;
@@ -110,12 +110,12 @@ mobile_have_device (CarrickNewConnection *connection, CarrickMobileProviderType
if (NM_IS_GSM_DEVICE (device)) {
found = TRUE;
- *type = CARRICK_PROVIDER_TYPE_GSM;
+ *type = NMN_PROVIDER_TYPE_GSM;
}
if (NM_IS_CDMA_DEVICE (device)) {
found = TRUE;
- *type = CARRICK_PROVIDER_TYPE_CDMA;
+ *type = NMN_PROVIDER_TYPE_CDMA;
}
}
@@ -123,10 +123,10 @@ mobile_have_device (CarrickNewConnection *connection, CarrickMobileProviderType
}
static void
-mobile_status_update (CarrickNewConnection *connection)
+mobile_status_update (NmnNewConnection *connection)
{
- CarrickNewConnectionPrivate *priv = GET_PRIVATE (connection);
- CarrickMobileProviderType type;
+ NmnNewConnectionPrivate *priv = GET_PRIVATE (connection);
+ NmnMobileProviderType type;
gboolean found;
found = mobile_have_device (connection, &type);
@@ -141,12 +141,12 @@ mobile_status_update (CarrickNewConnection *connection)
}
static gboolean
-provider_list_has_type (GSList *list, CarrickMobileProviderType type)
+provider_list_has_type (GSList *list, NmnMobileProviderType type)
{
GSList *iter;
for (iter = list; iter; iter = iter->next) {
- CarrickMobileProvider *provider = (CarrickMobileProvider *) iter->data;
+ NmnMobileProvider *provider = (NmnMobileProvider *) iter->data;
if (provider->type == type)
return TRUE;
@@ -157,7 +157,7 @@ provider_list_has_type (GSList *list, CarrickMobileProviderType type)
typedef struct {
GtkTreeStore *store;
- CarrickMobileProviderType provider_type;
+ NmnMobileProviderType provider_type;
} MobilePopulateInfo;
static void
@@ -178,7 +178,7 @@ add_one_country (gpointer key, gpointer value, gpointer user_data)
-1);
for (iter = providers; iter; iter = iter->next) {
- CarrickMobileProvider *provider = (CarrickMobileProvider *) iter->data;
+ NmnMobileProvider *provider = (NmnMobileProvider *) iter->data;
GtkTreeIter provider_iter;
if (provider->type == info->provider_type) {
@@ -192,25 +192,25 @@ add_one_country (gpointer key, gpointer value, gpointer user_data)
}
static void
-mobile_list_populate (CarrickNewConnection *connection)
+mobile_list_populate (NmnNewConnection *connection)
{
- CarrickNewConnectionPrivate *priv = GET_PRIVATE (connection);
+ NmnNewConnectionPrivate *priv = GET_PRIVATE (connection);
GHashTable *mobile_providers;
GtkTreeStore *store;
GtkTreeModel *sort_model;
GtkCellRenderer *renderer;
GtkTreeViewColumn *column;
- CarrickMobileProviderType provider_type;
+ NmnMobileProviderType provider_type;
MobilePopulateInfo info;
if (priv->mobile_list_populated || !mobile_have_device (connection, &provider_type))
return;
- mobile_providers = carrick_mobile_providers_parse ();
+ mobile_providers = nmn_mobile_providers_parse ();
if (!mobile_providers)
return;
- store = gtk_tree_store_new (2, G_TYPE_STRING, CARRICK_TYPE_MOBILE_PROVIDER);
+ store = gtk_tree_store_new (2, G_TYPE_STRING, NMN_TYPE_MOBILE_PROVIDER);
info.store = store;
info.provider_type = provider_type;
@@ -238,10 +238,10 @@ static void
mobile_tree_selection_changed (GtkTreeSelection *selection,
gpointer user_data)
{
- CarrickNewConnection *connection = (CarrickNewConnection *) user_data;
- CarrickNewConnectionPrivate *priv = GET_PRIVATE (connection);
+ NmnNewConnection *connection = (NmnNewConnection *) user_data;
+ NmnNewConnectionPrivate *priv = GET_PRIVATE (connection);
GtkTreeModel *model;
- CarrickMobileProvider *provider = NULL;
+ NmnMobileProvider *provider = NULL;
GtkTreeIter iter;
if (gtk_tree_selection_get_selected (selection, &model, &iter))
@@ -251,7 +251,7 @@ mobile_tree_selection_changed (GtkTreeSelection *selection,
}
static NMConnection *
-mobile_new_connection (CarrickMobileProvider *provider)
+mobile_new_connection (NmnMobileProvider *provider)
{
NMConnection *connection;
NMSetting *type_setting;
@@ -261,7 +261,7 @@ mobile_new_connection (CarrickMobileProvider *provider)
connection = nm_connection_new ();
- if (provider->type == CARRICK_PROVIDER_TYPE_GSM) {
+ if (provider->type == NMN_PROVIDER_TYPE_GSM) {
type_setting = nm_setting_gsm_new ();
g_object_set (type_setting,
NM_SETTING_GSM_NUMBER, "*99#",
@@ -269,7 +269,7 @@ mobile_new_connection (CarrickMobileProvider *provider)
NM_SETTING_GSM_PASSWORD, provider->password,
NM_SETTING_GSM_APN, provider->apn,
NULL);
- } else if (provider->type == CARRICK_PROVIDER_TYPE_CDMA) {
+ } else if (provider->type == NMN_PROVIDER_TYPE_CDMA) {
type_setting = nm_setting_cdma_new ();
g_object_set (type_setting, NM_SETTING_CDMA_NUMBER, "#777", NULL);
} else
@@ -331,11 +331,11 @@ mobile_new_connection (CarrickMobileProvider *provider)
static void
mobile_save_clicked (GtkButton *button, gpointer user_data)
{
- CarrickNewConnection *self = (CarrickNewConnection *) user_data;
- CarrickNewConnectionPrivate *priv = GET_PRIVATE (self);
+ NmnNewConnection *self = (NmnNewConnection *) user_data;
+ NmnNewConnectionPrivate *priv = GET_PRIVATE (self);
GtkTreeSelection *selection;
GtkTreeModel *model;
- CarrickMobileProvider *provider = NULL;
+ NmnMobileProvider *provider = NULL;
GtkTreeIter iter;
selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (priv->mobile_list));
@@ -347,12 +347,12 @@ mobile_save_clicked (GtkButton *button, gpointer user_data)
NMConnection *connection;
connection = mobile_new_connection (provider);
- carrick_mobile_provider_unref (provider);
+ nmn_mobile_provider_unref (provider);
if (connection) {
NMExportedConnection *exported;
- exported = NM_EXPORTED_CONNECTION (nma_gconf_settings_add_connection (NMA_GCONF_SETTINGS (carrick_nm_data_get_user_settings (priv->nm_data)), connection));
+ exported = NM_EXPORTED_CONNECTION (nma_gconf_settings_add_connection (NMA_GCONF_SETTINGS (nmn_nm_data_get_user_settings (priv->nm_data)), connection));
g_object_unref (connection);
if (exported)
@@ -369,7 +369,7 @@ mobile_device_added (NMClient *client,
gpointer user_data)
{
if (NM_IS_GSM_DEVICE (device) || NM_IS_CDMA_DEVICE (device)) {
- CarrickNewConnection *connection = CARRICK_NEW_CONNECTION (user_data);
+ NmnNewConnection *connection = NMN_NEW_CONNECTION (user_data);
mobile_list_populate (connection);
mobile_status_update (connection);
@@ -377,9 +377,9 @@ mobile_device_added (NMClient *client,
}
static void
-mobile_page_init (CarrickNewConnection *connection)
+mobile_page_init (NmnNewConnection *connection)
{
- CarrickNewConnectionPrivate *priv = GET_PRIVATE (connection);
+ NmnNewConnectionPrivate *priv = GET_PRIVATE (connection);
GtkTreeSelection *selection;
g_signal_connect (connection, "realize", G_CALLBACK (mobile_list_populate), NULL);
@@ -399,7 +399,7 @@ mobile_page_init (CarrickNewConnection *connection)
}
static void
-carrick_new_connection_init (CarrickNewConnection *connection)
+nmn_new_connection_init (NmnNewConnection *connection)
{
}
@@ -409,10 +409,10 @@ constructor (GType type,
GObjectConstructParam *construct_params)
{
GObject *object;
- CarrickNewConnectionPrivate *priv;
+ NmnNewConnectionPrivate *priv;
GtkWidget *container;
- object = G_OBJECT_CLASS (carrick_new_connection_parent_class)->constructor
+ object = G_OBJECT_CLASS (nmn_new_connection_parent_class)->constructor
(type, n_construct_params, construct_params);
if (!object)
@@ -429,8 +429,8 @@ constructor (GType type,
container = GTK_WIDGET (gtk_builder_get_object (priv->builder, "new_main_container"));
gtk_widget_reparent (container, GTK_WIDGET (object));
- wifi_page_init (CARRICK_NEW_CONNECTION (object));
- mobile_page_init (CARRICK_NEW_CONNECTION (object));
+ wifi_page_init (NMN_NEW_CONNECTION (object));
+ mobile_page_init (NMN_NEW_CONNECTION (object));
priv->close = GTK_WIDGET (gtk_builder_get_object (priv->builder, "new_close"));
g_signal_connect_swapped (priv->close, "clicked", G_CALLBACK (gtk_widget_hide), object);
@@ -442,7 +442,7 @@ static void
set_property (GObject *object, guint prop_id,
const GValue *value, GParamSpec *pspec)
{
- CarrickNewConnectionPrivate *priv = GET_PRIVATE (object);
+ NmnNewConnectionPrivate *priv = GET_PRIVATE (object);
switch (prop_id) {
case PROP_BUILDER:
@@ -463,7 +463,7 @@ static void
get_property (GObject *object, guint prop_id,
GValue *value, GParamSpec *pspec)
{
- CarrickNewConnectionPrivate *priv = GET_PRIVATE (object);
+ NmnNewConnectionPrivate *priv = GET_PRIVATE (object);
switch (prop_id) {
case PROP_BUILDER:
@@ -481,7 +481,7 @@ get_property (GObject *object, guint prop_id,
static void
dispose (GObject *object)
{
- CarrickNewConnectionPrivate *priv = GET_PRIVATE (object);
+ NmnNewConnectionPrivate *priv = GET_PRIVATE (object);
if (priv->disposed)
return;
@@ -497,15 +497,15 @@ dispose (GObject *object)
if (priv->nm_data)
g_object_unref (priv->nm_data);
- G_OBJECT_CLASS (carrick_new_connection_parent_class)->dispose (object);
+ G_OBJECT_CLASS (nmn_new_connection_parent_class)->dispose (object);
}
static void
-carrick_new_connection_class_init (CarrickNewConnectionClass *class)
+nmn_new_connection_class_init (NmnNewConnectionClass *class)
{
GObjectClass *object_class = G_OBJECT_CLASS (class);
- g_type_class_add_private (object_class, sizeof (CarrickNewConnectionPrivate));
+ g_type_class_add_private (object_class, sizeof (NmnNewConnectionPrivate));
/* methods */
object_class->constructor = constructor;
@@ -516,7 +516,7 @@ carrick_new_connection_class_init (CarrickNewConnectionClass *class)
/* properties */
g_object_class_install_property
(object_class, PROP_BUILDER,
- g_param_spec_object (CARRICK_NEW_CONNECTION_BUILDER,
+ g_param_spec_object (NMN_NEW_CONNECTION_BUILDER,
"GtkBuilder",
"GtkBuilder",
GTK_TYPE_BUILDER,
@@ -524,9 +524,9 @@ carrick_new_connection_class_init (CarrickNewConnectionClass *class)
g_object_class_install_property
(object_class, PROP_NM_DATA,
- g_param_spec_object (CARRICK_NEW_CONNECTION_NM_DATA,
- "CarrickNMData",
- "CarrickNMData",
- CARRICK_TYPE_NM_DATA,
+ g_param_spec_object (NMN_NEW_CONNECTION_NM_DATA,
+ "NmnNMData",
+ "NmnNMData",
+ NMN_TYPE_NM_DATA,
G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
}
diff --git a/src/nmn-new-connection.h b/src/nmn-new-connection.h
index b920bbd..78a0969 100644
--- a/src/nmn-new-connection.h
+++ b/src/nmn-new-connection.h
@@ -1,32 +1,32 @@
/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-#ifndef CARRICK_NEW_CONNECTION_H
-#define CARRICK_NEW_CONNECTION_H
+#ifndef NMN_NEW_CONNECTION_H
+#define NMN_NEW_CONNECTION_H
#include <gtk/gtk.h>
#include "nmn-nm-data.h"
-#define CARRICK_TYPE_NEW_CONNECTION (carrick_new_connection_get_type ())
-#define CARRICK_NEW_CONNECTION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), CARRICK_TYPE_NEW_CONNECTION, CarrickNewConnection))
-#define CARRICK_NEW_CONNECTION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), CARRICK_TYPE_NEW_CONNECTION, CarrickNewConnectionClass))
-#define CARRICK_IS_NEW_CONNECTION(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), CARRICK_TYPE_NEW_CONNECTION))
-#define CARRICK_IS_NEW_CONNECTION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), CARRICK_TYPE_NEW_CONNECTION))
-#define CARRICK_NEW_CONNECTION_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), CARRICK_TYPE_NEW_CONNECTION, CarrickNewConnectionClass))
+#define NMN_TYPE_NEW_CONNECTION (nmn_new_connection_get_type ())
+#define NMN_NEW_CONNECTION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NMN_TYPE_NEW_CONNECTION, NmnNewConnection))
+#define NMN_NEW_CONNECTION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NMN_TYPE_NEW_CONNECTION, NmnNewConnectionClass))
+#define NMN_IS_NEW_CONNECTION(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NMN_TYPE_NEW_CONNECTION))
+#define NMN_IS_NEW_CONNECTION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), NMN_TYPE_NEW_CONNECTION))
+#define NMN_NEW_CONNECTION_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), NMN_TYPE_NEW_CONNECTION, NmnNewConnectionClass))
-#define CARRICK_NEW_CONNECTION_BUILDER "builder"
-#define CARRICK_NEW_CONNECTION_NM_DATA "nm-data"
+#define NMN_NEW_CONNECTION_BUILDER "builder"
+#define NMN_NEW_CONNECTION_NM_DATA "nm-data"
typedef struct {
GtkEventBox parent;
-} CarrickNewConnection;
+} NmnNewConnection;
typedef struct {
GtkEventBoxClass parent;
-} CarrickNewConnectionClass;
+} NmnNewConnectionClass;
-GType carrick_new_connection_get_type (void);
+GType nmn_new_connection_get_type (void);
-GtkWidget *carrick_new_connection_create (GtkBuilder *builder,
- CarrickNMData *nm_data);
+GtkWidget *nmn_new_connection_create (GtkBuilder *builder,
+ NmnNMData *nm_data);
-#endif /* CARRICK_NEW_CONNECTION_H */
+#endif /* NMN_NEW_CONNECTION_H */
diff --git a/src/nmn-nm-data.c b/src/nmn-nm-data.c
index 7d25d05..fbd2d9b 100644
--- a/src/nmn-nm-data.c
+++ b/src/nmn-nm-data.c
@@ -4,44 +4,44 @@
#include "nmn-nm-data.h"
#include "nma-gconf-settings.h"
-G_DEFINE_TYPE (CarrickNMData, carrick_nm_data, NM_TYPE_CLIENT)
+G_DEFINE_TYPE (NmnNMData, nmn_nm_data, NM_TYPE_CLIENT)
-#define GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), CARRICK_TYPE_NM_DATA, CarrickNMDataPrivate))
+#define GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), NMN_TYPE_NM_DATA, NmnNMDataPrivate))
typedef struct {
NMSettings *user_settings;
NMSettings *system_settings;
gboolean disposed;
-} CarrickNMDataPrivate;
+} NmnNMDataPrivate;
-CarrickNMData *
-carrick_nm_data_new (DBusGConnection *bus)
+NmnNMData *
+nmn_nm_data_new (DBusGConnection *bus)
{
- return CARRICK_NM_DATA (g_object_new (CARRICK_TYPE_NM_DATA,
- NM_OBJECT_DBUS_CONNECTION, bus,
- NM_OBJECT_DBUS_PATH, NM_DBUS_PATH,
- NULL));
+ return NMN_NM_DATA (g_object_new (NMN_TYPE_NM_DATA,
+ NM_OBJECT_DBUS_CONNECTION, bus,
+ NM_OBJECT_DBUS_PATH, NM_DBUS_PATH,
+ NULL));
}
NMSettings *
-carrick_nm_data_get_user_settings (CarrickNMData *self)
+nmn_nm_data_get_user_settings (NmnNMData *self)
{
- g_return_val_if_fail (CARRICK_IS_NM_DATA (self), NULL);
+ g_return_val_if_fail (NMN_IS_NM_DATA (self), NULL);
return GET_PRIVATE (self)->user_settings;
}
NMSettings *
-carrick_nm_data_get_system_settings (CarrickNMData *self)
+nmn_nm_data_get_system_settings (NmnNMData *self)
{
- g_return_val_if_fail (CARRICK_IS_NM_DATA (self), NULL);
+ g_return_val_if_fail (NMN_IS_NM_DATA (self), NULL);
return GET_PRIVATE (self)->system_settings;
}
static void
-carrick_nm_data_init (CarrickNMData *self)
+nmn_nm_data_init (NmnNMData *self)
{
}
@@ -51,12 +51,12 @@ constructor (GType type,
GObjectConstructParam *construct_params)
{
GObject *object;
- CarrickNMDataPrivate *priv;
+ NmnNMDataPrivate *priv;
DBusGConnection *bus;
- object = G_OBJECT_CLASS (carrick_nm_data_parent_class)->constructor (type,
- n_construct_params,
- construct_params);
+ object = G_OBJECT_CLASS (nmn_nm_data_parent_class)->constructor (type,
+ n_construct_params,
+ construct_params);
if (!object)
return NULL;
@@ -72,7 +72,7 @@ constructor (GType type,
static void
dispose (GObject *object)
{
- CarrickNMDataPrivate *priv = GET_PRIVATE (object);
+ NmnNMDataPrivate *priv = GET_PRIVATE (object);
if (priv->disposed)
return;
@@ -81,15 +81,15 @@ dispose (GObject *object)
g_object_unref (priv->system_settings);
priv->disposed = TRUE;
- G_OBJECT_CLASS (carrick_nm_data_parent_class)->dispose (object);
+ G_OBJECT_CLASS (nmn_nm_data_parent_class)->dispose (object);
}
static void
-carrick_nm_data_class_init (CarrickNMDataClass *class)
+nmn_nm_data_class_init (NmnNMDataClass *class)
{
GObjectClass *object_class = G_OBJECT_CLASS (class);
- g_type_class_add_private (object_class, sizeof (CarrickNMDataPrivate));
+ g_type_class_add_private (object_class, sizeof (NmnNMDataPrivate));
object_class->constructor = constructor;
object_class->dispose = dispose;
diff --git a/src/nmn-nm-data.h b/src/nmn-nm-data.h
index 56d170f..6f0bc49 100644
--- a/src/nmn-nm-data.h
+++ b/src/nmn-nm-data.h
@@ -1,31 +1,31 @@
/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-#ifndef CARRICK_NM_DATA_H
-#define CARRICK_NM_DATA_H
+#ifndef NMN_NM_DATA_H
+#define NMN_NM_DATA_H
#include <dbus/dbus-glib.h>
#include <nm-client.h>
#include <nm-settings.h>
-#define CARRICK_TYPE_NM_DATA (carrick_nm_data_get_type ())
-#define CARRICK_NM_DATA(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), CARRICK_TYPE_NM_DATA, CarrickNMData))
-#define CARRICK_NM_DATA_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), CARRICK_TYPE_NM_DATA, CarrickNMDataClass))
-#define CARRICK_IS_NM_DATA(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), CARRICK_TYPE_NM_DATA))
-#define CARRICK_IS_NM_DATA_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), CARRICK_TYPE_NM_DATA))
-#define CARRICK_NM_DATA_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), CARRICK_TYPE_NM_DATA, CarrickNMDataClass))
+#define NMN_TYPE_NM_DATA (nmn_nm_data_get_type ())
+#define NMN_NM_DATA(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NMN_TYPE_NM_DATA, NmnNMData))
+#define NMN_NM_DATA_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NMN_TYPE_NM_DATA, NmnNMDataClass))
+#define NMN_IS_NM_DATA(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NMN_TYPE_NM_DATA))
+#define NMN_IS_NM_DATA_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), NMN_TYPE_NM_DATA))
+#define NMN_NM_DATA_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), NMN_TYPE_NM_DATA, NmnNMDataClass))
typedef struct {
NMClient parent;
-} CarrickNMData;
+} NmnNMData;
typedef struct {
NMClientClass parent;
-} CarrickNMDataClass;
+} NmnNMDataClass;
-GType carrick_nm_data_get_type (void);
+GType nmn_nm_data_get_type (void);
-CarrickNMData *carrick_nm_data_new (DBusGConnection *bus);
-NMSettings *carrick_nm_data_get_user_settings (CarrickNMData *data);
-NMSettings *carrick_nm_data_get_system_settings (CarrickNMData *data);
+NmnNMData *nmn_nm_data_new (DBusGConnection *bus);
+NMSettings *nmn_nm_data_get_user_settings (NmnNMData *data);
+NMSettings *nmn_nm_data_get_system_settings (NmnNMData *data);
-#endif /* CARRICK_NM_DATA_H */
+#endif /* NMN_NM_DATA_H */
diff --git a/src/nmn-plug.c b/src/nmn-plug.c
index 5ad3a9e..5fa1fb9 100644
--- a/src/nmn-plug.c
+++ b/src/nmn-plug.c
@@ -2,36 +2,36 @@
#include "nmn-plug.h"
-G_DEFINE_TYPE (CarrickPlug, carrick_plug, GTK_TYPE_PLUG)
+G_DEFINE_TYPE (NmnPlug, nmn_plug, GTK_TYPE_PLUG)
-#define GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), CARRICK_TYPE_PLUG, CarrickPlugPrivate))
+#define GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), NMN_TYPE_PLUG, NmnPlugPrivate))
typedef struct {
GSList *stack;
gboolean disposed;
-} CarrickPlugPrivate;
+} NmnPlugPrivate;
#define PADDING 0
GtkWidget *
-carrick_plug_new (void)
+nmn_plug_new (void)
{
- return GTK_WIDGET (g_object_new (CARRICK_TYPE_PLUG, NULL));
+ return GTK_WIDGET (g_object_new (NMN_TYPE_PLUG, NULL));
}
void
-carrick_plug_push (CarrickPlug *self,
- GtkWidget *widget)
+nmn_plug_push (NmnPlug *self,
+ GtkWidget *widget)
{
GtkWidget *current_child;
- g_return_if_fail (CARRICK_IS_PLUG (self));
+ g_return_if_fail (NMN_IS_PLUG (self));
g_return_if_fail (GTK_IS_WIDGET (widget));
current_child = gtk_bin_get_child (GTK_BIN (self));
if (current_child) {
- CarrickPlugPrivate *priv = GET_PRIVATE (self);
+ NmnPlugPrivate *priv = GET_PRIVATE (self);
priv->stack = g_slist_prepend (priv->stack, g_object_ref (current_child));
gtk_container_remove (GTK_CONTAINER (self), current_child);
@@ -51,12 +51,12 @@ carrick_plug_push (CarrickPlug *self,
}
void
-carrick_plug_pop (CarrickPlug *self)
+nmn_plug_pop (NmnPlug *self)
{
GtkWidget *current_child;
- CarrickPlugPrivate *priv;
+ NmnPlugPrivate *priv;
- g_return_if_fail (CARRICK_IS_PLUG (self));
+ g_return_if_fail (NMN_IS_PLUG (self));
current_child = gtk_bin_get_child (GTK_BIN (self));
g_return_if_fail (GTK_IS_WIDGET (current_child));
@@ -75,14 +75,14 @@ carrick_plug_pop (CarrickPlug *self)
}
static void
-carrick_plug_init (CarrickPlug *plug)
+nmn_plug_init (NmnPlug *plug)
{
}
static void
dispose (GObject *object)
{
- CarrickPlugPrivate *priv = GET_PRIVATE (object);
+ NmnPlugPrivate *priv = GET_PRIVATE (object);
if (priv->disposed)
return;
@@ -92,15 +92,15 @@ dispose (GObject *object)
priv->disposed = TRUE;
- G_OBJECT_CLASS (carrick_plug_parent_class)->dispose (object);
+ G_OBJECT_CLASS (nmn_plug_parent_class)->dispose (object);
}
static void
-carrick_plug_class_init (CarrickPlugClass *class)
+nmn_plug_class_init (NmnPlugClass *class)
{
GObjectClass *object_class = G_OBJECT_CLASS (class);
- g_type_class_add_private (object_class, sizeof (CarrickPlugPrivate));
+ g_type_class_add_private (object_class, sizeof (NmnPlugPrivate));
object_class->dispose = dispose;
}
diff --git a/src/nmn-plug.h b/src/nmn-plug.h
index a5f66c2..dbde624 100644
--- a/src/nmn-plug.h
+++ b/src/nmn-plug.h
@@ -1,31 +1,31 @@
/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-#ifndef CARRICK_PLUG_H
-#define CARRICK_PLUG_H
+#ifndef NMN_PLUG_H
+#define NMN_PLUG_H
#include <gtk/gtk.h>
-#define CARRICK_TYPE_PLUG (carrick_plug_get_type ())
-#define CARRICK_PLUG(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), CARRICK_TYPE_PLUG, CarrickPlug))
-#define CARRICK_PLUG_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), CARRICK_TYPE_PLUG, CarrickPlugClass))
-#define CARRICK_IS_PLUG(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), CARRICK_TYPE_PLUG))
-#define CARRICK_IS_PLUG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), CARRICK_TYPE_PLUG))
-#define CARRICK_PLUG_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), CARRICK_TYPE_PLUG, CarrickPlugClass))
+#define NMN_TYPE_PLUG (nmn_plug_get_type ())
+#define NMN_PLUG(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NMN_TYPE_PLUG, NmnPlug))
+#define NMN_PLUG_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NMN_TYPE_PLUG, NmnPlugClass))
+#define NMN_IS_PLUG(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NMN_TYPE_PLUG))
+#define NMN_IS_PLUG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), NMN_TYPE_PLUG))
+#define NMN_PLUG_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), NMN_TYPE_PLUG, NmnPlugClass))
typedef struct {
GtkPlug parent;
-} CarrickPlug;
+} NmnPlug;
typedef struct {
GtkPlugClass parent;
-} CarrickPlugClass;
+} NmnPlugClass;
-GType carrick_plug_get_type (void);
+GType nmn_plug_get_type (void);
-GtkWidget *carrick_plug_new (void);
-void carrick_plug_push (CarrickPlug *self,
- GtkWidget *widget);
+GtkWidget *nmn_plug_new (void);
+void nmn_plug_push (NmnPlug *self,
+ GtkWidget *widget);
-void carrick_plug_pop (CarrickPlug *self);
+void nmn_plug_pop (NmnPlug *self);
-#endif /* CARRICK_PLUG_H */
+#endif /* NMN_PLUG_H */
diff --git a/src/nmn-serial-item.c b/src/nmn-serial-item.c
index 11027d5..cb9a47b 100644
--- a/src/nmn-serial-item.c
+++ b/src/nmn-serial-item.c
@@ -8,23 +8,23 @@
#include "nma-gconf-connection.h"
#include "utils.h"
-G_DEFINE_TYPE (CarrickSerialItem, carrick_serial_item, CARRICK_TYPE_NETWORK_ITEM)
+G_DEFINE_TYPE (NmnSerialItem, nmn_serial_item, NMN_TYPE_NETWORK_ITEM)
-#define GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), CARRICK_TYPE_SERIAL_ITEM, CarrickSerialItemPrivate))
+#define GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), NMN_TYPE_SERIAL_ITEM, NmnSerialItemPrivate))
typedef struct {
GSList *signal_handlers;
gboolean disposed;
-} CarrickSerialItemPrivate;
+} NmnSerialItemPrivate;
static void
-update_item (CarrickSerialItem *self)
+update_item (NmnSerialItem *self)
{
const char *icon;
NMDevice *device;
- device = carrick_network_item_get_device (CARRICK_NETWORK_ITEM (self));
+ device = nmn_network_item_get_device (NMN_NETWORK_ITEM (self));
switch (nm_device_get_state (device)) {
case NM_DEVICE_STATE_ACTIVATED:
icon = "nm-device-wwan";
@@ -34,7 +34,7 @@ update_item (CarrickSerialItem *self)
break;
}
- carrick_item_set_icon (CARRICK_ITEM (self), icon);
+ nmn_item_set_icon (NMN_ITEM (self), icon);
}
static void
@@ -44,13 +44,13 @@ state_changed (NMDevice *device,
NMDeviceStateReason reason,
gpointer user_data)
{
- update_item (CARRICK_SERIAL_ITEM (user_data));
+ update_item (NMN_SERIAL_ITEM (user_data));
}
static void
add_signal_handler (gpointer item, gulong id)
{
- CarrickSerialItemPrivate *priv = GET_PRIVATE (item);
+ NmnSerialItemPrivate *priv = GET_PRIVATE (item);
gulong *p;
p = g_new (gulong, 1);
@@ -59,14 +59,14 @@ add_signal_handler (gpointer item, gulong id)
}
GtkWidget *
-carrick_serial_item_create (CarrickNMData *nm_data,
- NMSerialDevice *device,
- NMExportedConnection *exported)
+nmn_serial_item_create (NmnNMData *nm_data,
+ NMSerialDevice *device,
+ NMExportedConnection *exported)
{
NMConnection *wrapped;
GtkWidget *item;
- g_return_val_if_fail (CARRICK_IS_NM_DATA (nm_data), NULL);
+ g_return_val_if_fail (NMN_IS_NM_DATA (nm_data), NULL);
g_return_val_if_fail (NM_IS_SERIAL_DEVICE (device), NULL);
g_return_val_if_fail (NM_IS_EXPORTED_CONNECTION (exported), NULL);
@@ -74,14 +74,14 @@ carrick_serial_item_create (CarrickNMData *nm_data,
if (utils_connection_valid_for_device (wrapped, NM_DEVICE (device), NULL)) {
gulong id;
- item = GTK_WIDGET (g_object_new (CARRICK_TYPE_SERIAL_ITEM,
- CARRICK_NETWORK_ITEM_NM_DATA, nm_data,
- CARRICK_NETWORK_ITEM_DEVICE, device,
- CARRICK_NETWORK_ITEM_CONNECTION, exported,
+ item = GTK_WIDGET (g_object_new (NMN_TYPE_SERIAL_ITEM,
+ NMN_NETWORK_ITEM_NM_DATA, nm_data,
+ NMN_NETWORK_ITEM_DEVICE, device,
+ NMN_NETWORK_ITEM_CONNECTION, exported,
NULL));
- update_item (CARRICK_SERIAL_ITEM (item));
- carrick_item_set_remove_visible (CARRICK_ITEM (item), TRUE);
+ update_item (NMN_SERIAL_ITEM (item));
+ nmn_item_set_remove_visible (NMN_ITEM (item), TRUE);
id = g_signal_connect (device, "state-changed", G_CALLBACK (state_changed), item);
add_signal_handler (item, id);
@@ -92,20 +92,20 @@ carrick_serial_item_create (CarrickNMData *nm_data,
}
static void
-carrick_serial_item_init (CarrickSerialItem *item)
+nmn_serial_item_init (NmnSerialItem *item)
{
}
static void
dispose (GObject *object)
{
- CarrickSerialItemPrivate *priv = GET_PRIVATE (object);
+ NmnSerialItemPrivate *priv = GET_PRIVATE (object);
NMDevice *device;
if (priv->disposed)
return;
- device = carrick_network_item_get_device (CARRICK_NETWORK_ITEM (object));
+ device = nmn_network_item_get_device (NMN_NETWORK_ITEM (object));
while (priv->signal_handlers) {
gulong *id = (gulong *) priv->signal_handlers->data;
@@ -117,15 +117,15 @@ dispose (GObject *object)
priv->disposed = TRUE;
- G_OBJECT_CLASS (carrick_serial_item_parent_class)->dispose (object);
+ G_OBJECT_CLASS (nmn_serial_item_parent_class)->dispose (object);
}
static void
-carrick_serial_item_class_init (CarrickSerialItemClass *class)
+nmn_serial_item_class_init (NmnSerialItemClass *class)
{
GObjectClass *object_class = G_OBJECT_CLASS (class);
- g_type_class_add_private (object_class, sizeof (CarrickSerialItemPrivate));
+ g_type_class_add_private (object_class, sizeof (NmnSerialItemPrivate));
object_class->dispose = dispose;
}
diff --git a/src/nmn-serial-item.h b/src/nmn-serial-item.h
index e5ec6f2..1571f54 100644
--- a/src/nmn-serial-item.h
+++ b/src/nmn-serial-item.h
@@ -1,32 +1,32 @@
/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-#ifndef CARRICK_SERIAL_ITEM_H
-#define CARRICK_SERIAL_ITEM_H
+#ifndef NMN_SERIAL_ITEM_H
+#define NMN_SERIAL_ITEM_H
#include <nmn-network-item.h>
#include <nm-serial-device.h>
#include "nmn-nm-data.h"
-#define CARRICK_TYPE_SERIAL_ITEM (carrick_serial_item_get_type ())
-#define CARRICK_SERIAL_ITEM(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), CARRICK_TYPE_SERIAL_ITEM, CarrickSerialItem))
-#define CARRICK_SERIAL_ITEM_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), CARRICK_TYPE_SERIAL_ITEM, CarrickSerialItemClass))
-#define CARRICK_IS_SERIAL_ITEM(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), CARRICK_TYPE_SERIAL_ITEM))
-#define CARRICK_IS_SERIAL_ITEM_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), CARRICK_TYPE_SERIAL_ITEM))
-#define CARRICK_SERIAL_ITEM_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), CARRICK_TYPE_SERIAL_ITEM, CarrickSerialItemClass))
+#define NMN_TYPE_SERIAL_ITEM (nmn_serial_item_get_type ())
+#define NMN_SERIAL_ITEM(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NMN_TYPE_SERIAL_ITEM, NmnSerialItem))
+#define NMN_SERIAL_ITEM_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NMN_TYPE_SERIAL_ITEM, NmnSerialItemClass))
+#define NMN_IS_SERIAL_ITEM(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NMN_TYPE_SERIAL_ITEM))
+#define NMN_IS_SERIAL_ITEM_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), NMN_TYPE_SERIAL_ITEM))
+#define NMN_SERIAL_ITEM_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), NMN_TYPE_SERIAL_ITEM, NmnSerialItemClass))
typedef struct {
- CarrickNetworkItem parent;
-} CarrickSerialItem;
+ NmnNetworkItem parent;
+} NmnSerialItem;
typedef struct {
- CarrickNetworkItemClass parent;
-} CarrickSerialItemClass;
+ NmnNetworkItemClass parent;
+} NmnSerialItemClass;
-GType carrick_serial_item_get_type (void);
+GType nmn_serial_item_get_type (void);
GtkWidget *
-carrick_serial_item_create (CarrickNMData *nm_data,
- NMSerialDevice *device,
- NMExportedConnection *exported);
+nmn_serial_item_create (NmnNMData *nm_data,
+ NMSerialDevice *device,
+ NMExportedConnection *exported);
-#endif /* CARRICK_SERIAL_ITEM_H */
+#endif /* NMN_SERIAL_ITEM_H */
diff --git a/src/nmn-status-icon.c b/src/nmn-status-icon.c
index 6287f90..520ebe7 100644
--- a/src/nmn-status-icon.c
+++ b/src/nmn-status-icon.c
@@ -10,7 +10,7 @@
#include "nmn-status-icon.h"
#include "nmn-icon-cache.h"
-G_DEFINE_TYPE (CarrickStatusIcon, carrick_status_icon, GTK_TYPE_STATUS_ICON)
+G_DEFINE_TYPE (NmnStatusIcon, nmn_status_icon, GTK_TYPE_STATUS_ICON)
enum {
PROP_0,
@@ -19,29 +19,29 @@ enum {
LAST_PROP
};
-#define GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), CARRICK_TYPE_STATUS_ICON, CarrickStatusIconPrivate))
+#define GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), NMN_TYPE_STATUS_ICON, NmnStatusIconPrivate))
typedef struct {
NMClient *client;
guint activation_animation_id;
guint activation_animation_index;
-} CarrickStatusIconPrivate;
+} NmnStatusIconPrivate;
-static GdkPixbuf *get_active_wifi_icon (CarrickStatusIcon *self, NMDeviceWifi *device);
+static GdkPixbuf *get_active_wifi_icon (NmnStatusIcon *self, NMDeviceWifi *device);
GtkStatusIcon *
-carrick_status_icon_new (NMClient *client)
+nmn_status_icon_new (NMClient *client)
{
g_return_val_if_fail (NM_IS_CLIENT (client), NULL);
- return GTK_STATUS_ICON (g_object_new (CARRICK_TYPE_STATUS_ICON,
- CARRICK_STATUS_ICON_CLIENT, client,
+ return GTK_STATUS_ICON (g_object_new (NMN_TYPE_STATUS_ICON,
+ NMN_STATUS_ICON_CLIENT, client,
NULL));
}
static GdkPixbuf *
-get_active_ap_icon (CarrickStatusIcon *self, NMAccessPoint *ap)
+get_active_ap_icon (NmnStatusIcon *self, NMAccessPoint *ap)
{
GdkPixbuf *icon;
guint32 strength;
@@ -50,13 +50,13 @@ get_active_ap_icon (CarrickStatusIcon *self, NMAccessPoint *ap)
strength = CLAMP (strength, 0, 100);
if (strength > 71)
- icon = carrick_icon_cache_get ("nm-signal-100");
+ icon = nmn_icon_cache_get ("nm-signal-100");
else if (strength > 38)
- icon = carrick_icon_cache_get ("nm-signal-66");
+ icon = nmn_icon_cache_get ("nm-signal-66");
else if (strength > 5)
- icon = carrick_icon_cache_get ("nm-signal-33");
+ icon = nmn_icon_cache_get ("nm-signal-33");
else
- icon = carrick_icon_cache_get ("nm-signal-00");
+ icon = nmn_icon_cache_get ("nm-signal-00");
return icon;
}
@@ -64,7 +64,7 @@ get_active_ap_icon (CarrickStatusIcon *self, NMAccessPoint *ap)
static void
ap_strength_changed (NMAccessPoint *ap, GParamSpec *pspec, gpointer user_data)
{
- CarrickStatusIcon *self = CARRICK_STATUS_ICON (user_data);
+ NmnStatusIcon *self = NMN_STATUS_ICON (user_data);
GdkPixbuf *icon;
icon = get_active_ap_icon (self, ap);
@@ -72,7 +72,7 @@ ap_strength_changed (NMAccessPoint *ap, GParamSpec *pspec, gpointer user_data)
}
typedef struct {
- CarrickStatusIcon *status_icon;
+ NmnStatusIcon *status_icon;
NMDeviceWifi *device;
NMAccessPoint *ap;
gulong ap_strength_id;
@@ -93,7 +93,7 @@ static void
device_active_ap_changed (NMDeviceWifi *device, GParamSpec *pspec, gpointer user_data)
{
WifiIconInfo *info = (WifiIconInfo *) user_data;
- CarrickStatusIcon *self = info->status_icon;
+ NmnStatusIcon *self = info->status_icon;
/* First, remove the old signal handlers */
g_signal_handler_disconnect (info->device, info->active_ap_id);
@@ -110,7 +110,7 @@ device_active_ap_changed (NMDeviceWifi *device, GParamSpec *pspec, gpointer user
}
static GdkPixbuf *
-get_active_wifi_icon (CarrickStatusIcon *self, NMDeviceWifi *device)
+get_active_wifi_icon (NmnStatusIcon *self, NMDeviceWifi *device)
{
NMAccessPoint *ap;
GdkPixbuf *icon;
@@ -138,15 +138,15 @@ get_active_wifi_icon (CarrickStatusIcon *self, NMDeviceWifi *device)
icon = get_active_ap_icon (self, ap);
} else
- icon = carrick_icon_cache_get ("nm-signal-00");
+ icon = nmn_icon_cache_get ("nm-signal-00");
return icon;
}
static GdkPixbuf *
-get_active_device_icon (CarrickStatusIcon *self)
+get_active_device_icon (NmnStatusIcon *self)
{
- CarrickStatusIconPrivate *priv = GET_PRIVATE (self);
+ NmnStatusIconPrivate *priv = GET_PRIVATE (self);
const GPtrArray *devices;
GdkPixbuf *icon = NULL;
int i;
@@ -159,11 +159,11 @@ get_active_device_icon (CarrickStatusIcon *self)
continue;
if (NM_IS_DEVICE_ETHERNET (device))
- icon = carrick_icon_cache_get ("nm-device-wired");
+ icon = nmn_icon_cache_get ("nm-device-wired");
else if (NM_IS_DEVICE_WIFI (device))
icon = get_active_wifi_icon (self, NM_DEVICE_WIFI (device));
else if (NM_IS_GSM_DEVICE (device) || NM_IS_CDMA_DEVICE (device))
- icon = carrick_icon_cache_get ("nm-device-wwan");
+ icon = nmn_icon_cache_get ("nm-device-wwan");
else
g_warning ("Unhandled device type: '%s'", G_OBJECT_TYPE_NAME (device));
}
@@ -174,8 +174,8 @@ get_active_device_icon (CarrickStatusIcon *self)
static gboolean
activation_animation (gpointer data)
{
- CarrickStatusIcon *self = CARRICK_STATUS_ICON (data);
- CarrickStatusIconPrivate *priv = GET_PRIVATE (self);
+ NmnStatusIcon *self = NMN_STATUS_ICON (data);
+ NmnStatusIconPrivate *priv = GET_PRIVATE (self);
GdkPixbuf *icon;
const char *icon_names[] = {
"nm-stage01-connecting01",
@@ -188,7 +188,7 @@ activation_animation (gpointer data)
if (priv->activation_animation_index > 3)
priv->activation_animation_index = 0;
- icon = carrick_icon_cache_get (icon_names[priv->activation_animation_index++]);
+ icon = nmn_icon_cache_get (icon_names[priv->activation_animation_index++]);
gtk_status_icon_set_from_pixbuf (GTK_STATUS_ICON (self), icon);
return TRUE;
@@ -199,8 +199,8 @@ nm_state_changed (NMClient *client,
GParamSpec *pspec,
gpointer user_data)
{
- CarrickStatusIcon *self = CARRICK_STATUS_ICON (user_data);
- CarrickStatusIconPrivate *priv = GET_PRIVATE (self);
+ NmnStatusIcon *self = NMN_STATUS_ICON (user_data);
+ NmnStatusIconPrivate *priv = GET_PRIVATE (self);
GdkPixbuf *icon;
NMState state;
@@ -226,7 +226,7 @@ nm_state_changed (NMClient *client,
icon = get_active_device_icon (self);
break;
default:
- icon = carrick_icon_cache_get ("nm-no-connection");
+ icon = nmn_icon_cache_get ("nm-no-connection");
break;
}
@@ -236,7 +236,7 @@ nm_state_changed (NMClient *client,
static gboolean
set_initial_state (gpointer data)
{
- CarrickStatusIconPrivate *priv = GET_PRIVATE (data);
+ NmnStatusIconPrivate *priv = GET_PRIVATE (data);
nm_state_changed (priv->client, NULL, data);
@@ -246,7 +246,7 @@ set_initial_state (gpointer data)
/*****************************************************************************/
static void
-carrick_status_icon_init (CarrickStatusIcon *self)
+nmn_status_icon_init (NmnStatusIcon *self)
{
}
@@ -256,9 +256,9 @@ constructor (GType type,
GObjectConstructParam *construct_params)
{
GObject *object;
- CarrickStatusIconPrivate *priv;
+ NmnStatusIconPrivate *priv;
- object = G_OBJECT_CLASS (carrick_status_icon_parent_class)->constructor
+ object = G_OBJECT_CLASS (nmn_status_icon_parent_class)->constructor
(type, n_construct_params, construct_params);
if (!object)
@@ -289,7 +289,7 @@ static void
set_property (GObject *object, guint prop_id,
const GValue *value, GParamSpec *pspec)
{
- CarrickStatusIconPrivate *priv = GET_PRIVATE (object);
+ NmnStatusIconPrivate *priv = GET_PRIVATE (object);
switch (prop_id) {
case PROP_CLIENT:
@@ -306,7 +306,7 @@ static void
get_property (GObject *object, guint prop_id,
GValue *value, GParamSpec *pspec)
{
- CarrickStatusIconPrivate *priv = GET_PRIVATE (object);
+ NmnStatusIconPrivate *priv = GET_PRIVATE (object);
switch (prop_id) {
case PROP_CLIENT:
@@ -321,7 +321,7 @@ get_property (GObject *object, guint prop_id,
static void
finalize (GObject *object)
{
- CarrickStatusIconPrivate *priv = GET_PRIVATE (object);
+ NmnStatusIconPrivate *priv = GET_PRIVATE (object);
if (priv->activation_animation_id) {
g_source_remove (priv->activation_animation_id);
@@ -330,15 +330,15 @@ finalize (GObject *object)
g_object_unref (priv->client);
- G_OBJECT_CLASS (carrick_status_icon_parent_class)->finalize (object);
+ G_OBJECT_CLASS (nmn_status_icon_parent_class)->finalize (object);
}
static void
-carrick_status_icon_class_init (CarrickStatusIconClass *class)
+nmn_status_icon_class_init (NmnStatusIconClass *class)
{
GObjectClass *object_class = G_OBJECT_CLASS (class);
- g_type_class_add_private (object_class, sizeof (CarrickStatusIconPrivate));
+ g_type_class_add_private (object_class, sizeof (NmnStatusIconPrivate));
object_class->constructor = constructor;
object_class->get_property = get_property;
@@ -348,7 +348,7 @@ carrick_status_icon_class_init (CarrickStatusIconClass *class)
/* properties */
g_object_class_install_property
(object_class, PROP_CLIENT,
- g_param_spec_object (CARRICK_STATUS_ICON_CLIENT,
+ g_param_spec_object (NMN_STATUS_ICON_CLIENT,
"NMClient",
"NMClient",
NM_TYPE_CLIENT,
diff --git a/src/nmn-status-icon.h b/src/nmn-status-icon.h
index 847cab4..4955ae5 100644
--- a/src/nmn-status-icon.h
+++ b/src/nmn-status-icon.h
@@ -1,34 +1,34 @@
/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-#ifndef CARRICK_STATUS_ICON_H
-#define CARRICK_STATUS_ICON_H
+#ifndef NMN_STATUS_ICON_H
+#define NMN_STATUS_ICON_H
#include <gtk/gtk.h>
#include <nm-client.h>
G_BEGIN_DECLS
-#define CARRICK_TYPE_STATUS_ICON (carrick_status_icon_get_type ())
-#define CARRICK_STATUS_ICON(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), CARRICK_TYPE_STATUS_ICON, CarrickStatusIcon))
-#define CARRICK_STATUS_ICON_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), CARRICK_TYPE_STATUS_ICON, CarrickStatusIconClass))
-#define CARRICK_IS_STATUS_ICON(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), CARRICK_TYPE_STATUS_ICON))
-#define CARRICK_IS_STATUS_ICON_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), CARRICK_TYPE_STATUS_ICON))
-#define CARRICK_STATUS_ICON_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), CARRICK_TYPE_STATUS_ICON, CarrickStatusIconClass))
+#define NMN_TYPE_STATUS_ICON (nmn_status_icon_get_type ())
+#define NMN_STATUS_ICON(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NMN_TYPE_STATUS_ICON, NmnStatusIcon))
+#define NMN_STATUS_ICON_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NMN_TYPE_STATUS_ICON, NmnStatusIconClass))
+#define NMN_IS_STATUS_ICON(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NMN_TYPE_STATUS_ICON))
+#define NMN_IS_STATUS_ICON_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), NMN_TYPE_STATUS_ICON))
+#define NMN_STATUS_ICON_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), NMN_TYPE_STATUS_ICON, NmnStatusIconClass))
-#define CARRICK_STATUS_ICON_CLIENT "client"
+#define NMN_STATUS_ICON_CLIENT "client"
typedef struct {
GtkStatusIcon parent;
-} CarrickStatusIcon;
+} NmnStatusIcon;
typedef struct {
GtkStatusIconClass parent;
-} CarrickStatusIconClass;
+} NmnStatusIconClass;
-GType carrick_status_icon_get_type (void);
+GType nmn_status_icon_get_type (void);
-GtkStatusIcon *carrick_status_icon_new (NMClient *client);
+GtkStatusIcon *nmn_status_icon_new (NMClient *client);
G_END_DECLS
-#endif /* CARRICK_STATUS_H */
+#endif /* NMN_STATUS_H */
diff --git a/src/nmn-wifi-item.c b/src/nmn-wifi-item.c
index 297a759..4be3990 100644
--- a/src/nmn-wifi-item.c
+++ b/src/nmn-wifi-item.c
@@ -13,7 +13,7 @@
#include "wireless-dialog.h"
#include "utils.h"
-G_DEFINE_TYPE (CarrickWifiItem, carrick_wifi_item, CARRICK_TYPE_NETWORK_ITEM)
+G_DEFINE_TYPE (NmnWifiItem, nmn_wifi_item, NMN_TYPE_NETWORK_ITEM)
enum {
PROP_0,
@@ -22,38 +22,38 @@ enum {
LAST_PROP
};
-#define GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), CARRICK_TYPE_WIFI_ITEM, CarrickWifiItemPrivate))
+#define GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), NMN_TYPE_WIFI_ITEM, NmnWifiItemPrivate))
typedef struct {
NMAccessPoint *ap;
gulong notify_id;
gboolean disposed;
-} CarrickWifiItemPrivate;
+} NmnWifiItemPrivate;
-static void connect (CarrickItem *item);
+static void connect (NmnItem *item);
GtkWidget *
-carrick_wifi_item_new (CarrickNMData *nm_data,
- NMDeviceWifi *device,
- NMAccessPoint *ap)
+nmn_wifi_item_new (NmnNMData *nm_data,
+ NMDeviceWifi *device,
+ NMAccessPoint *ap)
{
- g_return_val_if_fail (CARRICK_IS_NM_DATA (nm_data), NULL);
+ g_return_val_if_fail (NMN_IS_NM_DATA (nm_data), NULL);
g_return_val_if_fail (NM_IS_DEVICE_WIFI (device), NULL);
g_return_val_if_fail (NM_IS_ACCESS_POINT (ap), NULL);
- return GTK_WIDGET (g_object_new (CARRICK_TYPE_WIFI_ITEM,
- CARRICK_NETWORK_ITEM_NM_DATA, nm_data,
- CARRICK_NETWORK_ITEM_DEVICE, device,
- CARRICK_WIFI_ITEM_ACCESS_POINT, ap,
+ return GTK_WIDGET (g_object_new (NMN_TYPE_WIFI_ITEM,
+ NMN_NETWORK_ITEM_NM_DATA, nm_data,
+ NMN_NETWORK_ITEM_DEVICE, device,
+ NMN_WIFI_ITEM_ACCESS_POINT, ap,
NULL));
}
static void
-update_item (CarrickWifiItem *self)
+update_item (NmnWifiItem *self)
{
- CarrickWifiItemPrivate *priv = GET_PRIVATE (self);
- CarrickItem *item = CARRICK_ITEM (self);
+ NmnWifiItemPrivate *priv = GET_PRIVATE (self);
+ NmnItem *item = NMN_ITEM (self);
const char *icon;
const char *security_string;
guint strength;
@@ -87,20 +87,20 @@ update_item (CarrickWifiItem *self)
else
security_string = "";
- carrick_item_set_icon (item, icon);
- carrick_item_set_security (item, security_string);
+ nmn_item_set_icon (item, icon);
+ nmn_item_set_security (item, security_string);
- if (carrick_network_item_get_connection (CARRICK_NETWORK_ITEM (self)) == NULL) {
+ if (nmn_network_item_get_connection (NMN_NETWORK_ITEM (self)) == NULL) {
/* We're an AP list item, set the item's name */
const GByteArray *ssid;
char *printable_ssid;
ssid = nm_access_point_get_ssid (priv->ap);
printable_ssid = nm_utils_ssid_to_utf8 ((char *) ssid->data, ssid->len);
- carrick_item_set_name (item, printable_ssid);
+ nmn_item_set_name (item, printable_ssid);
g_free (printable_ssid);
- carrick_item_set_status_visible (item, FALSE);
+ nmn_item_set_status_visible (item, FALSE);
}
}
@@ -109,13 +109,13 @@ updated (NMAccessPoint *ap,
GParamSpec *pspec,
gpointer user_data)
{
- update_item (CARRICK_WIFI_ITEM (user_data));
+ update_item (NMN_WIFI_ITEM (user_data));
}
GtkWidget *
-carrick_wifi_item_create_for_connection (CarrickNMData *nm_data,
- NMDeviceWifi *device,
- NMExportedConnection *exported)
+nmn_wifi_item_create_for_connection (NmnNMData *nm_data,
+ NMDeviceWifi *device,
+ NMExportedConnection *exported)
{
NMConnection *wrapped;
NMSettingConnection *s_con;
@@ -124,7 +124,7 @@ carrick_wifi_item_create_for_connection (CarrickNMData *nm_data,
GtkWidget *item;
int i;
- g_return_val_if_fail (CARRICK_IS_NM_DATA (nm_data), NULL);
+ g_return_val_if_fail (NMN_IS_NM_DATA (nm_data), NULL);
g_return_val_if_fail (NM_IS_DEVICE_WIFI (device), NULL);
g_return_val_if_fail (NM_IS_EXPORTED_CONNECTION (exported), NULL);
@@ -142,9 +142,9 @@ carrick_wifi_item_create_for_connection (CarrickNMData *nm_data,
NMAccessPoint *ap = NM_ACCESS_POINT (g_ptr_array_index (aps, i));
if (utils_connection_valid_for_device (wrapped, NM_DEVICE (device), ap)) {
- item = carrick_wifi_item_new (nm_data, device, ap);
- g_object_set (item, CARRICK_NETWORK_ITEM_CONNECTION, exported, NULL);
- carrick_item_set_remove_visible (CARRICK_ITEM (item), TRUE);
+ item = nmn_wifi_item_new (nm_data, device, ap);
+ g_object_set (item, NMN_NETWORK_ITEM_CONNECTION, exported, NULL);
+ nmn_item_set_remove_visible (NMN_ITEM (item), TRUE);
}
}
@@ -152,9 +152,9 @@ carrick_wifi_item_create_for_connection (CarrickNMData *nm_data,
}
NMAccessPoint *
-carrick_wifi_item_get_ap (CarrickWifiItem *self)
+nmn_wifi_item_get_ap (NmnWifiItem *self)
{
- g_return_val_if_fail (CARRICK_IS_WIFI_ITEM (self), NULL);
+ g_return_val_if_fail (NMN_IS_WIFI_ITEM (self), NULL);
return GET_PRIVATE (self)->ap;
}
@@ -395,23 +395,23 @@ wireless_dialog_response_cb (NMAWirelessDialog *dialog,
gpointer user_data)
{
if (response == GTK_RESPONSE_OK) {
- CarrickNetworkItem *item = CARRICK_NETWORK_ITEM (user_data);
- CarrickNMData *nm_data;
+ NmnNetworkItem *item = NMN_NETWORK_ITEM (user_data);
+ NmnNMData *nm_data;
NMConnection *connection;
NMExportedConnection *exported;
- nm_data = carrick_network_item_get_nm_data (item);
+ nm_data = nmn_network_item_get_nm_data (item);
connection = nma_wireless_dialog_get_connection (dialog);
exported = NM_EXPORTED_CONNECTION
- (nma_gconf_settings_add_connection (NMA_GCONF_SETTINGS (carrick_nm_data_get_user_settings (nm_data)),
+ (nma_gconf_settings_add_connection (NMA_GCONF_SETTINGS (nmn_nm_data_get_user_settings (nm_data)),
connection));
g_object_unref (connection);
if (exported) {
- carrick_network_item_set_connection (item, exported);
+ nmn_network_item_set_connection (item, exported);
g_object_unref (exported);
- connect (CARRICK_ITEM (item));
+ connect (NMN_ITEM (item));
}
}
@@ -420,19 +420,19 @@ wireless_dialog_response_cb (NMAWirelessDialog *dialog,
}
static void
-connect (CarrickItem *item)
+connect (NmnItem *item)
{
- CarrickNetworkItem *network_item = CARRICK_NETWORK_ITEM (item);
- CarrickNMData *nm_data;
+ NmnNetworkItem *network_item = NMN_NETWORK_ITEM (item);
+ NmnNMData *nm_data;
NMDeviceWifi *device;
NMAccessPoint *ap;
NMConnection *connection;
NMExportedConnection *exported;
- if (!carrick_network_item_get_connection (network_item)) {
- nm_data = carrick_network_item_get_nm_data (network_item);
- device = NM_DEVICE_WIFI (carrick_network_item_get_device (network_item));
- ap = carrick_wifi_item_get_ap (CARRICK_WIFI_ITEM (item));
+ if (!nmn_network_item_get_connection (network_item)) {
+ nm_data = nmn_network_item_get_nm_data (network_item);
+ device = NM_DEVICE_WIFI (nmn_network_item_get_device (network_item));
+ ap = nmn_wifi_item_get_ap (NMN_WIFI_ITEM (item));
connection = create_new_connection (device, ap);
if (!connection)
@@ -441,7 +441,7 @@ connect (CarrickItem *item)
if (nm_connection_need_secrets (connection, NULL)) {
GtkWidget *dialog;
- dialog = nma_wireless_dialog_new (CARRICK_WIFI_ITEM (item), connection);
+ dialog = nma_wireless_dialog_new (NMN_WIFI_ITEM (item), connection);
g_object_unref (connection);
g_signal_connect (dialog, "done", G_CALLBACK (wireless_dialog_response_cb), item);
nma_wireless_dialog_show (NMA_WIRELESS_DIALOG (dialog));
@@ -449,27 +449,27 @@ connect (CarrickItem *item)
}
exported = NM_EXPORTED_CONNECTION
- (nma_gconf_settings_add_connection (NMA_GCONF_SETTINGS (carrick_nm_data_get_user_settings (nm_data)),
+ (nma_gconf_settings_add_connection (NMA_GCONF_SETTINGS (nmn_nm_data_get_user_settings (nm_data)),
connection));
g_object_unref (connection);
if (!exported)
return;
- carrick_network_item_set_connection (network_item, exported);
+ nmn_network_item_set_connection (network_item, exported);
g_object_unref (exported);
}
- CARRICK_ITEM_CLASS (carrick_wifi_item_parent_class)->connect (item);
+ NMN_ITEM_CLASS (nmn_wifi_item_parent_class)->connect (item);
/* Clear the exported connection again - the main networks list will handle password requests and so on. */
- carrick_network_item_set_connection (network_item, NULL);
+ nmn_network_item_set_connection (network_item, NULL);
}
static const char *
-get_specific_object (CarrickNetworkItem *network_item)
+get_specific_object (NmnNetworkItem *network_item)
{
- CarrickWifiItemPrivate *priv = GET_PRIVATE (network_item);
+ NmnWifiItemPrivate *priv = GET_PRIVATE (network_item);
return nm_object_get_path (NM_OBJECT (priv->ap));
}
@@ -503,7 +503,7 @@ secrets_requested_response_cb (NMAWirelessDialog *dialog,
gpointer user_data)
{
DBusGMethodInvocation *context = (DBusGMethodInvocation *) user_data;
- CarrickWifiItem *item;
+ NmnWifiItem *item;
NMExportedConnection *connection;
NMSettingWirelessSecurity *s_wireless_sec;
const char *key_mgmt;
@@ -518,7 +518,7 @@ secrets_requested_response_cb (NMAWirelessDialog *dialog,
}
item = nma_wireless_dialog_get_item (dialog);
- connection = carrick_network_item_get_connection (CARRICK_NETWORK_ITEM (item));
+ connection = nmn_network_item_get_connection (NMN_NETWORK_ITEM (item));
wrapped = nm_exported_connection_get_connection (connection);
/* Second-guess which setting NM wants secrets for. */
@@ -595,7 +595,7 @@ secrets_requested_response_cb (NMAWirelessDialog *dialog,
}
static void
-secrets_requested (CarrickNetworkItem *network_item,
+secrets_requested (NmnNetworkItem *network_item,
const char *setting_name,
const char **hints,
gboolean ask_user,
@@ -603,13 +603,13 @@ secrets_requested (CarrickNetworkItem *network_item,
{
GtkWidget *dialog;
- dialog = nma_wireless_dialog_new (CARRICK_WIFI_ITEM (network_item), NULL);
+ dialog = nma_wireless_dialog_new (NMN_WIFI_ITEM (network_item), NULL);
g_signal_connect (dialog, "done", G_CALLBACK (secrets_requested_response_cb), context);
nma_wireless_dialog_show (NMA_WIRELESS_DIALOG (dialog));
}
static void
-carrick_wifi_item_init (CarrickWifiItem *item)
+nmn_wifi_item_init (NmnWifiItem *item)
{
}
@@ -619,9 +619,9 @@ constructor (GType type,
GObjectConstructParam *construct_params)
{
GObject *object;
- CarrickWifiItemPrivate *priv;
+ NmnWifiItemPrivate *priv;
- object = G_OBJECT_CLASS (carrick_wifi_item_parent_class)->constructor
+ object = G_OBJECT_CLASS (nmn_wifi_item_parent_class)->constructor
(type, n_construct_params, construct_params);
if (!object)
@@ -636,7 +636,7 @@ constructor (GType type,
}
priv->notify_id = g_signal_connect (priv->ap, "notify", G_CALLBACK (updated), object);
- update_item (CARRICK_WIFI_ITEM (object));
+ update_item (NMN_WIFI_ITEM (object));
return object;
}
@@ -645,7 +645,7 @@ static void
set_property (GObject *object, guint prop_id,
const GValue *value, GParamSpec *pspec)
{
- CarrickWifiItemPrivate *priv = GET_PRIVATE (object);
+ NmnWifiItemPrivate *priv = GET_PRIVATE (object);
switch (prop_id) {
case PROP_ACCESS_POINT:
@@ -662,7 +662,7 @@ static void
get_property (GObject *object, guint prop_id,
GValue *value, GParamSpec *pspec)
{
- CarrickWifiItemPrivate *priv = GET_PRIVATE (object);
+ NmnWifiItemPrivate *priv = GET_PRIVATE (object);
switch (prop_id) {
case PROP_ACCESS_POINT:
@@ -677,7 +677,7 @@ get_property (GObject *object, guint prop_id,
static void
dispose (GObject *object)
{
- CarrickWifiItemPrivate *priv = GET_PRIVATE (object);
+ NmnWifiItemPrivate *priv = GET_PRIVATE (object);
if (priv->disposed)
return;
@@ -689,17 +689,17 @@ dispose (GObject *object)
priv->disposed = TRUE;
- G_OBJECT_CLASS (carrick_wifi_item_parent_class)->dispose (object);
+ G_OBJECT_CLASS (nmn_wifi_item_parent_class)->dispose (object);
}
static void
-carrick_wifi_item_class_init (CarrickWifiItemClass *class)
+nmn_wifi_item_class_init (NmnWifiItemClass *class)
{
GObjectClass *object_class = G_OBJECT_CLASS (class);
- CarrickItemClass *item_class = CARRICK_ITEM_CLASS (class);
- CarrickNetworkItemClass *network_item_class = CARRICK_NETWORK_ITEM_CLASS (class);
+ NmnItemClass *item_class = NMN_ITEM_CLASS (class);
+ NmnNetworkItemClass *network_item_class = NMN_NETWORK_ITEM_CLASS (class);
- g_type_class_add_private (object_class, sizeof (CarrickWifiItemPrivate));
+ g_type_class_add_private (object_class, sizeof (NmnWifiItemPrivate));
/* methods */
object_class->constructor = constructor;
@@ -714,7 +714,7 @@ carrick_wifi_item_class_init (CarrickWifiItemClass *class)
/* properties */
g_object_class_install_property
(object_class, PROP_ACCESS_POINT,
- g_param_spec_object (CARRICK_WIFI_ITEM_ACCESS_POINT,
+ g_param_spec_object (NMN_WIFI_ITEM_ACCESS_POINT,
"NMAccessPoint",
"NMAccessPoint",
NM_TYPE_ACCESS_POINT,
diff --git a/src/nmn-wifi-item.h b/src/nmn-wifi-item.h
index e5763d2..4ddd223 100644
--- a/src/nmn-wifi-item.h
+++ b/src/nmn-wifi-item.h
@@ -1,39 +1,39 @@
/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-#ifndef CARRICK_WIFI_ITEM_H
-#define CARRICK_WIFI_ITEM_H
+#ifndef NMN_WIFI_ITEM_H
+#define NMN_WIFI_ITEM_H
#include <nmn-network-item.h>
#include <nm-device-wifi.h>
#include "nmn-nm-data.h"
-#define CARRICK_TYPE_WIFI_ITEM (carrick_wifi_item_get_type ())
-#define CARRICK_WIFI_ITEM(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), CARRICK_TYPE_WIFI_ITEM, CarrickWifiItem))
-#define CARRICK_WIFI_ITEM_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), CARRICK_TYPE_WIFI_ITEM, CarrickWifiItemClass))
-#define CARRICK_IS_WIFI_ITEM(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), CARRICK_TYPE_WIFI_ITEM))
-#define CARRICK_IS_WIFI_ITEM_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), CARRICK_TYPE_WIFI_ITEM))
-#define CARRICK_WIFI_ITEM_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), CARRICK_TYPE_WIFI_ITEM, CarrickWifiItemClass))
+#define NMN_TYPE_WIFI_ITEM (nmn_wifi_item_get_type ())
+#define NMN_WIFI_ITEM(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NMN_TYPE_WIFI_ITEM, NmnWifiItem))
+#define NMN_WIFI_ITEM_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NMN_TYPE_WIFI_ITEM, NmnWifiItemClass))
+#define NMN_IS_WIFI_ITEM(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NMN_TYPE_WIFI_ITEM))
+#define NMN_IS_WIFI_ITEM_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), NMN_TYPE_WIFI_ITEM))
+#define NMN_WIFI_ITEM_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), NMN_TYPE_WIFI_ITEM, NmnWifiItemClass))
-#define CARRICK_WIFI_ITEM_ACCESS_POINT "access-point"
+#define NMN_WIFI_ITEM_ACCESS_POINT "access-point"
typedef struct {
- CarrickNetworkItem parent;
-} CarrickWifiItem;
+ NmnNetworkItem parent;
+} NmnWifiItem;
typedef struct {
- CarrickNetworkItemClass parent;
-} CarrickWifiItemClass;
+ NmnNetworkItemClass parent;
+} NmnWifiItemClass;
-GType carrick_wifi_item_get_type (void);
+GType nmn_wifi_item_get_type (void);
-GtkWidget *carrick_wifi_item_new (CarrickNMData *nm_data,
- NMDeviceWifi *device,
- NMAccessPoint *ap);
+GtkWidget *nmn_wifi_item_new (NmnNMData *nm_data,
+ NMDeviceWifi *device,
+ NMAccessPoint *ap);
-GtkWidget *carrick_wifi_item_create_for_connection (CarrickNMData *nm_data,
- NMDeviceWifi *device,
- NMExportedConnection *exported);
+GtkWidget *nmn_wifi_item_create_for_connection (NmnNMData *nm_data,
+ NMDeviceWifi *device,
+ NMExportedConnection *exported);
-NMAccessPoint *carrick_wifi_item_get_ap (CarrickWifiItem *self);
+NMAccessPoint *nmn_wifi_item_get_ap (NmnWifiItem *self);
-#endif /* CARRICK_WIFI_ITEM_H */
+#endif /* NMN_WIFI_ITEM_H */
diff --git a/src/nmn-wifi-list.c b/src/nmn-wifi-list.c
index 4f68e12..e819b15 100644
--- a/src/nmn-wifi-list.c
+++ b/src/nmn-wifi-list.c
@@ -7,7 +7,7 @@
#include "nmn-wifi-item.h"
#include "utils.h"
-G_DEFINE_TYPE (CarrickWifiList, carrick_wifi_list, CARRICK_TYPE_LIST)
+G_DEFINE_TYPE (NmnWifiList, nmn_wifi_list, NMN_TYPE_LIST)
enum {
PROP_0,
@@ -23,41 +23,41 @@ enum {
static guint signals[LAST_SIGNAL];
-#define GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), CARRICK_TYPE_WIFI_LIST, CarrickWifiListPrivate))
+#define GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), NMN_TYPE_WIFI_LIST, NmnWifiListPrivate))
typedef struct {
- CarrickNMData *nm_data;
+ NmnNMData *nm_data;
gboolean disposed;
-} CarrickWifiListPrivate;
+} NmnWifiListPrivate;
GtkWidget *
-carrick_wifi_list_new (CarrickNMData *nm_data)
+nmn_wifi_list_new (NmnNMData *nm_data)
{
- g_return_val_if_fail (CARRICK_IS_NM_DATA (nm_data), NULL);
+ g_return_val_if_fail (NMN_IS_NM_DATA (nm_data), NULL);
- return GTK_WIDGET (g_object_new (CARRICK_TYPE_WIFI_LIST,
- CARRICK_WIFI_LIST_NM_DATA, nm_data,
+ return GTK_WIDGET (g_object_new (NMN_TYPE_WIFI_LIST,
+ NMN_WIFI_LIST_NM_DATA, nm_data,
NULL));
}
static void
-connect_requested (CarrickItem *item, gpointer user_data)
+connect_requested (NmnItem *item, gpointer user_data)
{
- CarrickWifiList *list = CARRICK_WIFI_LIST (user_data);
+ NmnWifiList *list = NMN_WIFI_LIST (user_data);
g_signal_emit (list, signals[CONNECT_REQUESTED], 0);
}
static gboolean
-matching_connection_exists (CarrickWifiList *list, NMDevice *device, NMAccessPoint *ap)
+matching_connection_exists (NmnWifiList *list, NMDevice *device, NMAccessPoint *ap)
{
- CarrickWifiListPrivate *priv = GET_PRIVATE (list);
+ NmnWifiListPrivate *priv = GET_PRIVATE (list);
GSList *connections;
GSList *iter;
gboolean exists = FALSE;
- connections = nm_settings_list_connections (carrick_nm_data_get_user_settings (priv->nm_data));
+ connections = nm_settings_list_connections (nmn_nm_data_get_user_settings (priv->nm_data));
for (iter = connections; iter; iter = iter->next) {
NMConnection *connection = nm_exported_connection_get_connection (NM_EXPORTED_CONNECTION (iter->data));
@@ -87,15 +87,15 @@ matching_ap_cb (GtkWidget *widget,
gpointer user_data)
{
MatchingAPInfo *info = (MatchingAPInfo *) user_data;
- CarrickWifiItem *item;
+ NmnWifiItem *item;
NMAccessPoint *ap;
const GByteArray *ssid;
if (info->have_match)
return;
- item = CARRICK_WIFI_ITEM (gtk_bin_get_child (GTK_BIN (widget)));
- ap = carrick_wifi_item_get_ap (item);
+ item = NMN_WIFI_ITEM (gtk_bin_get_child (GTK_BIN (widget)));
+ ap = nmn_wifi_item_get_ap (item);
ssid = nm_access_point_get_ssid (ap);
if (!ssid || ssid->len != info->ssid->len || memcmp (ssid->data, info->ssid->data, ssid->len))
@@ -110,7 +110,7 @@ matching_ap_cb (GtkWidget *widget,
}
static gboolean
-matching_ap_exists (CarrickWifiList *list,
+matching_ap_exists (NmnWifiList *list,
NMAccessPoint *ap)
{
MatchingAPInfo info;
@@ -128,7 +128,7 @@ matching_ap_exists (CarrickWifiList *list,
}
static gboolean
-ignore_ap (CarrickWifiList *list,
+ignore_ap (NmnWifiList *list,
NMDeviceWifi *device,
NMAccessPoint *ap)
{
@@ -155,19 +155,19 @@ ap_added (NMDeviceWifi *device,
NMAccessPoint *ap,
gpointer user_data)
{
- CarrickWifiList *list = CARRICK_WIFI_LIST (user_data);
- CarrickWifiListPrivate *priv = GET_PRIVATE (list);
+ NmnWifiList *list = NMN_WIFI_LIST (user_data);
+ NmnWifiListPrivate *priv = GET_PRIVATE (list);
GtkWidget *item;
GtkWidget *event_box;
if (ignore_ap (list, device, ap))
return;
- item = carrick_wifi_item_new (priv->nm_data, device, ap);
+ item = nmn_wifi_item_new (priv->nm_data, device, ap);
event_box = gtk_event_box_new ();
gtk_container_add (GTK_CONTAINER (event_box), item);
gtk_widget_show_all (event_box);
- carrick_list_add_item (CARRICK_LIST (list), event_box);
+ nmn_list_add_item (NMN_LIST (list), event_box);
g_signal_connect (item, "connect-requested", G_CALLBACK (connect_requested), list);
}
@@ -178,8 +178,8 @@ ap_removed (NMDeviceWifi *device,
{
/* FIXME */
-/* CarrickWifiList *list = CARRICK_WIFI_LIST (user_data); */
-/* CarrickWifiListPrivate *priv = GET_PRIVATE (list); */
+ /* NmnWifiList *list = NMN_WIFI_LIST (user_data); */
+ /* NmnWifiListPrivate *priv = GET_PRIVATE (list); */
}
static void
@@ -216,8 +216,8 @@ device_removed (NMClient *client,
static gboolean
populate_list (gpointer data)
{
- CarrickWifiList *list = CARRICK_WIFI_LIST (data);
- CarrickWifiListPrivate *priv = GET_PRIVATE (list);
+ NmnWifiList *list = NMN_WIFI_LIST (data);
+ NmnWifiListPrivate *priv = GET_PRIVATE (list);
NMClient *client;
const GPtrArray *devices;
int i;
@@ -231,7 +231,7 @@ populate_list (gpointer data)
}
static void
-carrick_wifi_list_init (CarrickWifiList *list)
+nmn_wifi_list_init (NmnWifiList *list)
{
}
@@ -241,10 +241,10 @@ constructor (GType type,
GObjectConstructParam *construct_params)
{
GObject *object;
- CarrickWifiListPrivate *priv;
+ NmnWifiListPrivate *priv;
GSource *source;
- object = G_OBJECT_CLASS (carrick_wifi_list_parent_class)->constructor
+ object = G_OBJECT_CLASS (nmn_wifi_list_parent_class)->constructor
(type, n_construct_params, construct_params);
if (!object)
@@ -281,7 +281,7 @@ static void
set_property (GObject *object, guint prop_id,
const GValue *value, GParamSpec *pspec)
{
- CarrickWifiListPrivate *priv = GET_PRIVATE (object);
+ NmnWifiListPrivate *priv = GET_PRIVATE (object);
switch (prop_id) {
case PROP_NM_DATA:
@@ -298,7 +298,7 @@ static void
get_property (GObject *object, guint prop_id,
GValue *value, GParamSpec *pspec)
{
- CarrickWifiListPrivate *priv = GET_PRIVATE (object);
+ NmnWifiListPrivate *priv = GET_PRIVATE (object);
switch (prop_id) {
case PROP_NM_DATA:
@@ -313,7 +313,7 @@ get_property (GObject *object, guint prop_id,
static void
dispose (GObject *object)
{
- CarrickWifiListPrivate *priv = GET_PRIVATE (object);
+ NmnWifiListPrivate *priv = GET_PRIVATE (object);
if (priv->disposed)
return;
@@ -321,15 +321,15 @@ dispose (GObject *object)
g_object_unref (priv->nm_data);
priv->disposed = TRUE;
- G_OBJECT_CLASS (carrick_wifi_list_parent_class)->dispose (object);
+ G_OBJECT_CLASS (nmn_wifi_list_parent_class)->dispose (object);
}
static void
-carrick_wifi_list_class_init (CarrickWifiListClass *class)
+nmn_wifi_list_class_init (NmnWifiListClass *class)
{
GObjectClass *object_class = G_OBJECT_CLASS (class);
- g_type_class_add_private (object_class, sizeof (CarrickWifiListPrivate));
+ g_type_class_add_private (object_class, sizeof (NmnWifiListPrivate));
object_class->constructor = constructor;
object_class->set_property = set_property;
@@ -339,10 +339,10 @@ carrick_wifi_list_class_init (CarrickWifiListClass *class)
/* properties */
g_object_class_install_property
(object_class, PROP_NM_DATA,
- g_param_spec_object (CARRICK_WIFI_LIST_NM_DATA,
- "CarrickNMData",
- "CarrickNMData",
- CARRICK_TYPE_NM_DATA,
+ g_param_spec_object (NMN_WIFI_LIST_NM_DATA,
+ "NmnNMData",
+ "NmnNMData",
+ NMN_TYPE_NM_DATA,
G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
/* Signals */
@@ -350,7 +350,7 @@ carrick_wifi_list_class_init (CarrickWifiListClass *class)
("connect-requested",
G_OBJECT_CLASS_TYPE (class),
G_SIGNAL_RUN_LAST,
- G_STRUCT_OFFSET (CarrickWifiListClass, connect_requested),
+ G_STRUCT_OFFSET (NmnWifiListClass, connect_requested),
NULL, NULL,
g_cclosure_marshal_VOID__VOID,
G_TYPE_NONE, 0);
diff --git a/src/nmn-wifi-list.h b/src/nmn-wifi-list.h
index 9a85687..be22cad 100644
--- a/src/nmn-wifi-list.h
+++ b/src/nmn-wifi-list.h
@@ -1,33 +1,33 @@
/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-#ifndef CARRICK_WIFI_LIST_H
-#define CARRICK_WIFI_LIST_H
+#ifndef NMN_WIFI_LIST_H
+#define NMN_WIFI_LIST_H
#include "nmn-nm-data.h"
#include "nmn-list.h"
-#define CARRICK_TYPE_WIFI_LIST (carrick_wifi_list_get_type ())
-#define CARRICK_WIFI_LIST(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), CARRICK_TYPE_WIFI_LIST, CarrickWifiList))
-#define CARRICK_WIFI_LIST_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), CARRICK_TYPE_WIFI_LIST, CarrickWifiListClass))
-#define CARRICK_IS_WIFI_LIST(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), CARRICK_TYPE_WIFI_LIST))
-#define CARRICK_IS_WIFI_LIST_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), CARRICK_TYPE_WIFI_LIST))
-#define CARRICK_WIFI_LIST_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), CARRICK_TYPE_WIFI_LIST, CarrickWifiListClass))
+#define NMN_TYPE_WIFI_LIST (nmn_wifi_list_get_type ())
+#define NMN_WIFI_LIST(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NMN_TYPE_WIFI_LIST, NmnWifiList))
+#define NMN_WIFI_LIST_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NMN_TYPE_WIFI_LIST, NmnWifiListClass))
+#define NMN_IS_WIFI_LIST(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NMN_TYPE_WIFI_LIST))
+#define NMN_IS_WIFI_LIST_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), NMN_TYPE_WIFI_LIST))
+#define NMN_WIFI_LIST_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), NMN_TYPE_WIFI_LIST, NmnWifiListClass))
-#define CARRICK_WIFI_LIST_NM_DATA "nm-data"
+#define NMN_WIFI_LIST_NM_DATA "nm-data"
typedef struct {
- CarrickList parent;
-} CarrickWifiList;
+ NmnList parent;
+} NmnWifiList;
typedef struct {
- CarrickListClass parent;
+ NmnListClass parent;
/* Signals */
- void (*connect_requested) (CarrickWifiList *self);
-} CarrickWifiListClass;
+ void (*connect_requested) (NmnWifiList *self);
+} NmnWifiListClass;
-GType carrick_wifi_list_get_type (void);
+GType nmn_wifi_list_get_type (void);
-GtkWidget *carrick_wifi_list_new (CarrickNMData *nm_data);
+GtkWidget *nmn_wifi_list_new (NmnNMData *nm_data);
-#endif /* CARRICK_WIFI_LIST_H */
+#endif /* NMN_WIFI_LIST_H */
diff --git a/src/wireless-dialog.c b/src/wireless-dialog.c
index 02b897a..d6a390a 100644
--- a/src/wireless-dialog.c
+++ b/src/wireless-dialog.c
@@ -58,7 +58,7 @@ static guint signals[LAST_SIGNAL];
typedef struct {
NMClient *client;
- CarrickWifiItem *item;
+ NmnWifiItem *item;
GtkBuilder *builder;
NMConnection *connection;
@@ -390,7 +390,7 @@ connection_combo_init (NMAWirelessDialog *self, NMConnection *connection)
gtk_list_store_append (store, &tree_iter);
gtk_list_store_set (store, &tree_iter, C_SEP_COLUMN, TRUE, -1);
- /* FIXME: (added when imported to carrick */
+ /* FIXME: (added when imported to nmn */
/* connections = get_all_connections (priv->applet); */
connections = NULL;
for (iter = connections; iter; iter = g_slist_next (iter)) {
@@ -994,7 +994,7 @@ internal_init (NMAWirelessDialog *self,
return TRUE;
}
-CarrickWifiItem *
+NmnWifiItem *
nma_wireless_dialog_get_item (NMAWirelessDialog *self)
{
g_return_val_if_fail (NMA_IS_WIRELESS_DIALOG (self), NULL);
@@ -1011,7 +1011,7 @@ nma_wireless_dialog_get_connection (NMAWirelessDialog *self)
}
GtkWidget *
-nma_wireless_dialog_new (CarrickWifiItem *item,
+nma_wireless_dialog_new (NmnWifiItem *item,
NMConnection *connection)
{
NMAWirelessDialog *self;
@@ -1021,11 +1021,11 @@ nma_wireless_dialog_new (CarrickWifiItem *item,
NMAccessPoint *ap;
guint32 dev_caps;
- g_return_val_if_fail (CARRICK_IS_WIFI_ITEM (item), NULL);
+ g_return_val_if_fail (NMN_IS_WIFI_ITEM (item), NULL);
- nm_data = NM_CLIENT (carrick_network_item_get_nm_data (CARRICK_NETWORK_ITEM (item)));
- device = carrick_network_item_get_device (CARRICK_NETWORK_ITEM (item));
- ap = carrick_wifi_item_get_ap (item);
+ nm_data = NM_CLIENT (nmn_network_item_get_nm_data (NMN_NETWORK_ITEM (item)));
+ device = nmn_network_item_get_device (NMN_NETWORK_ITEM (item));
+ ap = nmn_wifi_item_get_ap (item);
/* Ensure device validity */
dev_caps = nm_device_get_capabilities (device);
@@ -1049,7 +1049,7 @@ nma_wireless_dialog_new (CarrickWifiItem *item,
if (!connection) {
NMExportedConnection *exported;
- exported = carrick_network_item_get_connection (CARRICK_NETWORK_ITEM (item));
+ exported = nmn_network_item_get_connection (NMN_NETWORK_ITEM (item));
connection = nm_exported_connection_get_connection (exported);
}
diff --git a/src/wireless-dialog.h b/src/wireless-dialog.h
index b0c969f..65dedc8 100644
--- a/src/wireless-dialog.h
+++ b/src/wireless-dialog.h
@@ -30,7 +30,7 @@
#include <nm-connection.h>
#include <nm-device.h>
#include <nm-access-point.h>
-#include "carrick-wifi-item.h"
+#include "nmn-wifi-item.h"
#define NMA_TYPE_WIRELESS_DIALOG (nma_wireless_dialog_get_type ())
#define NMA_WIRELESS_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NMA_TYPE_WIRELESS_DIALOG, NMAWirelessDialog))
@@ -52,11 +52,11 @@ typedef struct {
GType nma_wireless_dialog_get_type (void);
-GtkWidget *nma_wireless_dialog_new (CarrickWifiItem *item,
+GtkWidget *nma_wireless_dialog_new (NmnWifiItem *item,
NMConnection *connection);
void nma_wireless_dialog_show (NMAWirelessDialog *self);
-CarrickWifiItem *nma_wireless_dialog_get_item (NMAWirelessDialog *self);
+NmnWifiItem *nma_wireless_dialog_get_item (NMAWirelessDialog *self);
NMConnection *nma_wireless_dialog_get_connection (NMAWirelessDialog *self);
#endif /* WIRELESS_DIALOG_H */
diff --git a/src/wireless-security/Makefile.am b/src/wireless-security/Makefile.am
index 01f4ce2..129c055 100644
--- a/src/wireless-security/Makefile.am
+++ b/src/wireless-security/Makefile.am
@@ -31,10 +31,10 @@ libwireless_security_la_SOURCES = \
helpers.c
libwireless_security_la_CPPFLAGS = \
- $(CARRICK_CFLAGS) \
+ $(NMN_CFLAGS) \
-I${top_srcdir}/src/gconf-helpers
libwireless_security_la_LIBADD = \
- $(CARRICK_LIBS) \
+ $(NMN_LIBS) \
${top_builddir}/src/gconf-helpers/libgconf-helpers.la
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
