gnome-bluetooth r413 - in trunk: applet properties

[hadess svn gnome org]

Author: hadess
Date: Sat Feb 28 22:32:23 2009
New Revision: 413
URL: http://svn.gnome.org/viewvc/gnome-bluetooth?rev=413&view=rev

Log:
Clean up struct declaration, and use g_new0


Modified:
   trunk/applet/agent.c
   trunk/properties/adapter.c

Modified: trunk/applet/agent.c
==============================================================================
--- trunk/applet/agent.c	(original)
+++ trunk/applet/agent.c	Sat Feb 28 22:32:23 2009
@@ -78,6 +78,7 @@
 
 static GList *input_list = NULL;
 
+typedef struct input_data input_data;
 struct input_data {
 	char *path;
 	char *uuid;
@@ -91,13 +92,13 @@
 
 static gint input_compare(gconstpointer a, gconstpointer b)
 {
-	struct input_data *a_data = (struct input_data *) a;
-	struct input_data *b_data = (struct input_data *) b;
+	input_data *a_data = (input_data *) a;
+	input_data *b_data = (input_data *) b;
 
 	return g_ascii_strcasecmp(a_data->path, b_data->path);
 }
 
-static void input_free(struct input_data *input)
+static void input_free(input_data *input)
 {
 	gtk_widget_destroy(input->dialog);
 
@@ -117,7 +118,7 @@
 static void passkey_callback(GtkWidget *dialog,
 				gint response, gpointer user_data)
 {
-	struct input_data *input = user_data;
+	input_data *input = user_data;
 
 	if (response == GTK_RESPONSE_ACCEPT) {
 		const char *text;
@@ -141,7 +142,7 @@
 static void confirm_callback(GtkWidget *dialog,
 				gint response, gpointer user_data)
 {
-	struct input_data *input = user_data;
+	input_data *input = user_data;
 
 	if (response != GTK_RESPONSE_YES) {
 		GError *error;
@@ -154,7 +155,7 @@
 	input_free(input);
 }
 
-static void set_trusted(struct input_data *input)
+static void set_trusted(input_data *input)
 {
 	GValue value = { 0 };
 	gboolean active;
@@ -179,7 +180,7 @@
 static void auth_callback(GtkWidget *dialog,
 				gint response, gpointer user_data)
 {
-	struct input_data *input = user_data;
+	input_data *input = user_data;
 
 	if (response == GTK_RESPONSE_YES) {
 		set_trusted(input);
@@ -197,7 +198,7 @@
 static void insert_callback(GtkEditable *editable, const gchar *text,
 			gint length, gint *position, gpointer user_data)
 {
-	struct input_data *input = user_data;
+	input_data *input = user_data;
 	gint i;
 
 	if (input->numeric == FALSE)
@@ -213,7 +214,7 @@
 
 static void changed_callback(GtkWidget *editable, gpointer user_data)
 {
-	struct input_data *input = user_data;
+	input_data *input = user_data;
 	const gchar *text;
 
 	text = gtk_entry_get_text(GTK_ENTRY(input->entry));
@@ -223,7 +224,7 @@
 
 static void toggled_callback(GtkWidget *button, gpointer user_data)
 {
-	struct input_data *input = user_data;
+	input_data *input = user_data;
 	gboolean mode;
 
 	mode = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(button));
@@ -242,10 +243,10 @@
 	GtkWidget *entry;
 	GtkWidget *table;
 	GtkWidget *vbox;
-	struct input_data *input;
+	input_data *input;
 	gchar *markup;
 
-	input = g_try_malloc0(sizeof(*input));
+	input = g_new0(input_data, 1);
 	if (!input)
 		return;
 
@@ -355,9 +356,9 @@
 	GtkWidget *table;
 	GtkWidget *vbox;
 	gchar *markup;
-	struct input_data *input;
+	input_data *input;
 
-	input = g_try_malloc0(sizeof(*input));
+	input = g_new0(input_data, 1);
 	if (!input)
 		return;
 
@@ -441,9 +442,9 @@
 	GtkWidget *table;
 	GtkWidget *vbox;
 	gchar *markup, *text;
-	struct input_data *input;
+	input_data *input;
 
-	input = g_try_malloc0(sizeof(*input));
+	input = g_new0(input_data, 1);
 	if (!input)
 		return;
 
@@ -523,7 +524,7 @@
 
 static void show_dialog(gpointer data, gpointer user_data)
 {
-	struct input_data *input = data;
+	input_data *input = data;
 
 	gtk_widget_show_all(input->dialog);
 
@@ -793,9 +794,9 @@
 	DBusGProxy *adapter = user_data;
 	GList *list;
 	GError *result;
-	struct input_data *input;
+	input_data *input;
 
-	input = g_try_malloc0(sizeof(*input));
+	input = g_new0(input_data, 1);
 	if (!input)
 		return FALSE;
 

Modified: trunk/properties/adapter.c
==============================================================================
--- trunk/properties/adapter.c	(original)
+++ trunk/properties/adapter.c	Sat Feb 28 22:32:23 2009
@@ -40,6 +40,7 @@
 static BluetoothClient *client;
 static GtkTreeModel *adapter_model;
 
+typedef struct adapter_data adapter_data;
 struct adapter_data {
 	DBusGProxy *proxy;
 	GtkWidget *notebook;
@@ -61,9 +62,9 @@
 	int name_changed;
 };
 
-static void update_visibility(struct adapter_data *adapter);
+static void update_visibility(adapter_data *adapter);
 
-static void block_signals(struct adapter_data *adapter)
+static void block_signals(adapter_data *adapter)
 {
 	g_signal_handler_block(adapter->button_discoverable,
 						adapter->signal_discoverable);
@@ -71,7 +72,7 @@
 						adapter->signal_powered);
 }
 
-static void unblock_signals(struct adapter_data *adapter)
+static void unblock_signals(adapter_data *adapter)
 {
 	g_signal_handler_unblock(adapter->button_discoverable,
 						adapter->signal_discoverable);
@@ -94,7 +95,7 @@
 
 static void powered_changed_cb(GtkWidget *button, gpointer user_data)
 {
-	struct adapter_data *adapter = user_data;
+	adapter_data *adapter = user_data;
 	GValue powered = { 0 };
 
 	adapter->powered = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (button));
@@ -114,7 +115,7 @@
 
 static void discoverable_changed_cb(GtkWidget *button, gpointer user_data)
 {
-	struct adapter_data *adapter = user_data;
+	adapter_data *adapter = user_data;
 	GValue discoverable = { 0 };
 	GValue timeout = { 0 };
 
@@ -141,7 +142,7 @@
 
 static void name_callback(GtkWidget *editable, gpointer user_data)
 {
-	struct adapter_data *adapter = user_data;
+	adapter_data *adapter = user_data;
 
 	adapter->name_changed = 1;
 }
@@ -149,7 +150,7 @@
 static gboolean focus_callback(GtkWidget *editable,
 				GdkEventFocus *event, gpointer user_data)
 {
-	struct adapter_data *adapter = user_data;
+	adapter_data *adapter = user_data;
 	GValue value = { 0 };
 	const gchar *text;
 
@@ -173,7 +174,7 @@
 	return FALSE;
 }
 
-static void update_buttons(struct adapter_data *adapter, gboolean bonded,
+static void update_buttons(adapter_data *adapter, gboolean bonded,
 					gboolean trusted, gboolean connected)
 {
 	if (trusted) {
@@ -186,7 +187,7 @@
 
 static void select_callback(GtkTreeSelection *selection, gpointer user_data)
 {
-	struct adapter_data *adapter = user_data;
+	adapter_data *adapter = user_data;
 	DBusGProxy *proxy;
 	GtkTreeModel *model;
 	GtkTreeIter iter;
@@ -217,7 +218,7 @@
 static void row_callback(GtkTreeModel *model, GtkTreePath  *path,
 					GtkTreeIter *iter, gpointer user_data)
 {
-	struct adapter_data *adapter = user_data;
+	adapter_data *adapter = user_data;
 	gboolean bonded = FALSE, trusted = FALSE, connected = FALSE;
 
 	if (gtk_tree_selection_iter_is_selected(adapter->selection,
@@ -273,7 +274,7 @@
 
 static void delete_callback(GtkWidget *button, gpointer user_data)
 {
-	struct adapter_data *adapter = user_data;
+	adapter_data *adapter = user_data;
 	GtkTreeModel *model;
 	GtkTreeIter iter;
 	DBusGProxy *device;
@@ -301,7 +302,7 @@
 
 static void trusted_callback(GtkWidget *button, gpointer user_data)
 {
-	struct adapter_data *adapter = user_data;
+	adapter_data *adapter = user_data;
 	GValue value = { 0 };
 	GtkTreeModel *model;
 	GtkTreeIter iter;
@@ -333,7 +334,7 @@
 
 static void disconnect_callback(GtkWidget *button, gpointer user_data)
 {
-	struct adapter_data *adapter = user_data;
+	adapter_data *adapter = user_data;
 	GtkTreeModel *model;
 	GtkTreeIter iter;
 	DBusGProxy *device;
@@ -372,7 +373,7 @@
 	return active;
 }
 
-static void create_adapter(struct adapter_data *adapter)
+static void create_adapter(adapter_data *adapter)
 {
 	GHashTable *hash = NULL;
 	GValue *value;
@@ -592,7 +593,7 @@
 	gtk_widget_show_all(mainbox);
 }
 
-static void update_visibility(struct adapter_data *adapter)
+static void update_visibility(adapter_data *adapter)
 {
 	gboolean inconsistent, enabled;
 	block_signals(adapter);
@@ -621,7 +622,7 @@
 static void property_changed(DBusGProxy *proxy, const char *property,
 					GValue *value, gpointer user_data)
 {
-	struct adapter_data *adapter = user_data;
+	adapter_data *adapter = user_data;
 
 	if (g_str_equal(property, "Name") == TRUE) {
 		const gchar *name = g_value_get_string(value);
@@ -658,15 +659,13 @@
 	}
 }
 
-static struct adapter_data *adapter_alloc(GtkTreeModel *model,
+static adapter_data *adapter_alloc(GtkTreeModel *model,
 		GtkTreePath *path, GtkTreeIter *iter, gpointer user_data)
 {
 	DBusGProxy *proxy;
-	struct adapter_data *adapter;
+	adapter_data *adapter;
 
-	adapter = g_try_malloc0(sizeof(*adapter));
-	if (adapter == NULL)
-		return NULL;
+	adapter = g_new0(adapter_data, 1);
 
 	gtk_tree_model_get(model, iter, BLUETOOTH_COLUMN_PROXY, &proxy, -1);
 
@@ -685,7 +684,7 @@
 
 static gboolean adapter_create(gpointer user_data)
 {
-	struct adapter_data *adapter = user_data;
+	adapter_data *adapter = user_data;
 
 	dbus_g_proxy_connect_signal(adapter->proxy, "PropertyChanged",
 				G_CALLBACK(property_changed), adapter, NULL);
@@ -698,7 +697,7 @@
 static gboolean adapter_insert(GtkTreeModel *model, GtkTreePath *path,
 					GtkTreeIter *iter, gpointer user_data)
 {
-	struct adapter_data *adapter;
+	adapter_data *adapter;
 
 	adapter = adapter_alloc(model, path, iter, user_data);
 	if (adapter == NULL)
@@ -712,7 +711,7 @@
 static void adapter_added(GtkTreeModel *model, GtkTreePath *path,
 					GtkTreeIter *iter, gpointer user_data)
 {
-	struct adapter_data *adapter;
+	adapter_data *adapter;
 
 	adapter = adapter_alloc(model, path, iter, user_data);
 	if (adapter == NULL)
@@ -729,7 +728,7 @@
 
 	for (i = 0; i < count; i++) {
 		GtkWidget *widget;
-		struct adapter_data *adapter;
+		adapter_data *adapter;
 
 		widget = gtk_notebook_get_nth_page(notebook, i);
 		if (widget == NULL)