colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2005-10-07 Robert Love <rml@novell.com>

Browse Source 
* gnome/applet/applet-dbus-info.c, gnome/applet/applet.c,
          gnome/applet/applet.h, gnome/vpn-properties/nm-vpn-properties.c,
          src/dhcp-manager/nm-dhcp-manager.c, test/libnm_glib_test.c,
          test/nmtest.c test/nmtestdevices.c: mark functions 'static' as
          appropriate


git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@1004 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
Robert Love
2005-10-07 19:17:06 +00:00
committed by Robert Love
parent eed1fa76e9
commit fa4e8074e7
9 changed files with 30 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@@ -1,3 +1,11 @@
2005-10-07 Robert Love <rml@novell.com>
* gnome/applet/applet-dbus-info.c, gnome/applet/applet.c,
gnome/applet/applet.h, gnome/vpn-properties/nm-vpn-properties.c,
src/dhcp-manager/nm-dhcp-manager.c, test/libnm_glib_test.c,
test/nmtest.c test/nmtestdevices.c: mark functions 'static' as
appropriate
2005-10-07 Robert Love <rml@novell.com> 2005-10-07 Robert Love <rml@novell.com>
* configure.in: Change our compile flags for the betterment of mankind. * configure.in: Change our compile flags for the betterment of mankind.

7
gnome/applet/applet-dbus-info.c
View File

@@ -57,8 +57,11 @@ static inline gboolean nmi_network_type_valid (NMNetworkType type)
* Make a DBus error message * Make a DBus error message
* *
*/ */
DBusMessage *nmi_dbus_create_error_message (DBusMessage *message, const char *exception_namespace, static DBusMessage *nmi_dbus_create_error_message (DBusMessage *message,
const char *exception, const char *format, ...) const char *exception_namespace,
const char *exception,
const char *format,
...)
{ {
char * exception_text; char * exception_text;
DBusMessage * reply_message; DBusMessage * reply_message;

2
gnome/applet/applet.c
View File

@@ -814,7 +814,7 @@ VPNConnection *nmwa_get_first_active_vpn_connection (NMWirelessApplet *applet)
return NULL; return NULL;
} }
VPNConnection *nmwa_get_first_activating_vpn_connection (NMWirelessApplet *applet) static VPNConnection *nmwa_get_first_activating_vpn_connection (NMWirelessApplet *applet)
{ {
VPNConnection * vpn; VPNConnection * vpn;
GSList * elt; GSList * elt;

1
gnome/applet/applet.h
View File

@@ -52,6 +52,7 @@ enum NMWAEncryptionKeyTypes
KEY_TYPE_HEX_KEY = 2 KEY_TYPE_HEX_KEY = 2
}; };
static GType nmwa_get_type (void); /* prototype for G_DEFINE_TYPE */
#define NM_TYPE_WIRELESS_APPLET (nmwa_get_type()) #define NM_TYPE_WIRELESS_APPLET (nmwa_get_type())
#define NM_WIRELESS_APPLET(object) (G_TYPE_CHECK_INSTANCE_CAST((object), NM_TYPE_WIRELESS_APPLET, NMWirelessApplet)) #define NM_WIRELESS_APPLET(object) (G_TYPE_CHECK_INSTANCE_CAST((object), NM_TYPE_WIRELESS_APPLET, NMWirelessApplet))

2
gnome/vpn-properties/nm-vpn-properties.c
View File

@@ -887,7 +887,7 @@ load_properties_module (GSList **vpn_types, const char *path)
} }
if (!g_module_symbol (module, "nm_vpn_properties_factory", if (!g_module_symbol (module, "nm_vpn_properties_factory",
(gpointer *) &nm_vpn_properties_factory)) { (gpointer) &nm_vpn_properties_factory)) {
g_warning ("Cannot locate function 'nm_vpn_properties_factory' in '%s': %s", g_warning ("Cannot locate function 'nm_vpn_properties_factory' in '%s': %s",
path, g_module_error ()); path, g_module_error ());

2
src/dhcp-manager/nm-dhcp-manager.c
View File

@@ -190,7 +190,7 @@ guint8 nm_dhcp_manager_get_state_for_device (NMDHCPManager *manager, NMDevice *d
* Called after timeout of a DHCP transaction to notify device of the failure. * Called after timeout of a DHCP transaction to notify device of the failure.
* *
*/ */
gboolean nm_dhcp_manager_handle_timeout (NMActRequest *req) static gboolean nm_dhcp_manager_handle_timeout (NMActRequest *req)
{ {
NMData * data; NMData * data;
NMDevice * dev; NMDevice * dev;

2
test/libnm_glib_test.c
View File

@@ -26,7 +26,7 @@
#include "libnm_glib.h" #include "libnm_glib.h"
void status_printer (libnm_glib_ctx *ctx, gpointer user_data) static void status_printer (libnm_glib_ctx *ctx, gpointer user_data)
{ {
libnm_glib_state state; libnm_glib_state state;

18
test/nmtest.c
View File

@@ -200,7 +200,7 @@ static int nmwa_dbus_call_nm_method (DBusConnection *con, const char *path, cons
return (RETURN_SUCCESS); return (RETURN_SUCCESS);
} }
char * get_active_device (DBusConnection *connection) static char * get_active_device (DBusConnection *connection)
{ {
int ret; int ret;
char *active_device = NULL; char *active_device = NULL;
@@ -213,7 +213,7 @@ char * get_active_device (DBusConnection *connection)
} }
char * get_object_name (DBusConnection *connection, char *path) static char * get_object_name (DBusConnection *connection, char *path)
{ {
int ret; int ret;
char *name = NULL; char *name = NULL;
@@ -228,7 +228,7 @@ char * get_object_name (DBusConnection *connection, char *path)
} }
int get_object_signal_strength (DBusConnection *connection, char *path) static int get_object_signal_strength (DBusConnection *connection, char *path)
{ {
int ret; int ret;
int strength = -1; int strength = -1;
@@ -243,7 +243,7 @@ int get_object_signal_strength (DBusConnection *connection, char *path)
} }
NMState get_nm_state (DBusConnection *connection) static NMState get_nm_state (DBusConnection *connection)
{ {
int ret; int ret;
NMState state; NMState state;
@@ -256,7 +256,7 @@ NMState get_nm_state (DBusConnection *connection)
} }
char * get_device_active_network (DBusConnection *connection, char *path) static char * get_device_active_network (DBusConnection *connection, char *path)
{ {
int ret; int ret;
char *net = NULL; char *net = NULL;
@@ -269,7 +269,7 @@ char * get_device_active_network (DBusConnection *connection, char *path)
} }
int get_device_type (DBusConnection *connection, char *path) static int get_device_type (DBusConnection *connection, char *path)
{ {
int ret; int ret;
int type = -1; int type = -1;
@@ -282,7 +282,7 @@ int get_device_type (DBusConnection *connection, char *path)
} }
void print_device_networks (DBusConnection *connection, const char *path) static void print_device_networks (DBusConnection *connection, const char *path)
{ {
int ret; int ret;
char **networks = NULL; char **networks = NULL;
@@ -307,7 +307,7 @@ void print_device_networks (DBusConnection *connection, const char *path)
} }
void print_devices (DBusConnection *connection) static void print_devices (DBusConnection *connection)
{ {
int ret; int ret;
char **devices = NULL; char **devices = NULL;
@@ -346,7 +346,7 @@ void print_devices (DBusConnection *connection)
} }
void set_device_network (DBusConnection *connection, const char *path, const char *network) static void set_device_network (DBusConnection *connection, const char *path, const char *network)
{ {
DBusMessage *message; DBusMessage *message;
DBusMessage *reply; DBusMessage *reply;

6
test/nmtestdevices.c
View File

@@ -30,7 +30,7 @@
#include "NetworkManager.h" #include "NetworkManager.h"
void create_device (DBusConnection *connection, NMDeviceType type) static void create_device (DBusConnection *connection, NMDeviceType type)
{ {
DBusMessage *message; DBusMessage *message;
DBusMessage *reply; DBusMessage *reply;
@@ -81,7 +81,7 @@ void create_device (DBusConnection *connection, NMDeviceType type)
} }
void remove_device (DBusConnection *connection, char *dev) static void remove_device (DBusConnection *connection, char *dev)
{ {
DBusMessage *message; DBusMessage *message;
DBusMessage *reply; DBusMessage *reply;
@@ -120,7 +120,7 @@ void remove_device (DBusConnection *connection, char *dev)
} }
void set_link_active (DBusConnection *connection, char *dev, gboolean active) static void set_link_active (DBusConnection *connection, char *dev, gboolean active)
{ {
DBusMessage *message; DBusMessage *message;
DBusMessage *reply; DBusMessage *reply;