From 40af7bfc1ced89114a52d14aa0dca0b39cd509de Mon Sep 17 00:00:00 2001
From: Stephan Erb <steve-e@h3c.de>
Date: Fri, 11 Jan 2008 17:23:26 +0000
Subject: [PATCH] Do not mess up vcard window when there is no user avatar or
 when it is resized. Fixes #3674

---
 data/glade/vcard_information_window.glade | 36 +++++------------------
 src/vcard.py                              |  3 +-
 2 files changed, 9 insertions(+), 30 deletions(-)

diff --git a/data/glade/vcard_information_window.glade b/data/glade/vcard_information_window.glade
index 17685e322..dc4d1bacc 100644
--- a/data/glade/vcard_information_window.glade
+++ b/data/glade/vcard_information_window.glade
@@ -54,6 +54,7 @@
                                 <property name="xpad">5</property>
                                 <property name="ypad">5</property>
                                 <property name="selectable">True</property>
+                                <property name="ellipsize">PANGO_ELLIPSIZE_END</property>
                               </widget>
                             </child>
                           </widget>
@@ -218,8 +219,8 @@
                         <property name="visible">True</property>
                         <property name="spacing">6</property>
                         <child>
-                          <widget class="GtkLabel" id="label59">
-                            <property name="visible">True</property>
+                          <widget class="GtkLabel" id="user_avatar_label">
+                            <property name="no_show_all">True</property>
                             <property name="label" translatable="yes">User avatar:</property>
                           </widget>
                           <packing>
@@ -227,17 +228,6 @@
                             <property name="fill">False</property>
                           </packing>
                         </child>
-                        <child>
-                          <widget class="GtkLabel" id="no_user_avatar_label">
-                            <property name="no_show_all">True</property>
-                            <property name="label" translatable="yes">None</property>
-                          </widget>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">False</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
                         <child>
                           <widget class="GtkEventBox" id="PHOTO_eventbox">
                             <property name="visible">True</property>
@@ -254,7 +244,7 @@
                           <packing>
                             <property name="expand">False</property>
                             <property name="fill">False</property>
-                            <property name="position">2</property>
+                            <property name="position">1</property>
                           </packing>
                         </child>
                         <child>
@@ -265,7 +255,7 @@
                           <packing>
                             <property name="expand">False</property>
                             <property name="fill">False</property>
-                            <property name="position">3</property>
+                            <property name="position">2</property>
                           </packing>
                         </child>
                         <child>
@@ -277,11 +267,12 @@
                           <packing>
                             <property name="expand">False</property>
                             <property name="fill">False</property>
-                            <property name="position">4</property>
+                            <property name="position">3</property>
                           </packing>
                         </child>
                       </widget>
                       <packing>
+                        <property name="expand">False</property>
                         <property name="position">1</property>
                       </packing>
                     </child>
@@ -384,9 +375,6 @@
                   </packing>
                 </child>
               </widget>
-              <packing>
-                <property name="tab_expand">False</property>
-              </packing>
             </child>
             <child>
               <widget class="GtkLabel" id="label3">
@@ -397,7 +385,6 @@
               </widget>
               <packing>
                 <property name="type">tab</property>
-                <property name="tab_expand">False</property>
                 <property name="tab_fill">False</property>
               </packing>
             </child>
@@ -1014,7 +1001,6 @@
               </widget>
               <packing>
                 <property name="position">1</property>
-                <property name="tab_expand">False</property>
               </packing>
             </child>
             <child>
@@ -1027,7 +1013,6 @@
               <packing>
                 <property name="type">tab</property>
                 <property name="position">1</property>
-                <property name="tab_expand">False</property>
                 <property name="tab_fill">False</property>
               </packing>
             </child>
@@ -1459,7 +1444,6 @@
               </widget>
               <packing>
                 <property name="position">2</property>
-                <property name="tab_expand">False</property>
               </packing>
             </child>
             <child>
@@ -1472,7 +1456,6 @@
               <packing>
                 <property name="type">tab</property>
                 <property name="position">2</property>
-                <property name="tab_expand">False</property>
                 <property name="tab_fill">False</property>
               </packing>
             </child>
@@ -1497,7 +1480,6 @@
               </widget>
               <packing>
                 <property name="position">3</property>
-                <property name="tab_expand">False</property>
               </packing>
             </child>
             <child>
@@ -1510,7 +1492,6 @@
               <packing>
                 <property name="type">tab</property>
                 <property name="position">3</property>
-                <property name="tab_expand">False</property>
                 <property name="tab_fill">False</property>
               </packing>
             </child>
@@ -1533,7 +1514,6 @@
               </widget>
               <packing>
                 <property name="position">4</property>
-                <property name="tab_expand">False</property>
               </packing>
             </child>
             <child>
@@ -1544,7 +1524,6 @@
               <packing>
                 <property name="type">tab</property>
                 <property name="position">4</property>
-                <property name="tab_expand">False</property>
                 <property name="tab_fill">False</property>
               </packing>
             </child>
@@ -1588,6 +1567,7 @@
             </child>
           </widget>
           <packing>
+            <property name="expand">False</property>
             <property name="position">2</property>
           </packing>
         </child>
diff --git a/src/vcard.py b/src/vcard.py
index 4784d9f0d..b6fcc3695 100644
--- a/src/vcard.py
+++ b/src/vcard.py
@@ -178,8 +178,6 @@ class VcardWindow:
 			pass
 
 	def set_values(self, vcard):
-		if not 'PHOTO' in vcard:
-			self.xml.get_widget('no_user_avatar_label').show()
 		for i in vcard.keys():
 			if i == 'PHOTO' and self.xml.get_widget('information_notebook').\
 			get_n_pages() > 4:
@@ -187,6 +185,7 @@ class VcardWindow:
 					get_avatar_pixbuf_encoded_mime(vcard[i])
 				image = self.xml.get_widget('PHOTO_image')
 				image.show()
+				self.xml.get_widget('user_avatar_label').show()
 				if not pixbuf:
 					image.set_from_icon_name('stock_person',
 						gtk.ICON_SIZE_DIALOG)