Check-in [0e35f0e27e]
Not logged in

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview

SHA1 Hash:0e35f0e27ede993209a9d961e8c6c5c64ed0d081
Date: 2012-02-22 10:09:09
User: BarryK
Comment:desktop drive icons redrawing everytime X starts, fixed /sbin/clean_desk_icons

Tags And Properties
Changes

Changes to woof-code/rootfs-skeleton/sbin/clean_desk_icons

@@ -3,10 +3,11 @@
 #v410 remove icons when drives removed.
 #v410 omit icon if optical drive; defer it to pup_event_frontend_d
 #w014 bugfix, refresh icons if removable drive swapped when PC turned off.
 #120131 rodin.s: internationalized. See warning about "Size:" translation.
 #120213 /var/local/pup_event_icon_change_flag path changed from /tmp.
+#120222 internationalization introduced bug, fixed it (caused drive icons to redraw every time X starts).
 
 # i18n gettext
 TEXTDOMAIN=clean_desk_icons
 export TEXTDOMAIN
 . /usr/bin/gettext.sh
@@ -59,16 +60,18 @@
     MEDIACAT="`cat /proc/ide/${ONEDRV}/media`"
     [ "$MEDIACAT" = "cdrom" ] && continue #v410 omit icon if optical drive; defer it to pup_event_frontend_d
    fi
    #w014 user may have swapped removable drives while pc turned off...
 
-   LANG="`cat /etc/profile|grep '^LANG='`"
-   eval $LANG
-   T_size="`gettext \"Size:\"`"  #*WARNING* translation must be same as in /sbin/pup_event_frontend_d create_icon_func()
-   LANG=C
-
-   DRVMODEL1="`grep -o '<Summary>.*${T_Size:}' /root/.pup_event/drive_${ONEDRV}/AppInfo.xml | cut -f 2-20 -d ' ' | rev | cut -f 2-20 -d ' ' | rev`"
+   #LANG="`cat /etc/profile|grep '^LANG='`"
+   #eval $LANG
+   #T_size="`gettext \"Size:\"`"  #*WARNING* translation must be same as in /sbin/pup_event_frontend_d create_icon_func()
+   #LANG=C
+   #120222 internationalization introduced bug, fix it...
+   #DRVMODEL1="`grep -o "<Summary>.*${T_size}" /root/.pup_event/drive_${ONEDRV}/AppInfo.xml | cut -f 2-20 -d ' ' | rev | cut -f 2-20 -d ' ' | rev`"
+   #120222 above is fixed, however go one step further and eliminate dependency on the translation of "Size:"...
+   DRVMODEL1="`grep -o '<Summary>.*</Summary>' /root/.pup_event/drive_${ONEDRV}/AppInfo.xml | cut -f 2-9 -d ':' | cut -f 1 -d '<' | tr -s ' ' | rev | cut -f 3-99 -d ' ' | rev | sed -e 's%^ %%'`"
    #note, this must be same as done in /sbin/probedisk2...
    DRVMODEL2="`cat /sys/block/$ONEDRV/device/vendor | tr -s ' '``cat /sys/block/${ONEDRV}/device/model | tr -s ' '`"
    if [ "$DRVMODEL1" != "$DRVMODEL2" ];then
     rm -rf /root/.pup_event/drive_${ONEDRV}* 2>/dev/null
     continue

Changes to woof-code/rootfs-skeleton/usr/local/simple_network_setup/sns

@@ -21,10 +21,11 @@
 #101118 bugfix, so network-disconnect works.
 #110203 improve scanning.
 #110505 support sudo for non-root user.
 #120107 gtkdialog3 to gtkdialog4, new 'Profile' frame in main window, new profiles help window.
 #120204 rodin.s: internationalized.
+#120222 small change to 'connect now' button.
 
 export TEXTDOMAIN=sns___sns
 export OUTPUT_CHARSET=UTF-8
 . gettext.sh
 
@@ -198,11 +199,11 @@
   echo "<button><label>${CNT}</label><action>grep -v '${ONECONNECTION}' /etc/simple_network_setup/connections > /tmp/sns_action1</action><action>mv -f /tmp/sns_action1 /etc/simple_network_setup/connections</action><action type=\"exit\">EXITRESTART></action></button>" >> /tmp/sns_DEL_BTN
  done
  if [ "$FLAGINTERNETSTATUS" = "yes" ];then
   CONNECTBTN_XML="<button><label>$(gettext 'DISCONNECT NOW')</label><action>/usr/sbin/networkdisconnect</action><action type=\"exit\">EXITNOW</action></button>"
  else
-  CONNECTBTN_XML="<button><label>$(gettext 'CONNECT NOW')</label><action>/usr/sbin/networkdisconnect</action><action>/usr/local/simple_network_setup/rc.network start</action><action>sleep 1</action><action type=\"exit\">EXITNOW</action></button>"
+  CONNECTBTN_XML="<button><label>$(gettext 'CONNECT NOW')</label><action>/usr/sbin/networkdisconnect</action><action>/usr/local/simple_network_setup/rc.network start & </action><action>yaf-splash -timeout 2 -bg orange -close never -fontsize large -text \"Please wait...\"</action><action type=\"exit\">EXITNOW</action></button>"
  fi
  PROFILE_XML="<frame $(gettext 'Profiles')>
  <text><label>$(gettext 'Connection profiles have previously been created with SNS. These are:')</label></text>
  <hbox spacing=\"10\"><text use-markup=\"true\"><label>\"`cat /tmp/sns_CNT_P`\"</label></text><text use-markup=\"true\"><label>\"`cat /tmp/sns_I_P`\"</label></text><text use-markup=\"true\"><label>\"`cat /tmp/sns_T_P`\"</label></text><text use-markup=\"true\"><label>\"`cat /tmp/sns_D_P`\"</label></text><text use-markup=\"true\"><label>\"`cat /tmp/sns_B_P`\"</label></text><text use-markup=\"true\"><label>\"`cat /tmp/sns_M_P`\"</label></text><text use-markup=\"true\"><label>\"`cat /tmp/sns_S_P`\"</label></text><text use-markup=\"true\"><label>\"`cat /tmp/sns_SEC_P`\"</label></text></hbox>
  <hbox><text><label>$(gettext 'Delete:')</label></text>`cat /tmp/sns_DEL_BTN`

Changes to woof-distro/Packages-puppy-noarch-official

@@ -96,5 +96,6 @@
 wcpufreq-0.8|wcpufreq|0.8||System|53K||wcpufreq-0.8.pet||CPU Frequency Scaling Tool||||
 woo-ff-0.1.1|woo-ff|0.1.1||Multimedia|48K||woo-ff-0.1.1.pet|+ffmpeg,+gtkdialog3|woo-ff - multimedia converter||||
 xlock_gui-0.2-6|xlock_gui|0.2-6||Desktop|68K||xlock_gui-0.2-6.pet|+xlockmore|screen lock and screensaver||||
 you2pup-2.1.4-520|you2pup|2.1.4-520||Internet|60K||you2pup-2.1.4-520.pet|+gtkdialog3,+urxvt|You2pup YouTube downloader||||
 z_geany_bacon_hack-1.4|z_geany_bacon_hack|1.4||Document|40K||z_geany_bacon_hack-1.4.pet|+geany|temp hack for geany text editor for BaCon highlighting, stealing Freebasic category, created by big_bass||||
+zz_t2_fixup-20120222|zz_t2_fixup|20120222||BuildingBlock|304K||zz_t2_fixup-20120222.pet||hack to get t2 pkgs to build a puppy, mostly workarounds for xorg in /usr/X11R7||||

Changes to woof-distro/x86/Packages-puppy-wary5-official

@@ -1537,8 +1537,7 @@
 zip-30-w5c|zip|30-w5c||BuildingBlock|408K||zip-30-w5c.pet||PKZIP compatible compression and file packaging utility|puppy|wary5||
 zip_DOC-30-w5c|zip_DOC|30-w5c||BuildingBlock|120K||zip_DOC-30-w5c.pet||PKZIP compatible compression and file packaging utility|puppy|wary5||
 zlib-1.2.5-w5c|zlib|1.2.5-w5c||BuildingBlock|84K||zlib-1.2.5-w5c.pet||A general purpose ZIP data compression library|puppy|wary5||
 zlib_DEV-1.2.5-w5c|zlib_DEV|1.2.5-w5c||BuildingBlock|216K||zlib_DEV-1.2.5-w5c.pet|+zlib|A general purpose ZIP data compression library|puppy|wary5||
 zlib_DOC-1.2.5-w5c|zlib_DOC|1.2.5-w5c||BuildingBlock|148K||zlib_DOC-1.2.5-w5c.pet||A general purpose ZIP data compression library|puppy|wary5||
-zz_t2_fixup-20110910|zz_t2_fixup|20110910||BuildingBlock|304K||zz_t2_fixup-20110910.pet||hack to get t2 pkgs to build a puppy, mostly workarounds for xorg in /usr/X11R7||||
 zz_wary52_fixup-20111117|zz_wary52_fixup|20111117||BuildingBlock|128K||zz_wary52_fixup-20111117.pet||hacks for wary 5.2pre|puppy|wary5||
 zz_wary52_fixup_DEV-20111117|zz_wary52_fixup_DEV|20111117||BuildingBlock|128K||zz_wary52_fixup_DEV-20111117.pet||hacks for wary 5.2pre|puppy|wary5||

Changes to woof-distro/x86/racy/testing/DISTRO_PKGS_SPECS-puppy-wary5

@@ -735,9 +735,9 @@
 no|you2pup||exe,dev,doc,nls| #09oct2011, zigbert informs youtube.com format changed, pet broken.
 no|zfind||exe
 yes|z_geany_bacon_hack||exe| #temp hack for geany. will probably have to remove soon. use in absence of nicoedit.
 yes|zip|zip|exe,dev>null,doc,nls
 yes|zlib|zlib|exe,dev,doc,nls
-yes|zz_t2_fixup|zz_t2_fixup|exe| #workarounds for xorg in /usr/X11R7
+yes|zz_t2_fixup||exe| #workarounds for xorg in /usr/X11R7
 no|zz_wary52_fixup|zz_wary52_fixup|exe,dev,doc,nls| #WARY
 no|zzz_scripts_simple_bk||exe
 '

Changes to woof-distro/x86/wary/testing/DISTRO_PKGS_SPECS-puppy-wary5

@@ -735,9 +735,9 @@
 no|you2pup||exe,dev,doc,nls| #09oct2011, zigbert informs youtube.com format changed, pet broken.
 no|zfind||exe
 yes|z_geany_bacon_hack||exe| #temp hack for geany. will probably have to remove soon. use in absence of nicoedit.
 yes|zip|zip|exe,dev>null,doc,nls
 yes|zlib|zlib|exe,dev,doc,nls
-yes|zz_t2_fixup|zz_t2_fixup|exe| #workarounds for xorg in /usr/X11R7
+yes|zz_t2_fixup||exe| #workarounds for xorg in /usr/X11R7
 yes|zz_wary52_fixup|zz_wary52_fixup|exe,dev,doc,nls| #WARY
 no|zzz_scripts_simple_bk||exe
 '