From: Xavier Claessens Date: Sun, 5 Aug 2007 22:15:08 +0000 (+0000) Subject: Add an Advanced section and remove size_group. Fixes bug #463759 (Jaap A. X-Git-Url: https://git.0d.be/?p=empathy.git;a=commitdiff_plain;h=8c62f091e26106a9145a441ba8bb22330463f1ee Add an Advanced section and remove size_group. Fixes bug #463759 (Jaap A. 2007-08-06 Xavier Claessens * libempathy-gtk/empathy-account-widget-msn.glade: * libempathy-gtk/empathy-account-widget-msn.c: Add an Advanced section and remove size_group. Fixes bug #463759 (Jaap A. Haitsma, Xavier Claessens). * README: Use ./autogen.sh instead of gnome-autogen.sh. svn path=/trunk/; revision=231 --- diff --git a/ChangeLog b/ChangeLog index 62e08355..596e60ae 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2007-08-06 Xavier Claessens + + * libempathy-gtk/empathy-account-widget-msn.glade: + * libempathy-gtk/empathy-account-widget-msn.c: Add an Advanced section + and remove size_group. + Fixes bug #463759 (Jaap A. Haitsma, Xavier Claessens). + + * README: Use ./autogen.sh instead of gnome-autogen.sh. + 2007-08-02 Xavier Claessens * libempathy-gtk/empathy-accounts-dialog.glade: diff --git a/README b/README index e090bd7d..7f38eabb 100644 --- a/README +++ b/README @@ -1,7 +1,7 @@ How to use empathy ? 1) Install -$ gnome-autogen.sh +$ ./autogen.sh $ make && make install 2) Start empathy diff --git a/libempathy-gtk/empathy-account-widget-msn.c b/libempathy-gtk/empathy-account-widget-msn.c index 9e58843a..0c667d30 100644 --- a/libempathy-gtk/empathy-account-widget-msn.c +++ b/libempathy-gtk/empathy-account-widget-msn.c @@ -166,11 +166,6 @@ empathy_account_widget_msn_new (McAccount *account) { EmpathyAccountWidgetMSN *settings; GladeXML *glade; - GtkSizeGroup *size_group; - GtkWidget *label_id; - GtkWidget *label_password; - GtkWidget *label_server; - GtkWidget *label_port; settings = g_new0 (EmpathyAccountWidgetMSN, 1); settings->account = g_object_ref (account); @@ -180,10 +175,6 @@ empathy_account_widget_msn_new (McAccount *account) NULL, "vbox_msn_settings", &settings->vbox_settings, "button_forget", &settings->button_forget, - "label_id", &label_id, - "label_password", &label_password, - "label_server", &label_server, - "label_port", &label_port, "entry_id", &settings->entry_id, "entry_password", &settings->entry_password, "entry_server", &settings->entry_server, @@ -207,16 +198,6 @@ empathy_account_widget_msn_new (McAccount *account) g_object_unref (glade); - /* Set up remaining widgets */ - size_group = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL); - - gtk_size_group_add_widget (size_group, label_id); - gtk_size_group_add_widget (size_group, label_password); - gtk_size_group_add_widget (size_group, label_server); - gtk_size_group_add_widget (size_group, label_port); - - g_object_unref (size_group); - gtk_widget_show (settings->vbox_settings); return settings->vbox_settings; diff --git a/libempathy-gtk/empathy-account-widget-msn.glade b/libempathy-gtk/empathy-account-widget-msn.glade index a1ab76f6..b7b91c5a 100644 --- a/libempathy-gtk/empathy-account-widget-msn.glade +++ b/libempathy-gtk/empathy-account-widget-msn.glade @@ -1,158 +1,335 @@ - - - + + + - - True - msn account settings - False - - - True - 4 - 2 - 12 - 6 - - - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 0 0 65536 1 10 10 - 1 - True - - - 1 - 2 - 3 - 4 - - - - - - True - 0 - Login I_D: - True - entry_id - - - GTK_FILL - - - - - - True - 0 - Pass_word: - True - entry_password - - - 1 - 2 - GTK_FILL - - - - - - True - 2 - - - True - True - False - - - - - True - True - Forget password and clear the entry. - 0 - - - True - gtk-clear - 1 - - - - - False - False - 1 - - - - - 1 - 2 - 1 - 2 - GTK_FILL - GTK_FILL - - - - - True - True - - - 1 - 2 - - - - - - True - 0 - _Server: - True - entry_server - - - 2 - 3 - GTK_FILL - - - - - - True - True - - - 1 - 2 - 2 - 3 - - - - - - True - 0 - _Port: - True - - - 3 - 4 - GTK_FILL - - - - - - + + + True + msn account settings + GTK_WINDOW_TOPLEVEL + GTK_WIN_POS_NONE + False + False + False + True + False + False + GDK_WINDOW_TYPE_HINT_NORMAL + GDK_GRAVITY_NORTH_WEST + True + False + + + + True + False + 6 + + + + True + 2 + 2 + False + 6 + 6 + + + + True + True + True + True + 0 + + True + ● + False + + + 1 + 2 + 0 + 1 + + + + + + + True + Login I_D: + True + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + entry_id + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + 1 + 0 + 1 + fill + + + + + + + True + Pass_word: + True + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + 1 + 1 + 2 + fill + + + + + + + True + False + 2 + + + + True + True + True + False + 0 + + True + ● + False + + + 0 + True + True + + + + + + True + Forget password and clear the entry. + True + GTK_RELIEF_NORMAL + True + + + + True + gtk-clear + 1 + 0.5 + 0.5 + 0 + 0 + + + + + 0 + False + False + + + + + 1 + 2 + 1 + 2 + + + + + + 0 + False + True + + + + + + True + True + False + 0 + + + + True + 2 + 2 + False + 6 + 6 + + + + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 1 + 0 + True + GTK_UPDATE_ALWAYS + False + False + 0 0 65536 1 10 10 + + + 1 + 2 + 1 + 2 + + + + + + + True + True + True + True + 0 + + True + ● + False + + + 1 + 2 + 0 + 1 + + + + + + + True + _Server: + True + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + entry_server + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + 1 + 0 + 1 + fill + + + + + + + True + _Port: + True + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + spinbutton_port + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + 1 + 1 + 2 + fill + + + + + + + + + True + <b>Advanced</b> + False + True + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + label_item + + + + + 0 + False + False + + + + + +