[yast-commit] r40198 - in /trunk/gtk: ./ VERSION configure.in.in package/yast2-gtk.changes src/Makefile.am src/Y2CCGtk.cc yast2-gtk.spec.in

Author: mvidner Date: Fri Aug 10 18:02:06 2007 New Revision: 40198 URL: http://svn.opensuse.org/viewcvs/yast?rev=40198&view=rev Log: Finished integrating Feature #120292, UI as a namespace callable from yast2-*-bindings. Merged revisions 39047-39834,39836-39837,39839-40197 via svnmerge from http://svn.opensuse.org/svn/yast/branches/tmp/mvidner/ui-as-namespace/gtk ........ r39047 | mvidner | 2007-06-27 12:05:38 +0200 (St, 27 čen 2007) | 2 lines branching a UI ........ r39061 | mvidner | 2007-06-27 18:25:12 +0200 (St, 27 čen 2007) | 3 lines First version where we can call UI from Perl (but gtk segfaults) ........ r39989 | mvidner | 2007-08-06 14:00:41 +0200 (Po, 06 srp 2007) | 3 lines Adapted to changes in yast2-core needed for making UI callable from yast2-*-bindings. ........ r40069 | mvidner | 2007-08-08 09:22:40 +0200 (St, 08 srp 2007) | 2 lines Don't build-require yast2-devel-doc. ........ Modified: trunk/gtk/ (props changed) trunk/gtk/VERSION trunk/gtk/configure.in.in trunk/gtk/package/yast2-gtk.changes trunk/gtk/src/Makefile.am trunk/gtk/src/Y2CCGtk.cc trunk/gtk/yast2-gtk.spec.in Modified: trunk/gtk/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/VERSION?rev=40198&r1=40197&r2=40198&view=diff ============================================================================== --- trunk/gtk/VERSION (original) +++ trunk/gtk/VERSION Fri Aug 10 18:02:06 2007 @@ -1 +1 @@ -2.15.8 +2.15.9 Modified: trunk/gtk/configure.in.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/configure.in.in?rev=40198&r1=40197&r2=40198&view=diff ============================================================================== --- trunk/gtk/configure.in.in (original) +++ trunk/gtk/configure.in.in Fri Aug 10 18:02:06 2007 @@ -32,10 +32,6 @@ AC_HEADER_STDC dnl Try to find the Zypp includes -if ! test -d /usr/include/zypp; then - AC_MSG_ERROR(libzypp-devel not installed.) -fi - AC_MSG_CHECKING([for zypp 3]) if test -f /usr/include/zypp/SourceManager.h; then AC_DEFINE(PRE_ZYPP_3, 1, [defined if using an older SL10.1 era zypp]) Modified: trunk/gtk/package/yast2-gtk.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/package/yast2-gtk.changes?rev=40198&r1=40197&r2=40198&view=diff ============================================================================== --- trunk/gtk/package/yast2-gtk.changes (original) +++ trunk/gtk/package/yast2-gtk.changes Fri Aug 10 18:02:06 2007 @@ -1,10 +1,30 @@ ------------------------------------------------------------------- +Fri Aug 10 18:01:20 CEST 2007 - mvidner@suse.cz + +- Finished integrating Feature #120292, UI as a namespace callable + from yast2-*-bindings. +- 2.5.9 + +------------------------------------------------------------------- Wed Aug 8 15:32:01 BST 2007 - mmichael@suse.de - FaTE #302018: details on how to print the license - 2.15.8 ------------------------------------------------------------------- +Wed Aug 8 09:22:32 CEST 2007 - mvidner@suse.cz + +- Don't build-require yast2-devel-doc. +- 2.15.7.2 + +------------------------------------------------------------------- +Mon Aug 6 14:00:37 CEST 2007 - mvidner@suse.cz + +- Adapted to changes in yast2-core needed for making UI callable from + yast2-*-bindings. +- 2.15.7.1 + +------------------------------------------------------------------- Thu Jul 26 07:28:31 CEST 2007 - jsrain@suse.cz - removed yast2-devel from BuildRequires Modified: trunk/gtk/src/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/Makefile.am?rev=40198&r1=40197&r2=40198&view=diff ============================================================================== --- trunk/gtk/src/Makefile.am (original) +++ trunk/gtk/src/Makefile.am Fri Aug 10 18:02:06 2007 @@ -13,7 +13,7 @@ plugin_LTLIBRARIES = libpy2gtk.la libpy2gtk_la_LDFLAGS = -version-info 2:0 -libpy2gtk_la_LIBADD = -L$(libdir) -lyui -lycp -ly2 $(GTK_LIBS) $(ZYPP_LIBS) +libpy2gtk_la_LIBADD = -L$(plugindir) -lpy2UI -L$(libdir) -lycp -ly2 $(GTK_LIBS) $(ZYPP_LIBS) libpy2gtk_la_SOURCES = \ Y2CCGtk.cc \ YGUtils.cc \ @@ -59,6 +59,6 @@ test_SOURCES = test.cc test_LDADD = $(top_builddir)/src/$(plugin_LTLIBRARIES) -INCLUDES = -I$(srcdir)/include -I$(includedir) -I$(includedir)/yui +INCLUDES = -I$(srcdir)/include -I$(includedir) -I$(includedir)/yui $(ZYPP_CFLAGS) EXTRA_DIST = computer.xpm Modified: trunk/gtk/src/Y2CCGtk.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/Y2CCGtk.cc?rev=40198&r1=40197&r2=40198&view=diff ============================================================================== --- trunk/gtk/src/Y2CCGtk.cc (original) +++ trunk/gtk/src/Y2CCGtk.cc Fri Aug 10 18:02:06 2007 @@ -5,6 +5,8 @@ #include #include #include +#include +#include class YGUIComponent : public YUIComponent { @@ -24,17 +26,24 @@ } }; -class Y2CCGtk : public Y2ComponentCreator +class Y2CCGtk : public Y2CCUI { public: - Y2CCGtk () : Y2ComponentCreator (Y2ComponentBroker::BUILTIN) { }; + Y2CCGtk () : Y2CCUI() { }; bool isServerCreator () const { return true; }; Y2Component *create (const char * name) const { - if (!strcmp (name, "gtk") ) - return new YGUIComponent (); + y2milestone( "Creating %s component", name ); + if (!strcmp (name, "gtk") ) { + Y2Component* ret = YUIComponent::uiComponent (); + if (!ret || ret->name () != name) { + y2debug ("UI component is %s, creating %s", ret? ret->name().c_str() : "NULL", name); + ret = new YGUIComponent(); + } + return ret; + } else return 0; } Modified: trunk/gtk/yast2-gtk.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/yast2-gtk.spec.in?rev=40198&r1=40197&r2=40198&view=diff ============================================================================== --- trunk/gtk/yast2-gtk.spec.in (original) +++ trunk/gtk/yast2-gtk.spec.in Fri Aug 10 18:02:06 2007 @@ -2,7 +2,7 @@ @HEADER@ Source2: yast2-gtk-rpmlintrc -BuildRequires: blocxx-devel gcc-c++ libxcrypt-devel libzypp-devel yast2-core-devel yast2-devtools yast2-devel-doc gtk2-devel +BuildRequires: blocxx-devel gcc-c++ libxcrypt-devel libzypp-devel yast2-core-devel yast2-devtools gtk2-devel Summary: YaST2 - Gtk Graphical User Interface Provides: yast2_ui -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org