5 new revisions:
Revision: 428849e442ad
Author: Muneyuki Noguchi <[email protected]>
Date: Sat Mar 17 03:20:54 2012
Log: Display uim plasma widget regardless of toolbar-display-time....
http://code.google.com/p/uim/source/detail?r=428849e442ad
Revision: 3de66b4e8fa8
Author: Muneyuki Noguchi <[email protected]>
Date: Sat Mar 17 03:53:26 2012
Log: Enable knotify4 in make-dist.sh....
http://code.google.com/p/uim/source/detail?r=3de66b4e8fa8
Revision: 77f4c9500dc9
Author: Muneyuki Noguchi <[email protected]>
Date: Sat Mar 17 03:55:25 2012
Log: Make distclean works in notify....
http://code.google.com/p/uim/source/detail?r=77f4c9500dc9
Revision: a431cddb6af2
Author: Muneyuki Noguchi <[email protected]>
Date: Sat Mar 17 03:57:47 2012
Log: Enable build of knotify4 when CMAKE_SOURCE_DIR !=
CMAKE_BINARY_DIR....
http://code.google.com/p/uim/source/detail?r=a431cddb6af2
Revision: 361e68084082
Author: Muneyuki Noguchi <[email protected]>
Date: Sat Mar 17 04:00:59 2012
Log: Avoid error by "git log" in Makefile.am....
http://code.google.com/p/uim/source/detail?r=361e68084082
==============================================================================
Revision: 428849e442ad
Author: Muneyuki Noguchi <[email protected]>
Date: Sat Mar 17 03:20:54 2012
Log: Display uim plasma widget regardless of toolbar-display-time.
* qt4/toolbar/common-uimstateindicator.cpp
- (UimStateIndicator::propListUpdate):
* Display plasma widget regardless of toolbar-display-time
because this widget isn't toolbar.
* Cosmetic change.
http://code.google.com/p/uim/source/detail?r=428849e442ad
Modified:
/qt4/toolbar/common-uimstateindicator.cpp
=======================================
--- /qt4/toolbar/common-uimstateindicator.cpp Fri Mar 16 22:30:09 2012
+++ /qt4/toolbar/common-uimstateindicator.cpp Sat Mar 17 03:20:54 2012
@@ -159,7 +159,11 @@
char *display_time
= uim_scm_c_symbol( uim_scm_symbol_value( "toolbar-display-time" )
);
+#ifdef PLASMA_APPLET_UIM
+ bool isHidden = true;
+#else
bool isHidden = strcmp( display_time, "mode" );
+#endif
foreach ( const QString &line, lines )
{
const QStringList fields = line.split( '\t',
QString::SkipEmptyParts );
@@ -236,14 +240,16 @@
}
}
}
+#ifndef PLASMA_APPLET_UIM
foreach ( QWidget *widget, QApplication::topLevelWidgets() ) {
if ( widget->isAncestorOf( this ) ) {
- isHidden = ( isHidden && strcmp( display_time, "always" ) );
+ isHidden = ( isHidden && strcmp( display_time, "always" ) );
if ( isHidden != widget->isHidden() )
widget->setHidden( isHidden );
break;
}
}
+#endif
#ifdef PLASMA_APPLET_UIM
if ( m_layout->count() != prevCount )
==============================================================================
Revision: 3de66b4e8fa8
Author: Muneyuki Noguchi <[email protected]>
Date: Sat Mar 17 03:53:26 2012
Log: Enable knotify4 in make-dist.sh.
* make-dist.sh
- (CONF_FULL_WO_MAINT): Add knotify4 to "--enable-notify".
http://code.google.com/p/uim/source/detail?r=3de66b4e8fa8
Modified:
/make-dist.sh
=======================================
--- /make-dist.sh Sat Feb 25 21:38:32 2012
+++ /make-dist.sh Sat Mar 17 03:53:26 2012
@@ -27,7 +27,7 @@
# --without-scim since it is broken
# --without-qt
-CONF_FULL_WO_MAINT="$CONF_NOWERROR --enable-debug --enable-fep
--enable-emacs --enable-gnome-applet --enable-gnome3-applet
--enable-kde-applet --enable-kde4-applet --enable-pref --enable-dict
--enable-notify --with-anthy --with-canna --with-wnn --with-sj3 --with-mana
--with-prime --with-m17nlib --without-scim --with-gtk2 --with-gtk3
--without-qt --without-qt-immodule --enable-compat-scm --with-eb
--with-eb-conf=$EB_CONF --with-libedit --with-qt4 --with-qt4-immodule"
+CONF_FULL_WO_MAINT="$CONF_NOWERROR --enable-debug --enable-fep
--enable-emacs --enable-gnome-applet --enable-gnome3-applet
--enable-kde-applet --enable-kde4-applet --enable-pref --enable-dict
--enable-notify=libnotify,knotify4 --with-anthy --with-canna --with-wnn
--with-sj3 --with-mana --with-prime --with-m17nlib --without-scim
--with-gtk2 --with-gtk3 --without-qt --without-qt-immodule
--enable-compat-scm --with-eb --with-eb-conf=$EB_CONF --with-libedit
--with-qt4 --with-qt4-immodule"
CONF_FULL="$CONF_MAINT $CONF_FULL_WO_MAINT"
git submodule update --init --recursive
==============================================================================
Revision: 77f4c9500dc9
Author: Muneyuki Noguchi <[email protected]>
Date: Sat Mar 17 03:55:25 2012
Log: Make distclean works in notify.
* notify/Makefile.am
- Remove notify/build in distclean-local instead of distclean.
- Don't remove notify/build when knotify4 isn't enabled.
http://code.google.com/p/uim/source/detail?r=77f4c9500dc9
Modified:
/notify/Makefile.am
=======================================
--- /notify/Makefile.am Sun Mar 4 06:58:59 2012
+++ /notify/Makefile.am Sat Mar 17 03:55:25 2012
@@ -33,10 +33,10 @@
if KNOTIFY4
all cleaninstall install uninstall:
( cd build; $(MAKE) $(AM_MAKEFLAGS) $@ )
-endif
-
-distclean:
+
+distclean-local:
-rm -rf build/*
+endif
FORCE:
==============================================================================
Revision: a431cddb6af2
Author: Muneyuki Noguchi <[email protected]>
Date: Sat Mar 17 03:57:47 2012
Log: Enable build of knotify4 when CMAKE_SOURCE_DIR !=
CMAKE_BINARY_DIR.
* notify/CMakeLists.txt
- (include_directories): Add "${CMAKE_BINARY_DIR}/../../uim".
http://code.google.com/p/uim/source/detail?r=a431cddb6af2
Modified:
/notify/CMakeLists.txt
=======================================
--- /notify/CMakeLists.txt Sat Jan 21 19:56:35 2012
+++ /notify/CMakeLists.txt Sat Mar 17 03:57:47 2012
@@ -4,7 +4,7 @@
include_directories(${KDE4_INCLUDES} ${CMAKE_SOURCE_DIR}/..
${CMAKE_SOURCE_DIR}/../uim ${CMAKE_SOURCE_DIR}/../replace
- ${CMAKE_SOURCE_DIR}/../qt4)
+ ${CMAKE_SOURCE_DIR}/../qt4 ${CMAKE_BINARY_DIR}/../../uim)
set(uimnotify_knotify4_SRCS
uim-knotify4.cpp)
==============================================================================
Revision: 361e68084082
Author: Muneyuki Noguchi <[email protected]>
Date: Sat Mar 17 04:00:59 2012
Log: Avoid error by "git log" in Makefile.am.
* Makefile.am
- (ChangeLog): Add separator to arguments of "git log"
to avoid error, such as
"fatal: ambiguous argument 'uim-1.8.0': both revision and filename".
http://code.google.com/p/uim/source/detail?r=361e68084082
Modified:
/Makefile.am
=======================================
--- /Makefile.am Sat Feb 25 21:26:46 2012
+++ /Makefile.am Sat Mar 17 04:00:59 2012
@@ -38,7 +38,7 @@
FORCE:
ChangeLog: FORCE
- git log --date-order --date=short $(RELEASE_TAG) \
+ git log --date-order --date=short $(RELEASE_TAG) -- \
| tools/gnuify-changelog.pl > $@
@if test -s $@; then \
echo "ChangeLog updated successfully."; \
