gnome-bluetooth r324 - in trunk: applet browse common properties sendto wizard

[hadess svn gnome org]

Author: hadess
Date: Wed Feb 25 14:38:30 2009
New Revision: 324
URL: http://svn.gnome.org/viewvc/gnome-bluetooth?rev=324&view=rev

Log:
Remove use of deprecated symbols

Fix all the compilation warnings with deprecation enabled.

Modified:
   trunk/applet/main.c
   trunk/applet/notify.c
   trunk/applet/test-agentdialog.c
   trunk/browse/main.c
   trunk/common/helper.c
   trunk/properties/adapter.c
   trunk/properties/main.c
   trunk/sendto/main.c
   trunk/wizard/main.c

Modified: trunk/applet/main.c
==============================================================================
--- trunk/applet/main.c	(original)
+++ trunk/applet/main.c	Wed Feb 25 14:38:30 2009
@@ -368,12 +368,12 @@
 		} else
 			g_print("An unknown error occurred\n");
 
-		gtk_exit(1);
+		return 1;
 	}
 
 	instance = bluetooth_instance_new("applet");
 	if (instance == NULL)
-		gtk_exit(0);
+		return 0;
 
 	g_set_application_name(_("Bluetooth Applet"));
 

Modified: trunk/applet/notify.c
==============================================================================
--- trunk/applet/notify.c	(original)
+++ trunk/applet/notify.c	Wed Feb 25 14:38:30 2009
@@ -29,6 +29,7 @@
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
 #include <libnotify/notify.h>
+#include "notify.h"
 
 static GtkStatusIcon *statusicon = NULL;
 static NotifyNotification *notify = NULL;

Modified: trunk/applet/test-agentdialog.c
==============================================================================
--- trunk/applet/test-agentdialog.c	(original)
+++ trunk/applet/test-agentdialog.c	Wed Feb 25 14:38:30 2009
@@ -48,7 +48,7 @@
 		g_printerr("Connecting to system bus failed: %s\n",
 							error->message);
 		g_error_free(error);
-		gtk_exit(1);
+		return 1;
 	}
 
 	statusicon = init_notification();

Modified: trunk/browse/main.c
==============================================================================
--- trunk/browse/main.c	(original)
+++ trunk/browse/main.c	Wed Feb 25 14:38:30 2009
@@ -56,7 +56,7 @@
 		} else
 			g_printerr("An unknown error occurred\n");
 
-		gtk_exit(1);
+		return 1;
 	}
 
 	gtk_window_set_default_icon_name("bluetooth");
@@ -64,7 +64,7 @@
 	if (option_device == NULL) {
 		option_device = show_browse_dialog();
 		if (option_device == NULL)
-			gtk_exit(1);
+			return 1;
 	}
 
 	command = g_strdup_printf("%s --no-default-window \"obex://[%s]\"",

Modified: trunk/common/helper.c
==============================================================================
--- trunk/common/helper.c	(original)
+++ trunk/common/helper.c	Wed Feb 25 14:38:30 2009
@@ -29,6 +29,7 @@
 #include <gtk/gtk.h>
 
 #include <bluetooth-client.h>
+#include "helper.h"
 
 static void connected_to_icon(GtkTreeViewColumn *column, GtkCellRenderer *cell,
 			GtkTreeModel *model, GtkTreeIter *iter, gpointer data)

Modified: trunk/properties/adapter.c
==============================================================================
--- trunk/properties/adapter.c	(original)
+++ trunk/properties/adapter.c	Wed Feb 25 14:38:30 2009
@@ -34,6 +34,7 @@
 #include <bluetooth-client.h>
 #include <helper.h>
 
+#include "adapter.h"
 #include "general.h"
 
 static BluetoothClient *client;

Modified: trunk/properties/main.c
==============================================================================
--- trunk/properties/main.c	(original)
+++ trunk/properties/main.c	Wed Feb 25 14:38:30 2009
@@ -123,12 +123,12 @@
 		} else
 			g_print("An unknown error occurred\n");
 
-		gtk_exit(1);
+		return 1;
 	}
 
 	instance = bluetooth_instance_new("properties");
 	if (instance == NULL)
-		gtk_exit(0);
+		return 0;
 
 	g_set_application_name(_("Bluetooth Properties"));
 

Modified: trunk/sendto/main.c
==============================================================================
--- trunk/sendto/main.c	(original)
+++ trunk/sendto/main.c	Wed Feb 25 14:38:30 2009
@@ -166,7 +166,7 @@
 					_("Sending files via Bluetooth"));
 	gtk_label_set_markup(GTK_LABEL(label), text);
 	g_free(text);
-	gtk_box_pack_start_defaults(GTK_BOX(vbox), label);
+	gtk_box_pack_start(GTK_BOX(vbox), label, TRUE, TRUE, 0);
 
 	table = gtk_table_new(2, 2, FALSE);
 	gtk_table_set_col_spacings(GTK_TABLE(table), 4);
@@ -208,7 +208,7 @@
 							PANGO_ELLIPSIZE_END);
 	gtk_progress_bar_set_text(GTK_PROGRESS_BAR(progress),
 							_("Connecting..."));
-	gtk_box_pack_start_defaults(GTK_BOX(vbox), progress);
+	gtk_box_pack_start(GTK_BOX(vbox), progress, TRUE, TRUE, 0);
 
 	label_status = gtk_label_new(NULL);
 	gtk_misc_set_alignment(GTK_MISC(label_status), 0, 0.5);
@@ -703,7 +703,7 @@
 		} else
 			g_printerr("An unknown error occurred\n");
 
-		gtk_exit(1);
+		return 1;
 	}
 
 	gtk_window_set_default_icon_name("bluetooth");
@@ -711,14 +711,14 @@
 	if (option_files == NULL) {
 		option_files = show_select_dialog();
 		if (option_files == NULL)
-			gtk_exit(1);
+			return 1;
 	}
 
 	if (option_device == NULL) {
 		option_device = show_browse_dialog();
 		if (option_device == NULL) {
 			g_strfreev(option_files);
-			gtk_exit(1);
+			return 1;
 		}
 	}
 
@@ -756,7 +756,7 @@
 		} else
 			g_print("An unknown error occured\n");
 
-		gtk_exit(1);
+		return 1;
 	}
 
 	dbus_g_object_register_marshaller(marshal_VOID__STRING_STRING,

Modified: trunk/wizard/main.c
==============================================================================
--- trunk/wizard/main.c	(original)
+++ trunk/wizard/main.c	Wed Feb 25 14:38:30 2009
@@ -624,7 +624,8 @@
 
 	hbox_custom = gtk_hbox_new(FALSE, 6);
 	radio_custom = gtk_radio_button_new_with_label_from_widget(GTK_RADIO_BUTTON(radio_0000), _("Custom PIN code:"));
-	entry_custom = gtk_entry_new_with_max_length(4);
+	entry_custom = gtk_entry_new();
+	gtk_entry_set_max_length (GTK_ENTRY (entry_custom), 4);
 	gtk_entry_set_width_chars(GTK_ENTRY(entry_custom), 4);
         g_signal_connect (entry_custom, "key-press-event",
 			  G_CALLBACK (entry_custom_event), NULL);
@@ -745,12 +746,12 @@
 		} else
 			g_print("An unknown error occurred\n");
 
-		gtk_exit(1);
+		return 1;
 	}
 
 	instance = bluetooth_instance_new("wizard");
 	if (instance == NULL)
-		gtk_exit(0);
+		return 0;
 
 	gtk_window_set_default_icon_name("bluetooth");