]> git.0d.be Git - empathy.git/commitdiff
projects / empathy.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: aba79de)
[darcs-to-svn @ Sync last things from gossip. Up to date with gossip SVN revision...
authorXavier Claessens <xclaesse@src.gnome.org>
Tue, 1 May 2007 15:42:09 +0000 (15:42 +0000)
committerXavier Claessens <xclaesse@src.gnome.org>
Tue, 1 May 2007 15:42:09 +0000 (15:42 +0000)
svn path=/trunk/; revision=17

libempathy-gtk/gossip-account-widget-jabber.glade patch | blob | history
libempathy-gtk/gossip-accounts-dialog.c patch | blob | history
libempathy-gtk/gossip-accounts-dialog.glade patch | blob | history
libempathy-gtk/gossip-chat.glade patch | blob | history
pixmaps/Makefile.am patch | blob | history

diff --git a/libempathy-gtk/gossip-account-widget-jabber.glade b/libempathy-gtk/gossip-account-widget-jabber.glade
index 24f3b71b067276e46e1b99371d2a165704944749..cbb79caf5ef406daf4fc096d0283beaaf9cd0303 100644 (file)
--- a/libempathy-gtk/gossip-account-widget-jabber.glade
+++ b/libempathy-gtk/gossip-account-widget-jabber.glade
@@ -2,7 +2,6 @@
 <!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
 
 <glade-interface>
 <!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
 
 <glade-interface>
-<requires lib="gnome"/>
 
 <widget class="GtkWindow" id="account_jabber_settings">
   <property name="visible">True</property>
 
 <widget class="GtkWindow" id="account_jabber_settings">
   <property name="visible">True</property>
diff --git a/libempathy-gtk/gossip-accounts-dialog.c b/libempathy-gtk/gossip-accounts-dialog.c
index c4aa020b2180a1084751912fb0959353a45dcb7e..ad9f7976576c422386c37b2fdbe60cf7170aab68 100644 (file)
--- 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        *entry_name;
        GtkWidget        *table_new_account;
        GtkWidget        *button_create;
-       GtkWidget        *button_cancel;
+       GtkWidget        *button_back;
 
        GtkWidget        *image_type;
        GtkWidget        *label_name;
 
        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);
                                                             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);
                                                             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
 }
 
 static void
-accounts_dialog_button_cancel_clicked_cb (GtkWidget             *button,
-                                         GossipAccountsDialog  *dialog)
+accounts_dialog_button_back_clicked_cb (GtkWidget             *button,
+                                       GossipAccountsDialog  *dialog)
 {
        McAccount *account;
 
 {
        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,
                                       "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,
                                       "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,
                              "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,
                              "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 c3e12c9c1ba906e1520f1486ce57b908babaa3b3..58c94e694953b8e867cf6721e6c585149dac1155 100644 (file)
--- a/libempathy-gtk/gossip-accounts-dialog.glade
+++ b/libempathy-gtk/gossip-accounts-dialog.glade
@@ -225,28 +225,21 @@
                                  <property name="column_spacing">6</property>
 
                                  <child>
                                  <property name="column_spacing">6</property>
 
                                  <child>
-                                   <widget class="GtkLabel" id="label_type">
+                                   <widget class="GtkImage" id="image_type">
                                      <property name="visible">True</property>
                                      <property name="visible">True</property>
-                                     <property name="label" translatable="yes">Jabber</property>
-                                     <property name="use_underline">False</property>
-                                     <property name="use_markup">False</property>
-                                     <property name="justify">GTK_JUSTIFY_LEFT</property>
-                                     <property name="wrap">False</property>
-                                     <property name="selectable">False</property>
-                                     <property name="xalign">0</property>
-                                     <property name="yalign">0.5</property>
+                                     <property name="stock">gtk-cut</property>
+                                     <property name="icon_size">6</property>
+                                     <property name="xalign">0.5</property>
+                                     <property name="yalign">0</property>
                                      <property name="xpad">0</property>
                                      <property name="ypad">0</property>
                                      <property name="xpad">0</property>
                                      <property name="ypad">0</property>
-                                     <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                                     <property name="width_chars">-1</property>
-                                     <property name="single_line_mode">False</property>
-                                     <property name="angle">0</property>
                                    </widget>
                                    <packing>
                                    </widget>
                                    <packing>
-                                     <property name="left_attach">0</property>
-                                     <property name="right_attach">1</property>
+                                     <property name="left_attach">1</property>
+                                     <property name="right_attach">2</property>
                                      <property name="top_attach">0</property>
                                      <property name="top_attach">0</property>
-                                     <property name="bottom_attach">1</property>
+                                     <property name="bottom_attach">2</property>
+                                     <property name="x_options"></property>
                                      <property name="y_options"></property>
                                    </packing>
                                  </child>
                                      <property name="y_options"></property>
                                    </packing>
                                  </child>
@@ -279,21 +272,28 @@
                                  </child>
 
                                  <child>
                                  </child>
 
                                  <child>
-                                   <widget class="GtkImage" id="image_type">
+                                   <widget class="GtkLabel" id="label_type">
                                      <property name="visible">True</property>
                                      <property name="visible">True</property>
-                                     <property name="stock">gtk-cut</property>
-                                     <property name="icon_size">6</property>
-                                     <property name="xalign">0.5</property>
-                                     <property name="yalign">0</property>
+                                     <property name="label" translatable="yes">Jabber</property>
+                                     <property name="use_underline">False</property>
+                                     <property name="use_markup">False</property>
+                                     <property name="justify">GTK_JUSTIFY_LEFT</property>
+                                     <property name="wrap">False</property>
+                                     <property name="selectable">False</property>
+                                     <property name="xalign">0</property>
+                                     <property name="yalign">0.5</property>
                                      <property name="xpad">0</property>
                                      <property name="ypad">0</property>
                                      <property name="xpad">0</property>
                                      <property name="ypad">0</property>
+                                     <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                                     <property name="width_chars">-1</property>
+                                     <property name="single_line_mode">False</property>
+                                     <property name="angle">0</property>
                                    </widget>
                                    <packing>
                                    </widget>
                                    <packing>
-                                     <property name="left_attach">1</property>
-                                     <property name="right_attach">2</property>
+                                     <property name="left_attach">0</property>
+                                     <property name="right_attach">1</property>
                                      <property name="top_attach">0</property>
                                      <property name="top_attach">0</property>
-                                     <property name="bottom_attach">2</property>
-                                     <property name="x_options"></property>
+                                     <property name="bottom_attach">1</property>
                                      <property name="y_options"></property>
                                    </packing>
                                  </child>
                                      <property name="y_options"></property>
                                    </packing>
                                  </child>
@@ -435,9 +435,9 @@
                              <property name="column_spacing">6</property>
 
                              <child>
                              <property name="column_spacing">6</property>
 
                              <child>
-                               <widget class="GtkLabel" id="label638">
+                               <widget class="GtkLabel" id="label640">
                                  <property name="visible">True</property>
                                  <property name="visible">True</property>
-                                 <property name="label" translatable="yes">_Name:</property>
+                                 <property name="label" translatable="yes">_Type:</property>
                                  <property name="use_underline">True</property>
                                  <property name="use_markup">False</property>
                                  <property name="justify">GTK_JUSTIFY_LEFT</property>
                                  <property name="use_underline">True</property>
                                  <property name="use_markup">False</property>
                                  <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -447,7 +447,6 @@
                                  <property name="yalign">0.5</property>
                                  <property name="xpad">0</property>
                                  <property name="ypad">0</property>
                                  <property name="yalign">0.5</property>
                                  <property name="xpad">0</property>
                                  <property name="ypad">0</property>
-                                 <property name="mnemonic_widget">entry_name</property>
                                  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
                                  <property name="width_chars">-1</property>
                                  <property name="single_line_mode">False</property>
                                  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
                                  <property name="width_chars">-1</property>
                                  <property name="single_line_mode">False</property>
@@ -456,17 +455,17 @@
                                <packing>
                                  <property name="left_attach">0</property>
                                  <property name="right_attach">1</property>
                                <packing>
                                  <property name="left_attach">0</property>
                                  <property name="right_attach">1</property>
-                                 <property name="top_attach">1</property>
-                                 <property name="bottom_attach">2</property>
+                                 <property name="top_attach">0</property>
+                                 <property name="bottom_attach">1</property>
                                  <property name="x_options"></property>
                                  <property name="y_options"></property>
                                </packing>
                              </child>
 
                              <child>
                                  <property name="x_options"></property>
                                  <property name="y_options"></property>
                                </packing>
                              </child>
 
                              <child>
-                               <widget class="GtkLabel" id="label640">
+                               <widget class="GtkLabel" id="label638">
                                  <property name="visible">True</property>
                                  <property name="visible">True</property>
-                                 <property name="label" translatable="yes">_Type:</property>
+                                 <property name="label" translatable="yes">_Name:</property>
                                  <property name="use_underline">True</property>
                                  <property name="use_markup">False</property>
                                  <property name="justify">GTK_JUSTIFY_LEFT</property>
                                  <property name="use_underline">True</property>
                                  <property name="use_markup">False</property>
                                  <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -476,6 +475,7 @@
                                  <property name="yalign">0.5</property>
                                  <property name="xpad">0</property>
                                  <property name="ypad">0</property>
                                  <property name="yalign">0.5</property>
                                  <property name="xpad">0</property>
                                  <property name="ypad">0</property>
+                                 <property name="mnemonic_widget">entry_name</property>
                                  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
                                  <property name="width_chars">-1</property>
                                  <property name="single_line_mode">False</property>
                                  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
                                  <property name="width_chars">-1</property>
                                  <property name="single_line_mode">False</property>
@@ -484,45 +484,31 @@
                                <packing>
                                  <property name="left_attach">0</property>
                                  <property name="right_attach">1</property>
                                <packing>
                                  <property name="left_attach">0</property>
                                  <property name="right_attach">1</property>
-                                 <property name="top_attach">0</property>
-                                 <property name="bottom_attach">1</property>
+                                 <property name="top_attach">1</property>
+                                 <property name="bottom_attach">2</property>
                                  <property name="x_options"></property>
                                  <property name="y_options"></property>
                                </packing>
                              </child>
 
                              <child>
                                  <property name="x_options"></property>
                                  <property name="y_options"></property>
                                </packing>
                              </child>
 
                              <child>
-                               <widget class="GtkHBox" id="hbox180">
+                               <widget class="GtkEntry" id="entry_name">
                                  <property name="visible">True</property>
                                  <property name="visible">True</property>
-                                 <property name="homogeneous">False</property>
-                                 <property name="spacing">6</property>
-
-                                 <child>
-                                   <widget class="GtkEntry" id="entry_name">
-                                     <property name="visible">True</property>
-                                     <property name="tooltip" translatable="yes">A unique name for this account to identify it personally to you.</property>
-                                     <property name="can_focus">True</property>
-                                     <property name="editable">True</property>
-                                     <property name="visibility">True</property>
-                                     <property name="max_length">0</property>
-                                     <property name="text" translatable="yes"></property>
-                                     <property name="has_frame">True</property>
-                                     <property name="invisible_char">*</property>
-                                     <property name="activates_default">False</property>
-                                   </widget>
-                                   <packing>
-                                     <property name="padding">0</property>
-                                     <property name="expand">True</property>
-                                     <property name="fill">True</property>
-                                   </packing>
-                                 </child>
+                                 <property name="tooltip" translatable="yes">A unique name for this account to identify it personally to you.</property>
+                                 <property name="can_focus">True</property>
+                                 <property name="editable">True</property>
+                                 <property name="visibility">True</property>
+                                 <property name="max_length">0</property>
+                                 <property name="text" translatable="yes"></property>
+                                 <property name="has_frame">True</property>
+                                 <property name="invisible_char">*</property>
+                                 <property name="activates_default">False</property>
                                </widget>
                                <packing>
                                  <property name="left_attach">1</property>
                                  <property name="right_attach">2</property>
                                  <property name="top_attach">1</property>
                                  <property name="bottom_attach">2</property>
                                </widget>
                                <packing>
                                  <property name="left_attach">1</property>
                                  <property name="right_attach">2</property>
                                  <property name="top_attach">1</property>
                                  <property name="bottom_attach">2</property>
-                                 <property name="x_options"></property>
                                  <property name="y_options"></property>
                                </packing>
                              </child>
                                  <property name="y_options"></property>
                                </packing>
                              </child>
@@ -540,23 +526,6 @@
                              <property name="homogeneous">False</property>
                              <property name="spacing">6</property>
 
                              <property name="homogeneous">False</property>
                              <property name="spacing">6</property>
 
-                             <child>
-                               <widget class="GtkButton" id="button_cancel">
-                                 <property name="visible">True</property>
-                                 <property name="can_focus">True</property>
-                                 <property name="label">gtk-cancel</property>
-                                 <property name="use_stock">True</property>
-                                 <property name="relief">GTK_RELIEF_NORMAL</property>
-                                 <property name="focus_on_click">True</property>
-                               </widget>
-                               <packing>
-                                 <property name="padding">0</property>
-                                 <property name="expand">False</property>
-                                 <property name="fill">False</property>
-                                 <property name="pack_type">GTK_PACK_END</property>
-                               </packing>
-                             </child>
-
                              <child>
                                <widget class="GtkButton" id="button_create">
                                  <property name="visible">True</property>
                              <child>
                                <widget class="GtkButton" id="button_create">
                                  <property name="visible">True</property>
@@ -566,7 +535,7 @@
                                  <property name="focus_on_click">True</property>
 
                                  <child>
                                  <property name="focus_on_click">True</property>
 
                                  <child>
-                                   <widget class="GtkAlignment" id="alignment30">
+                                   <widget class="GtkAlignment" id="alignment1">
                                      <property name="visible">True</property>
                                      <property name="xalign">0.5</property>
                                      <property name="yalign">0.5</property>
                                      <property name="visible">True</property>
                                      <property name="xalign">0.5</property>
                                      <property name="yalign">0.5</property>
@@ -578,13 +547,13 @@
                                      <property name="right_padding">0</property>
 
                                      <child>
                                      <property name="right_padding">0</property>
 
                                      <child>
-                                       <widget class="GtkHBox" id="hbox181">
+                                       <widget class="GtkHBox" id="hbox1">
                                          <property name="visible">True</property>
                                          <property name="homogeneous">False</property>
                                          <property name="spacing">2</property>
 
                                          <child>
                                          <property name="visible">True</property>
                                          <property name="homogeneous">False</property>
                                          <property name="spacing">2</property>
 
                                          <child>
-                                           <widget class="GtkImage" id="image838">
+                                           <widget class="GtkImage" id="image1">
                                              <property name="visible">True</property>
                                              <property name="stock">gtk-new</property>
                                              <property name="icon_size">4</property>
                                              <property name="visible">True</property>
                                              <property name="stock">gtk-new</property>
                                              <property name="icon_size">4</property>
@@ -601,9 +570,9 @@
                                          </child>
 
                                          <child>
                                          </child>
 
                                          <child>
-                                           <widget class="GtkLabel" id="label642">
+                                           <widget class="GtkLabel" id="label1">
                                              <property name="visible">True</property>
                                              <property name="visible">True</property>
-                                             <property name="label" translatable="yes">Cr_eate!</property>
+                                             <property name="label" translatable="yes">Cr_eate</property>
                                              <property name="use_underline">True</property>
                                              <property name="use_markup">False</property>
                                              <property name="justify">GTK_JUSTIFY_LEFT</property>
                                              <property name="use_underline">True</property>
                                              <property name="use_markup">False</property>
                                              <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -636,6 +605,23 @@
                                  <property name="pack_type">GTK_PACK_END</property>
                                </packing>
                              </child>
                                  <property name="pack_type">GTK_PACK_END</property>
                                </packing>
                              </child>
+
+                             <child>
+                               <widget class="GtkButton" id="button_back">
+                                 <property name="visible">True</property>
+                                 <property name="can_focus">True</property>
+                                 <property name="label">gtk-go-back</property>
+                                 <property name="use_stock">True</property>
+                                 <property name="relief">GTK_RELIEF_NORMAL</property>
+                                 <property name="focus_on_click">True</property>
+                               </widget>
+                               <packing>
+                                 <property name="padding">0</property>
+                                 <property name="expand">False</property>
+                                 <property name="fill">False</property>
+                                 <property name="pack_type">GTK_PACK_END</property>
+                               </packing>
+                             </child>
                            </widget>
                            <packing>
                              <property name="padding">0</property>
                            </widget>
                            <packing>
                              <property name="padding">0</property>
diff --git a/libempathy-gtk/gossip-chat.glade b/libempathy-gtk/gossip-chat.glade
index e8bd47cfe5d7b5d392f5a9dab904576ff3d939d2..d07bf77e6f21269a09287681cb94270d6c2da842 100644 (file)
--- a/libempathy-gtk/gossip-chat.glade
+++ b/libempathy-gtk/gossip-chat.glade
@@ -2,7 +2,6 @@
 <!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
 
 <glade-interface>
 <!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
 
 <glade-interface>
-<requires lib="gnome"/>
 
 <widget class="GtkWindow" id="chat_page_window">
   <property name="title" translatable="yes">Chat</property>
 
 <widget class="GtkWindow" id="chat_page_window">
   <property name="title" translatable="yes">Chat</property>
diff --git a/pixmaps/Makefile.am b/pixmaps/Makefile.am
index 11df65cf9237f7b11aba68a2014b970c08183d34..6143ddc2e887224296fa1dab9f1ec7df67b9ca83 100644 (file)
--- 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
 
 
 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 \
        @-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
 
                echo "***   $(gtk_update_icon_cache)"; \
        fi
 
Fork of git.gnome.org/browse/empathy (was not supposed to be merged)