[yast-commit] r44717 - in /trunk: core/libyui/src/ycp-ui/YUIComponentCreator.cc gtk/src/Y2CCGtk.cc

Author: coolo Date: Thu Feb 21 07:25:58 2008 New Revision: 44717 URL: http://svn.opensuse.org/viewcvs/yast?rev=44717&view=rev Log: make gtk frontend work again Modified: trunk/core/libyui/src/ycp-ui/YUIComponentCreator.cc trunk/gtk/src/Y2CCGtk.cc Modified: trunk/core/libyui/src/ycp-ui/YUIComponentCreator.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/libyui/src/ycp-ui/YUIComponentCreator.cc?rev=44717&r1=44716&r2=44717&view=diff ============================================================================== --- trunk/core/libyui/src/ycp-ui/YUIComponentCreator.cc (original) +++ trunk/core/libyui/src/ycp-ui/YUIComponentCreator.cc Thu Feb 21 07:25:58 2008 @@ -30,7 +30,7 @@ using std::string; -#define SUPPORT_GTK_UI 0 +#define SUPPORT_GTK_UI 1 // Global instances of this class for the Y2ComponentBroker to find. Modified: trunk/gtk/src/Y2CCGtk.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/Y2CCGtk.cc?rev=44717&r1=44716&r2=44717&view=diff ============================================================================== --- trunk/gtk/src/Y2CCGtk.cc (original) +++ trunk/gtk/src/Y2CCGtk.cc Thu Feb 21 07:25:58 2008 @@ -5,48 +5,17 @@ #include #include #include -#include #include -class YGUIComponent : public YUIComponent +YUI * createUI( bool withThreads ) { -public: + static YGUI *_ui = 0; + + if ( ! _ui ) + { + _ui = new YGUI( withThreads ); + } - YGUIComponent() : YUIComponent() {} - - virtual string name() const { return "gtk"; } - - virtual YUI *createUI (bool with_threads) - { -#ifdef IMPL_DEBUG - fprintf (stderr, "Create a gtk+ UI (with threads: %d) !\n", with_threads); -#endif - return new YGUI (with_threads); - } -}; - -class Y2CCGtk : public Y2CCUI -{ -public: - Y2CCGtk() : Y2CCUI() { }; - - bool isServerCreator () const { return true; }; - - Y2Component *create (const char *name) const - { - 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; - } - return 0; - } -}; - -// Singleton plugin registration instance. -Y2CCGtk g_y2ccgtk; + return _ui; +} -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org