Author: coolo Date: Thu Feb 28 21:14:47 2008 New Revision: 45111 URL: http://svn.opensuse.org/viewcvs/yast?rev=45111&view=rev Log: submitted Modified: trunk/gtk/package/yast2-gtk.changes trunk/gtk/src/Makefile.am trunk/gtk/src/Y2CCGtk.cc trunk/gtk/src/YGPackageSelector.cc trunk/gtk/src/yzyppwrapper.cc Modified: trunk/gtk/package/yast2-gtk.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/package/yast2-gtk.changes?rev=45111&r1=45110&r2=45111&view=diff ============================================================================== --- trunk/gtk/package/yast2-gtk.changes (original) +++ trunk/gtk/package/yast2-gtk.changes Thu Feb 28 21:14:47 2008 @@ -1,4 +1,14 @@ ------------------------------------------------------------------- +Thu Feb 28 13:54:27 CET 2008 - coolo@suse.de + +- fix make dist + +------------------------------------------------------------------- +Wed Feb 27 16:37:02 CET 2008 - coolo@suse.de + +- make it link again + +------------------------------------------------------------------- Mon Feb 25 16:24:12 CET 2008 - sh@suse.de - V 2.16.5 Modified: trunk/gtk/src/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/Makefile.am?rev=45111&r1=45110&r2=45111&view=diff ============================================================================== --- trunk/gtk/src/Makefile.am (original) +++ trunk/gtk/src/Makefile.am Thu Feb 28 21:14:47 2008 @@ -12,9 +12,9 @@ # plugin, libtool forces 'lib' prefix plugin_LTLIBRARIES = libpy2gtk.la -libpy2gtk_la_LDFLAGS = -version-info 2:0 -libpy2gtk_la_LIBADD = -L$(plugindir) $(PYUI_LIBS) -L$(libdir) -lycp -ly2 \ - $(GTK_LIBS) $(ZYPP_LIBS) $(GTKHTML_LIBS) +libpy2gtk_la_LDFLAGS = -version-info 2:0 -Wl,--no-undefined +libpy2gtk_la_LIBADD = -L$(plugindir) -L$(libdir) -lycp -ly2 -lyui \ + $(GTK_LIBS) $(ZYPP_LIBS) $(GTKHTML_LIBS) -ly2util libpy2gtk_la_SOURCES = \ Y2CCGtk.cc \ YGUtils.cc \ @@ -83,5 +83,7 @@ icons/pkg-unlocked.xpm \ icons/pkg-installed-upgradable-locked.xpm \ icons/pkg-locked.xpm \ + icons/harddisk.xpm \ + icons/harddisk-full.xpm \ pkg-selector-help.h Modified: trunk/gtk/src/Y2CCGtk.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/Y2CCGtk.cc?rev=45111&r1=45110&r2=45111&view=diff ============================================================================== --- trunk/gtk/src/Y2CCGtk.cc (original) +++ trunk/gtk/src/Y2CCGtk.cc Thu Feb 28 21:14:47 2008 @@ -4,8 +4,6 @@ #include #include -#include -#include YUI * createUI( bool withThreads ) { Modified: trunk/gtk/src/YGPackageSelector.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/YGPackageSelector.cc?rev=45111&r1=45110&r2=45111&view=diff ============================================================================== --- trunk/gtk/src/YGPackageSelector.cc (original) +++ trunk/gtk/src/YGPackageSelector.cc Thu Feb 28 21:14:47 2008 @@ -3,9 +3,12 @@ ********************************************************************/ #include -#include +#include + +#define YUILogComponent "gtk-pkg" #include "YGUI.h" +#include "YUILog.h" #include "YGUtils.h" #include "YGi18n.h" #include "YGDialog.h" @@ -1940,11 +1943,11 @@ const gchar *action = (gchar *) id; if (!strcmp (action, "accept")) { - y2milestone ("Closing PackageSelector with 'accept'"); + yuiMilestone() << "Closing PackageSelector with 'accept'" << endl; YGUI::ui()->sendEvent (new YMenuEvent ("accept")); } else if (!strcmp (action, "cancel")) { - y2milestone ("Closing PackageSelector with 'cancel'"); + yuiMilestone() << "Closing PackageSelector with 'cancel'" << endl; if (pThis->confirmExit()) YGUI::ui()->sendEvent (new YCancelEvent()); } Modified: trunk/gtk/src/yzyppwrapper.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/yzyppwrapper.cc?rev=45111&r1=45110&r2=45111&view=diff ============================================================================== --- trunk/gtk/src/yzyppwrapper.cc (original) +++ trunk/gtk/src/yzyppwrapper.cc Thu Feb 28 21:14:47 2008 @@ -8,8 +8,12 @@ #include #include "YGi18n.h" #include "yzyppwrapper.h" +#include +#include <string> -#include +#define YUILogComponent "gtk-pkg" + +#include #include #include #include @@ -350,7 +354,7 @@ std::string Ypp::Package::changelog() { - string text; + std::string text; ZyppObject object = impl->zyppSel->installedObj(); ZyppPackage package = tryCastToZyppPkg (object); if (package) { @@ -452,8 +456,8 @@ ZyppObject object = selectable->theObj(); ZyppPattern pattern = tryCastToZyppPattern (object); - const set <string> &packages = pattern->install_packages(); - for (set <string>::iterator it = packages.begin(); + const std::set std::string &packages = pattern->install_packages(); + for (std::set std::string::iterator it = packages.begin(); it != packages.end(); it++) { if (this->impl->zyppSel->name() == *it) return true; @@ -583,8 +587,7 @@ const Version *version = getAvailableVersion (nb); ZyppObject candidate = (ZyppObjectPtr) version->impl; if (!impl->zyppSel->setCandidate (candidate)) { - y2warning ("Error: Could not set package '%s' candidate to '%s'\n", - name().c_str(), version->number.c_str()); + yuiWarning () << "Error: Could not set package '" << name() << "' candidate to '" << version->number << "'\n"; return; } } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org