--- src/plugins/gajim.c.orig	2006-07-06 15:12:07.000000000 +0300
+++ src/plugins/gajim.c	2006-07-06 14:57:50.000000000 +0300
@@ -135,11 +135,6 @@
 
 	error = NULL;
 	connection = dbus_g_bus_get (DBUS_BUS_SESSION, &error);
-	if (connection == NULL)
-	{
-		g_warning("[Gajim] unable to connect to session bus.");
-		return FALSE;
-	}
 	if(error != NULL) {
 		g_warning("[Gajim] unable to get session bus, error was:\n %s", error->message);
 		g_error_free(error);
@@ -149,6 +144,7 @@
 									 SERVICE,
 									 OBJ_PATH,
 									 INTERFACE);
+	dbus_g_connection_unref(connection);
 	if (proxy == NULL){
 		return FALSE;
 	}
@@ -157,13 +153,11 @@
 	if (!dbus_g_proxy_call (proxy, "list_accounts", &error, G_TYPE_INVALID,
 				G_TYPE_STRV, &accounts, G_TYPE_INVALID))
 	{
-		g_print ("sdsdsd : %s\n", error->message);
 		g_object_unref(proxy);
-		dbus_g_connection_unref(connection);
 		g_error_free(error);
 		return FALSE;		
 	}
-
+	g_strfreev(accounts);
 	return TRUE;
 }
 
@@ -260,18 +254,14 @@
 gboolean init (NstPlugin *plugin)
 {
 		
-	bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
-	bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
-	textdomain (GETTEXT_PACKAGE);
+	g_print ("Init gajim plugin\n");
 	g_type_init();
-
-    	// connect to gajim dbus service
+	
+	// connect to gajim dbus service
 	jid_table = g_hash_table_new (g_str_hash, g_str_equal);
-	if (init_dbus() == FALSE) {
+	if (!init_dbus()) {
 		return FALSE;
 	}
-	
-	g_print ("Init gajim plugin\n");
 	return TRUE;
 }
 
@@ -433,9 +423,9 @@
 		}
 	}
 	else {
-		g_warning("[Gajim] missing recepient");
+		g_warning("[Gajim] missing recipient");
 		show_error(_("Sending file failed"), 
-						_("Recepient is missing."));
+						_("Recipient is missing."));
 		return FALSE;
 	}
 	
@@ -463,7 +453,7 @@
 			if(error->domain != DBUS_GERROR || error->code != DBUS_GERROR_INVALID_ARGS) {
 				g_warning("[Gajim] sending file %s to %s failed:", file_iter->data, send_to);
 				g_error_free(error);
-				show_error(_("Sending file failed"), _("Unknown recepient."));
+				show_error(_("Sending file failed"), _("Unknown recipient."));
 				return FALSE;
 			}
 			g_error_free(error);
@@ -483,10 +473,9 @@
 
 static
 NstPluginInfo plugin_info = {
-	"im-jabber", /* we can use 'Gajim' instead, but Yann
-	said that on debian icon is too large */
+	"im-jabber", 
 	N_("Instant Message (Gajim)"),
-	FALSE,
+	TRUE,
 	init,
 	get_contacts_widget,
 	send_files,