From: Xavier Claessens Date: Tue, 1 May 2007 15:42:09 +0000 (+0000) Subject: [darcs-to-svn @ Sync last things from gossip. Up to date with gossip SVN revision... X-Git-Url: https://git.0d.be/?p=empathy.git;a=commitdiff_plain;h=90c1acfbd86f4033550637364fabfacb09b8bb1c;hp=aba79dea9e19cddd374fd011df3a83ebdbf69029 [darcs-to-svn @ Sync last things from gossip. Up to date with gossip SVN revision 2317] svn path=/trunk/; revision=17 --- diff --git a/libempathy-gtk/gossip-account-widget-jabber.glade b/libempathy-gtk/gossip-account-widget-jabber.glade index 24f3b71b..cbb79caf 100644 --- a/libempathy-gtk/gossip-account-widget-jabber.glade +++ b/libempathy-gtk/gossip-account-widget-jabber.glade @@ -2,7 +2,6 @@ - True diff --git a/libempathy-gtk/gossip-accounts-dialog.c b/libempathy-gtk/gossip-accounts-dialog.c index c4aa020b..ad9f7976 100644 --- a/libempathy-gtk/gossip-accounts-dialog.c +++ b/libempathy-gtk/gossip-accounts-dialog.c @@ -74,7 +74,7 @@ typedef struct { GtkWidget *entry_name; GtkWidget *table_new_account; GtkWidget *button_create; - GtkWidget *button_cancel; + GtkWidget *button_back; GtkWidget *image_type; GtkWidget *label_name; @@ -136,7 +136,7 @@ static void accounts_dialog_entry_name_changed_cb (GtkWidget GossipAccountsDialog *dialog); static void accounts_dialog_button_create_clicked_cb (GtkWidget *button, GossipAccountsDialog *dialog); -static void accounts_dialog_button_cancel_clicked_cb (GtkWidget *button, +static void accounts_dialog_button_back_clicked_cb (GtkWidget *button, GossipAccountsDialog *dialog); static void accounts_dialog_button_connect_clicked_cb (GtkWidget *button, GossipAccountsDialog *dialog); @@ -779,8 +779,8 @@ accounts_dialog_button_create_clicked_cb (GtkWidget *button, } static void -accounts_dialog_button_cancel_clicked_cb (GtkWidget *button, - GossipAccountsDialog *dialog) +accounts_dialog_button_back_clicked_cb (GtkWidget *button, + GossipAccountsDialog *dialog) { McAccount *account; @@ -969,7 +969,7 @@ gossip_accounts_dialog_show (void) "entry_name", &dialog->entry_name, "table_new_account", &dialog->table_new_account, "button_create", &dialog->button_create, - "button_cancel", &dialog->button_cancel, + "button_back", &dialog->button_back, "image_type", &dialog->image_type, "label_type", &dialog->label_type, "label_name", &dialog->label_name, @@ -983,7 +983,7 @@ gossip_accounts_dialog_show (void) "accounts_dialog", "destroy", accounts_dialog_destroy_cb, "accounts_dialog", "response", accounts_dialog_response_cb, "button_create", "clicked", accounts_dialog_button_create_clicked_cb, - "button_cancel", "clicked", accounts_dialog_button_cancel_clicked_cb, + "button_back", "clicked", accounts_dialog_button_back_clicked_cb, "entry_name", "changed", accounts_dialog_entry_name_changed_cb, "treeview", "row-activated", accounts_dialog_treeview_row_activated_cb, "button_connect", "clicked", accounts_dialog_button_connect_clicked_cb, diff --git a/libempathy-gtk/gossip-accounts-dialog.glade b/libempathy-gtk/gossip-accounts-dialog.glade index c3e12c9c..58c94e69 100644 --- a/libempathy-gtk/gossip-accounts-dialog.glade +++ b/libempathy-gtk/gossip-accounts-dialog.glade @@ -225,28 +225,21 @@ 6 - + True - Jabber - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 + gtk-cut + 6 + 0.5 + 0 0 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - 0 - 1 + 1 + 2 0 - 1 + 2 + @@ -279,21 +272,28 @@ - + True - gtk-cut - 6 - 0.5 - 0 + Jabber + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 0 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 - 1 - 2 + 0 + 1 0 - 2 - + 1 @@ -435,9 +435,9 @@ 6 - + True - _Name: + _Type: True False GTK_JUSTIFY_LEFT @@ -447,7 +447,6 @@ 0.5 0 0 - entry_name PANGO_ELLIPSIZE_NONE -1 False @@ -456,17 +455,17 @@ 0 1 - 1 - 2 + 0 + 1 - + True - _Type: + _Name: True False GTK_JUSTIFY_LEFT @@ -476,6 +475,7 @@ 0.5 0 0 + entry_name PANGO_ELLIPSIZE_NONE -1 False @@ -484,45 +484,31 @@ 0 1 - 0 - 1 + 1 + 2 - + True - False - 6 - - - - True - A unique name for this account to identify it personally to you. - True - True - True - 0 - - True - * - False - - - 0 - True - True - - + A unique name for this account to identify it personally to you. + True + True + True + 0 + + True + * + False 1 2 1 2 - @@ -540,23 +526,6 @@ False 6 - - - True - True - gtk-cancel - True - GTK_RELIEF_NORMAL - True - - - 0 - False - False - GTK_PACK_END - - - True @@ -566,7 +535,7 @@ True - + True 0.5 0.5 @@ -578,13 +547,13 @@ 0 - + True False 2 - + True gtk-new 4 @@ -601,9 +570,9 @@ - + True - Cr_eate! + Cr_eate True False GTK_JUSTIFY_LEFT @@ -636,6 +605,23 @@ GTK_PACK_END + + + + True + True + gtk-go-back + True + GTK_RELIEF_NORMAL + True + + + 0 + False + False + GTK_PACK_END + + 0 diff --git a/libempathy-gtk/gossip-chat.glade b/libempathy-gtk/gossip-chat.glade index e8bd47cf..d07bf77e 100644 --- a/libempathy-gtk/gossip-chat.glade +++ b/libempathy-gtk/gossip-chat.glade @@ -2,7 +2,6 @@ - Chat diff --git a/pixmaps/Makefile.am b/pixmaps/Makefile.am index 11df65cf..6143ddc2 100644 --- a/pixmaps/Makefile.am +++ b/pixmaps/Makefile.am @@ -15,12 +15,14 @@ image_DATA = \ gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor -install-data-hook: +install-data-hook: update-icon-cache +uninstall-hook: update-icon-cache +update-icon-cache: @-if test -z "$(DESTDIR)"; then \ echo "Updating Gtk icon cache."; \ $(gtk_update_icon_cache); \ else \ - echo "*** Icon cache not updated. After install, run this:"; \ + echo "*** Icon cache not updated. After (un)install, run this:"; \ echo "*** $(gtk_update_icon_cache)"; \ fi