Author: rpmcruz Date: Wed Dec 15 13:59:26 2010 New Revision: 62993 URL: http://svn.opensuse.org/viewcvs/yast?rev=62993&view=rev Log: * got rid of PackageKit close daemon code: reported as bug 659522: this really is best done from the sw_single ycp code. * disabled the vestigial dialog for osc build. Modified: trunk/gtk/src/YGUI.cc trunk/gtk/src/YGUtils.cc trunk/gtk/src/YGUtils.h trunk/gtk/src/pkg/CMakeLists.txt trunk/gtk/src/pkg/YGPackageSelector.h Modified: trunk/gtk/src/YGUI.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/YGUI.cc?rev=62993&r1=62992&r2=62993&view=diff ============================================================================== --- trunk/gtk/src/YGUI.cc (original) +++ trunk/gtk/src/YGUI.cc Wed Dec 15 13:59:26 2010 @@ -153,26 +153,6 @@ gtk_window_set_default_icon (pixbuf); g_object_unref (G_OBJECT (pixbuf)); } - - if (m_swsingle) { - struct inner { - static bool is_pkkit_running() { - return YGUtils::exec ("dbus-send --system --dest=org.freedesktop.DBus " - "--type=method_call --print-reply --reply-timeout=200 " - "/ org.freedesktop.DBus.NameHasOwner " - "string:org.freedesktop.PackageKit").find ( - "boolean false") != std::string::npos; - } - - static void close_pkkit() { - YGUtils::exec ("/bin/dbus-send --system --dest=org.freedesktop.PackageKit " - "--type=method_call /org/freedesktop/PackageKit org.freedesktop.PackageKit.SuggestDaemonQuit"); - } - }; - - if (inner::is_pkkit_running()) - inner::close_pkkit(); - } } static gboolean ycp_wakeup_fn (GIOChannel *source, GIOCondition condition, Modified: trunk/gtk/src/YGUtils.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/YGUtils.cc?rev=62993&r1=62992&r2=62993&view=diff ============================================================================== --- trunk/gtk/src/YGUtils.cc (original) +++ trunk/gtk/src/YGUtils.cc Wed Dec 15 13:59:26 2010 @@ -860,14 +860,3 @@ return ret; } -std::string YGUtils::exec (const char *cmd) -{ - FILE *pipe = popen (cmd, "r"); - if (!pipe) - return ""; - char buffer [1024]; - fgets (buffer, 1024, pipe); - pclose (pipe); - return buffer; -} - Modified: trunk/gtk/src/YGUtils.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/YGUtils.h?rev=62993&r1=62992&r2=62993&view=diff ============================================================================== --- trunk/gtk/src/YGUtils.h (original) +++ trunk/gtk/src/YGUtils.h Wed Dec 15 13:59:26 2010 @@ -68,9 +68,6 @@ /* Shrink widget inner-border (thickness) */ void shrinkWidget (GtkWidget *widget); - - /* Runs and returns stdout of given command. */ - std::string exec (const char *cmd); }; extern "C" { Modified: trunk/gtk/src/pkg/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/pkg/CMakeLists.txt?rev=62993&r1=62992&r2=62993&view=diff ============================================================================== --- trunk/gtk/src/pkg/CMakeLists.txt (original) +++ trunk/gtk/src/pkg/CMakeLists.txt Wed Dec 15 13:59:26 2010 @@ -19,7 +19,7 @@ ygtkpkgundolist.cc yzypptags.cc yzyppwrapper.cc - ygtkpkgvestigialdialog.cc + #ygtkpkgvestigialdialog.cc ygtkcellrendererbutton.c ygtkcellrenderersidebutton.c Modified: trunk/gtk/src/pkg/YGPackageSelector.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/pkg/YGPackageSelector.h?rev=62993&r1=62992&r2=62993&view=diff ============================================================================== --- trunk/gtk/src/pkg/YGPackageSelector.h (original) +++ trunk/gtk/src/pkg/YGPackageSelector.h Wed Dec 15 13:59:26 2010 @@ -13,7 +13,7 @@ #include "YGWidget.h" #include "yzyppwrapper.h" -#define HAS_VESTIGIAL_DIALOG +//#define HAS_VESTIGIAL_DIALOG struct YGtkPkgUndoList; struct YGtkPkgSearchEntry; -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org