Fix response and action buttons.

2007-06-06 Xavier Claessens  <xclaesse@gmail.com>

	* libempathy-gtk/empathy-contact-dialogs.glade:
	* libempathy-gtk/empathy-contact-dialogs.c: Fix response and action
	buttons.

svn path=/trunk/; revision=129

diff --git a/ChangeLog b/ChangeLog
index 8d91a13d526b98befa25c44361132c7b41df7d49..3b886782af0d7f58ae8b7327aae0d0b6b62ab3ba 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-06-06 Xavier Claessens  <xclaesse@gmail.com>
+
+       * libempathy-gtk/empathy-contact-dialogs.glade:
+       * libempathy-gtk/empathy-contact-dialogs.c: Fix response and action
+       buttons.
+

 2007-06-06 Xavier Claessens  <xclaesse@gmail.com>
 
        * libempathy-gtk/empathy-contact-dialogs.glade:
 2007-06-06 Xavier Claessens  <xclaesse@gmail.com>
 
        * libempathy-gtk/empathy-contact-dialogs.glade:

diff --git a/libempathy-gtk/empathy-contact-dialogs.c b/libempathy-gtk/empathy-contact-dialogs.c
index 8f377d02d717eb57df58bc69121afbe3a6f62c91..e38eb84d14def838824c980b41cbd687cbaf04b2 100644 (file)
--- a/libempathy-gtk/empathy-contact-dialogs.c
+++ b/libempathy-gtk/empathy-contact-dialogs.c
@@ -131,7 +131,10 @@ contact_information_response_cb (GtkDialog *dialog,
        GossipContact *contact;
 
        contact = empathy_contact_widget_get_contact (contact_widget);
        GossipContact *contact;
 
        contact = empathy_contact_widget_get_contact (contact_widget);

-       empathy_contact_widget_save (contact_widget);
+
+       if (response == GTK_RESPONSE_OK) {
+               empathy_contact_widget_save (contact_widget);
+       }

 
        g_hash_table_remove (information_dialogs, contact);
 }
 
        g_hash_table_remove (information_dialogs, contact);
 }

diff --git a/libempathy-gtk/empathy-contact-dialogs.glade b/libempathy-gtk/empathy-contact-dialogs.glade
index 4758442677ac659e6c35869e2fdcdd0478f001cb..f8a441057b93d6398aa01e70b33ea98748af4b30 100644 (file)
--- a/libempathy-gtk/empathy-contact-dialogs.glade
+++ b/libempathy-gtk/empathy-contact-dialogs.glade
@@ -49,73 +49,11 @@
              <property name="visible">True</property>
              <property name="can_default">True</property>
              <property name="can_focus">True</property>
              <property name="visible">True</property>
              <property name="can_default">True</property>
              <property name="can_focus">True</property>

+             <property name="label">gtk-no</property>
+             <property name="use_stock">True</property>

              <property name="relief">GTK_RELIEF_NORMAL</property>
              <property name="focus_on_click">True</property>
              <property name="response_id">-9</property>
              <property name="relief">GTK_RELIEF_NORMAL</property>
              <property name="focus_on_click">True</property>
              <property name="response_id">-9</property>

-
-             <child>
-               <widget class="GtkAlignment" id="alignment3">
-                 <property name="visible">True</property>
-                 <property name="xalign">0.5</property>
-                 <property name="yalign">0.5</property>
-                 <property name="xscale">0</property>
-                 <property name="yscale">0</property>
-                 <property name="top_padding">0</property>
-                 <property name="bottom_padding">0</property>
-                 <property name="left_padding">0</property>
-                 <property name="right_padding">0</property>
-
-                 <child>
-                   <widget class="GtkHBox" id="hbox48">
-                     <property name="visible">True</property>
-                     <property name="homogeneous">False</property>
-                     <property name="spacing">2</property>
-
-                     <child>
-                       <widget class="GtkImage" id="image8">
-                         <property name="visible">True</property>
-                         <property name="stock">gtk-no</property>
-                         <property name="icon_size">4</property>
-                         <property name="xalign">0.5</property>
-                         <property name="yalign">0.5</property>
-                         <property name="xpad">0</property>
-                         <property name="ypad">0</property>
-                       </widget>
-                       <packing>
-                         <property name="padding">0</property>
-                         <property name="expand">False</property>
-                         <property name="fill">False</property>
-                       </packing>
-                     </child>
-
-                     <child>
-                       <widget class="GtkLabel" id="label218">
-                         <property name="visible">True</property>
-                         <property name="label" translatable="yes">_Deny</property>
-                         <property name="use_underline">True</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.5</property>
-                         <property name="yalign">0.5</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>
-                         <property name="padding">0</property>
-                         <property name="expand">False</property>
-                         <property name="fill">False</property>
-                       </packing>
-                     </child>
-                   </widget>
-                 </child>
-               </widget>
-             </child>

            </widget>
          </child>
 
            </widget>
          </child>
 


@@ -125,11 +63,11 @@
              <property name="can_default">True</property>
              <property name="has_default">True</property>
              <property name="can_focus">True</property>
              <property name="can_default">True</property>
              <property name="has_default">True</property>
              <property name="can_focus">True</property>

-             <property name="label">gtk-cancel</property>
+             <property name="label">gtk-yes</property>

              <property name="use_stock">True</property>
              <property name="relief">GTK_RELIEF_NORMAL</property>
              <property name="focus_on_click">True</property>
              <property name="use_stock">True</property>
              <property name="relief">GTK_RELIEF_NORMAL</property>
              <property name="focus_on_click">True</property>

-             <property name="response_id">-6</property>
+             <property name="response_id">-8</property>

            </widget>
          </child>
        </widget>
            </widget>
          </child>
        </widget>