# HG changeset patch
# User yaz
# Date 1165742073 28800
# Node ID 6f97100467cf1ec60eb44c24ed876af30cb1dfa3
# Parent  1bd205b6e83defccd52b14d667152e1b1743b959
[svn] - add missing code

diff -r 1bd205b6e83d -r 6f97100467cf ChangeLog
--- a/ChangeLog	Sat Dec 09 08:32:41 2006 -0800
+++ b/ChangeLog	Sun Dec 10 01:14:33 2006 -0800
@@ -1,3 +1,12 @@
+2006-12-09 16:32:41 +0000  Yoshiki Yazawa <yaz@cc.rim.or.jp>
+  revision [772]
+  - replace g_usleep() with g_cond_timed_wait()
+  - some bug fixes
+  
+  trunk/src/scrobbler/plugin.c |   64 +++++++++++++++++++++++++++++++++++--------
+  1 file changed, 53 insertions(+), 11 deletions(-)
+
+
 2006-12-09 13:52:12 +0000  William Pitcock <nenolod@nenolod.net>
   revision [770]
   - you know, it'd help if binio were better documented.
diff -r 1bd205b6e83d -r 6f97100467cf src/scrobbler/configure.c
--- a/src/scrobbler/configure.c	Sat Dec 09 08:32:41 2006 -0800
+++ b/src/scrobbler/configure.c	Sun Dec 10 01:14:33 2006 -0800
@@ -119,6 +119,8 @@
   notebook1 = gtk_notebook_new();
   gtk_widget_show (notebook1);
 
+
+  // last fm
   align1 = gtk_alignment_new(0, 0, 0, 0);
   gtk_widget_show (align1);
   gtk_alignment_set_padding(GTK_ALIGNMENT(align1), 0, 0, 12, 0);
@@ -157,6 +159,8 @@
   gtk_label_set_use_markup (GTK_LABEL (label1), TRUE);
   gtk_notebook_append_page(GTK_NOTEBOOK(notebook1), GTK_WIDGET(align1), label1);
 
+
+  // gerpok
   align1 = gtk_alignment_new(0, 0, 0, 0);
   gtk_widget_show (align1);
   gtk_alignment_set_padding(GTK_ALIGNMENT(align1), 0, 0, 12, 0);
@@ -195,6 +199,8 @@
   gtk_label_set_use_markup (GTK_LABEL (label1), TRUE);
   gtk_notebook_append_page(GTK_NOTEBOOK(notebook1), GTK_WIDGET(align1), label1);
 
+
+  // hatena
   align1 = gtk_alignment_new(0, 0, 0, 0);
   gtk_widget_show (align1);
   gtk_alignment_set_padding(GTK_ALIGNMENT(align1), 0, 0, 12, 0);
@@ -224,7 +230,7 @@
   gtk_table_attach_defaults (GTK_TABLE (table1), ha_entry1, 1, 2, 2, 3);
 
   ha_entry2 = gtk_entry_new ();
-  gtk_entry_set_visibility(GTK_ENTRY(ge_entry2), FALSE);
+  gtk_entry_set_visibility(GTK_ENTRY(ha_entry2), FALSE);
   gtk_widget_show (ha_entry2);
   gtk_table_attach_defaults (GTK_TABLE (table1), ha_entry2, 1, 2, 3, 4);
   g_signal_connect(ha_entry2, "changed", (GCallback) saveconfig, NULL);
@@ -233,6 +239,8 @@
   gtk_label_set_use_markup (GTK_LABEL (label1), TRUE);
   gtk_notebook_append_page(GTK_NOTEBOOK(notebook1), GTK_WIDGET(align1), label1);
 
+
+  // common
   gtk_box_pack_start (GTK_BOX (vbox2), notebook1, TRUE, TRUE, 6);
 
   himage1 = gtk_image_new_from_file (DATA_DIR "/images/audioscrobbler_badge.png");
@@ -245,6 +253,7 @@
 
         if ((db = bmp_cfg_db_open())) {
                 gchar *username = NULL;
+		// last fm
                 bmp_cfg_db_get_string(db, "audioscrobbler", "username",
                         &username);
                 if (username) {
@@ -252,12 +261,20 @@
                         g_free(username);
 			username = NULL;
                 }
+		// gerpok
                 bmp_cfg_db_get_string(db, "audioscrobbler", "ge_username",
                         &username);
                 if (username) {
                         gtk_entry_set_text(GTK_ENTRY(ge_entry1), username);
                         g_free(username);
                 }
+		// hatena
+                bmp_cfg_db_get_string(db, "audioscrobbler", "ha_username",
+                        &username);
+                if (username) {
+                        gtk_entry_set_text(GTK_ENTRY(ha_entry1), username);
+                        g_free(username);
+                }
                 bmp_cfg_db_close(db);
         }