changeset 913:4fbe6bd78021 trunk

[svn] - aosd: small changes
author giacomo
date Wed, 04 Apr 2007 10:53:50 -0700
parents 5bd17596c7e9
children d12d27887bf0
files ChangeLog src/aosd/aosd_ui.c
diffstat 2 files changed, 18 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Wed Apr 04 10:52:15 2007 -0700
+++ b/ChangeLog	Wed Apr 04 10:53:50 2007 -0700
@@ -1,3 +1,15 @@
+2007-04-04 17:52:15 +0000  William Pitcock <nenolod@sacredspiral.co.uk>
+  revision [1924]
+  - patches from upstream TTA author. see http://boards.nenolod.net/viewtopic.php?t=375
+  
+  trunk/src/tta/aud-tta.c   |    7 +++----
+  trunk/src/tta/crc32.h     |    4 ++--
+  trunk/src/tta/ttadec.c    |    8 ++++----
+  trunk/src/tta/ttadec.h    |    8 +-------
+  trunk/src/tta/ttaid3tag.h |    3 +--
+  5 files changed, 11 insertions(+), 19 deletions(-)
+
+
 2007-04-04 14:48:53 +0000  Giacomo Lozito <james@develia.org>
   revision [1922]
   - aosd: added support to detect whether a composite manager is running (either standard with _NET_WM_CM_Sn or xcompmgr)
--- a/src/aosd/aosd_ui.c	Wed Apr 04 10:52:15 2007 -0700
+++ b/src/aosd/aosd_ui.c	Wed Apr 04 10:53:50 2007 -0700
@@ -784,6 +784,7 @@
 }
 
 
+#ifdef HAVE_XCOMPOSITE
 static void
 aosd_cb_configure_misc_transp_real_clicked ( GtkToggleButton * real_rbt , gpointer status_hbox )
 {
@@ -808,12 +809,13 @@
   }
   else
   {
-    gtk_image_clear( GTK_IMAGE(img) );
+    gtk_image_set_from_stock( GTK_IMAGE(img) , GTK_STOCK_DIALOG_INFO , GTK_ICON_SIZE_MENU );
     gtk_label_set_text( GTK_LABEL(label) , _("Composite manager not required for fake transparency") );
     gtk_widget_set_sensitive( GTK_WIDGET(status_hbox) , FALSE );
   }
   return;
 }
+#endif
 
 
 static void
@@ -877,11 +879,11 @@
   gtk_box_pack_start( GTK_BOX(mis_transp_status_hbox) , mis_transp_status_label , TRUE , TRUE , 0 );
   g_object_set_data( G_OBJECT(mis_transp_status_hbox) , "img" , mis_transp_status_img );
   g_object_set_data( G_OBJECT(mis_transp_status_hbox) , "label" , mis_transp_status_label );
-  
+                     
+#ifdef HAVE_XCOMPOSITE
   g_signal_connect( G_OBJECT(mis_transp_real_rbt) , "toggled" ,
     G_CALLBACK(aosd_cb_configure_misc_transp_real_clicked) , mis_transp_status_hbox );
-                     
-#ifdef HAVE_XCOMPOSITE
+  
   /* check if the composite extension is loaded */
   if ( aosd_osd_check_composite_ext() )
   {