Hello community,
here is the log from the commit of package opensuse-updater-gnome
checked in at Mon Sep 3 18:37:27 CEST 2007.
--------
--- GNOME/opensuse-updater-gnome/opensuse-updater-gnome.changes 2007-08-30 18:56:59.000000000 +0200
+++ /mounts/work_src_done/STABLE/opensuse-updater-gnome/opensuse-updater-gnome.changes 2007-09-03 17:55:40.000000000 +0200
@@ -1,0 +2,28 @@
+Wed Sep 3 17:17:51 CEST 2007 - jkress@suse.de
+
+- affects-package-manager patches handled properly
+- fixed memory problem
+- r7097
+- v0.4.2
+
+-------------------------------------------------------------------
+Tue Sep 3 12:49:55 CEST 2007 - jkress@suse.de
+
+- took care of yet another Gtk-CRITICAL
+
+-------------------------------------------------------------------
+Tue Sep 3 11:40:21 CEST 2007 - jkress@suse.de
+
+- fixed bug #306700
+- r7075
+
+-------------------------------------------------------------------
+Tue Sep 3 11:08:22 CEST 2007 - jkress@suse.de
+
+- fixed bug #300461: No more SIGABRT on quitting
+- fixed all Gtk-CRITICAL messages on quitting
+- fixed all GLib-critical messages on quitting
+- removed all g_prints connected to these problems
+- r7073
+
+-------------------------------------------------------------------
Old:
----
opensuse-updater-gnome-0.4.1.tar.bz2
New:
----
opensuse-updater-gnome-0.4.2.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ opensuse-updater-gnome.spec ++++++
--- /var/tmp/diff_new_pack.hP1744/_old 2007-09-03 18:36:51.000000000 +0200
+++ /var/tmp/diff_new_pack.hP1744/_new 2007-09-03 18:36:51.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package opensuse-updater-gnome (Version 0.4.1)
+# spec file for package opensuse-updater-gnome (Version 0.4.2)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -16,13 +16,13 @@
License: GPL v2 or later
Group: System/Packages
Summary: GNOME Updater Applet for OpenSUSE
-Version: 0.4.1
+Version: 0.4.2
Release: 1
URL: http://en.opensuse.org/GNOME_Updater_Applet
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Prefix: /usr
Source0: %{name}-%{version}.tar.bz2
-Requires: zypper >= 0.5.3
+Requires: zypper >= 0.8.18
Requires: libglade2 libgnome gnome-panel libgnomesu
# No translations yet.
# Requires: %{name}-lang = %{version}
@@ -93,6 +93,22 @@
#%files lang -f %{name}.lang
%changelog
+* Mon Sep 03 2007 - jkress@suse.de
+- affects-package-manager patches handled properly
+- fixed memory problem
+- r7097
+- v0.4.2
+* Mon Sep 03 2007 - jkress@suse.de
+- took care of yet another Gtk-CRITICAL
+* Mon Sep 03 2007 - jkress@suse.de
+- fixed bug #306700
+- r7075
+* Mon Sep 03 2007 - jkress@suse.de
+- fixed bug #300461: No more SIGABRT on quitting
+- fixed all Gtk-CRITICAL messages on quitting
+- fixed all GLib-critical messages on quitting
+- removed all g_prints connected to these problems
+- r7073
* Thu Aug 30 2007 - jkress@suse.de
- fixed segfault
- fixed callback errors
++++++ opensuse-updater-gnome-0.4.1.tar.bz2 -> opensuse-updater-gnome-0.4.2.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/opensuse-updater-gnome-0.4.1/opensuse-updater-gnome.spec new/opensuse-updater-gnome-0.4.2/opensuse-updater-gnome.spec
--- old/opensuse-updater-gnome-0.4.1/opensuse-updater-gnome.spec 2007-08-30 18:57:00.000000000 +0200
+++ new/opensuse-updater-gnome-0.4.2/opensuse-updater-gnome.spec 2007-09-03 17:55:40.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package opensuse-updater-gnome (Version 0.4.1)
+# spec file for package opensuse-updater-gnome (Version 0.4.2)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -16,13 +16,13 @@
License: GPL v2 or later
Group: System/Packages
Summary: GNOME updater applet for OpenSUSE
-Version: 0.4.1
+Version: 0.4.2
Release: 1
URL: http://en.opensuse.org/GNOME_Updater_Applet
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Prefix: /usr
Source0: %{name}-%{version}.tar.bz2
-Requires: zypper >= 0.5.3
+Requires: zypper >= 0.8.18
Requires: libglade2 libgnome gnome-panel libgnomesu
# No translations yet.
# Requires: %{name}-lang = %{version}
@@ -96,6 +96,9 @@
#%files lang -f %{name}.lang
%changelog
+* Mon Sep 03 2007 - jkress@suse.de
+- v0.4.2
+- zypper dependency bumped to v0.8.18
* Thu Aug 30 2007 - jkress@suse.de
- v0.4.1
* Tue Aug 07 2007 - maw@suse.de
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/opensuse-updater-gnome-0.4.1/package/opensuse-updater-gnome.changes new/opensuse-updater-gnome-0.4.2/package/opensuse-updater-gnome.changes
--- old/opensuse-updater-gnome-0.4.1/package/opensuse-updater-gnome.changes 2007-08-30 18:56:59.000000000 +0200
+++ new/opensuse-updater-gnome-0.4.2/package/opensuse-updater-gnome.changes 2007-09-03 17:55:40.000000000 +0200
@@ -1,4 +1,32 @@
-------------------------------------------------------------------
+Wed Sep 3 17:17:51 CEST 2007 - jkress@suse.de
+
+- affects-package-manager patches handled properly
+- fixed memory problem
+- r7097
+- v0.4.2
+
+-------------------------------------------------------------------
+Tue Sep 3 12:49:55 CEST 2007 - jkress@suse.de
+
+- took care of yet another Gtk-CRITICAL
+
+-------------------------------------------------------------------
+Tue Sep 3 11:40:21 CEST 2007 - jkress@suse.de
+
+- fixed bug #306700
+- r7075
+
+-------------------------------------------------------------------
+Tue Sep 3 11:08:22 CEST 2007 - jkress@suse.de
+
+- fixed bug #300461: No more SIGABRT on quitting
+- fixed all Gtk-CRITICAL messages on quitting
+- fixed all GLib-critical messages on quitting
+- removed all g_prints connected to these problems
+- r7073
+
+-------------------------------------------------------------------
Fri Aug 30 18:48:59 CEST 2007 - jkress@suse.de
- fixed segfault
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/opensuse-updater-gnome-0.4.1/src/updater-applet.c new/opensuse-updater-gnome-0.4.2/src/updater-applet.c
--- old/opensuse-updater-gnome-0.4.1/src/updater-applet.c 2007-08-30 18:56:59.000000000 +0200
+++ new/opensuse-updater-gnome-0.4.2/src/updater-applet.c 2007-09-03 17:55:40.000000000 +0200
@@ -207,7 +207,9 @@
static void
destroy_applet (UpdaterApplet *applet)
{
- updater_destroy (applet->updater);
+ // g_print ("updater-applet.c: destroy applet!\n");
+ // if (applet->updater)
+ // updater_destroy (applet->updater);
g_free (applet);
}
@@ -275,7 +277,7 @@
applet = create_applet ();
gtk_main ();
- g_printf("updater-applet-main: Did we get here?\n");
+ // g_printf("updater-applet-main: Did we get here?\n");
destroy_applet (applet);
return 0;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/opensuse-updater-gnome-0.4.1/src/updater-applet-callbacks.c new/opensuse-updater-gnome-0.4.2/src/updater-applet-callbacks.c
--- old/opensuse-updater-gnome-0.4.1/src/updater-applet-callbacks.c 2007-08-30 18:56:59.000000000 +0200
+++ new/opensuse-updater-gnome-0.4.2/src/updater-applet-callbacks.c 2007-09-03 17:55:40.000000000 +0200
@@ -57,8 +57,8 @@
// TODO add debug message
// TODO properly destroy
-
- updater_destroy(applet->updater);
+ if (applet->updater)
+ updater_destroy(applet->updater);
return TRUE;
}
@@ -171,9 +171,11 @@
guint action,
GtkWidget *widget)
{
- // UpdaterApplet *applet = (UpdaterApplet *) callback_data;
- // updater_destroy(applet->updater);
- g_printf("We are now calling gtk_main_quit from the callback function.\n");
+ // g_print ("We're now in the applet_quit callback.\n");
+ UpdaterApplet *applet = (UpdaterApplet *) callback_data;
+ // g_print ("applet_quit: calling updater_destroy!\n");
+ updater_destroy(applet->updater);
+ // g_print ("applet_quit: calling gtk_main_quit!\n");
gtk_main_quit ();
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/opensuse-updater-gnome-0.4.1/src/updater-applet-support.c new/opensuse-updater-gnome-0.4.2/src/updater-applet-support.c
--- old/opensuse-updater-gnome-0.4.1/src/updater-applet-support.c 2007-08-30 18:56:59.000000000 +0200
+++ new/opensuse-updater-gnome-0.4.2/src/updater-applet-support.c 2007-09-03 17:55:40.000000000 +0200
@@ -7,9 +7,20 @@
#include
+
#include "updater-applet-support.h"
void updater_applet_set_icon(UpdaterApplet *applet, const char *icon_stock_id)
{
gtk_status_icon_set_from_stock (GTK_STATUS_ICON (applet->applet_icon), icon_stock_id);
}
+
+void updater_applet_restart(UpdaterApplet *applet)
+{
+ g_print ("updater_applet_restart: calling updater_destroy!\n");
+ updater_destroy(applet->updater);
+ g_print ("updater_applet_restart: calling applet in 2 sec.\n");
+ system("(sleep 2; opensuse-updater-gnome-applet ) &");
+ g_print ("updater_applet_restart: calling gtk_main_quit!\n");
+ gtk_main_quit ();
+}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/opensuse-updater-gnome-0.4.1/src/updater-applet-support.h new/opensuse-updater-gnome-0.4.2/src/updater-applet-support.h
--- old/opensuse-updater-gnome-0.4.1/src/updater-applet-support.h 2007-08-30 18:56:59.000000000 +0200
+++ new/opensuse-updater-gnome-0.4.2/src/updater-applet-support.h 2007-09-03 17:55:40.000000000 +0200
@@ -36,4 +36,6 @@
/** Sets applet icon to \a icon_stock_id. See ICON_* stock IDs definitions. */
void updater_applet_set_icon(UpdaterApplet *applet, const char *icon_stock_id);
+void updater_applet_restart(UpdaterApplet *applet);
+
#endif /*UPDATERAPPLET_H_*/
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/opensuse-updater-gnome-0.4.1/src/updater-backend.c new/opensuse-updater-gnome-0.4.2/src/updater-backend.c
--- old/opensuse-updater-gnome-0.4.1/src/updater-backend.c 2007-08-30 18:56:59.000000000 +0200
+++ new/opensuse-updater-gnome-0.4.2/src/updater-backend.c 2007-09-03 17:55:40.000000000 +0200
@@ -20,7 +20,7 @@
void backend_destroy(UpdaterBackend *backend)
{
- zypp_backend_destroy(backend);
+ // zypp_backend_destroy(backend);
// (*(backend->destroy)) (backend);
if (backend->poutbuf)
@@ -29,7 +29,29 @@
g_free(backend->perrbuf);
backend_free_update_list(backend);
-
+
+ /* Freeing the update list strings */
+ if (backend->updates_list_security)
+ g_string_free(backend->updates_list_security, TRUE);
+
+ if (backend->updates_list_security_needrestart)
+ g_string_free(backend->updates_list_security_needrestart, TRUE);
+
+ if (backend->updates_list_recommended_patches)
+ g_string_free(backend->updates_list_recommended_patches, TRUE);
+
+ if (backend->updates_list_recommended_patches_needrestart)
+ g_string_free(backend->updates_list_recommended_patches_needrestart, TRUE);
+
+ if (backend->updates_list_optional_patches)
+ g_string_free(backend->updates_list_optional_patches, TRUE);
+
+ if (backend->updates_list_optional_patches_needrestart)
+ g_string_free(backend->updates_list_optional_patches_needrestart, TRUE);
+
+ if (backend->updates_list_third_party_packages)
+ g_string_free(backend->updates_list_third_party_packages, TRUE);
+
g_free(backend);
}
@@ -184,17 +206,19 @@
void backend_install_watch (GPid pid,
gint status,
- gpointer updater)
+ gpointer updater_ptr)
{
+ SUSEUpdater *updater = updater_ptr;
+
g_print ("child process %d (you) exited with status %d.\n",pid,status);
updater_ui_set_for_active_operation(updater,FALSE);
-
- /* This doesn't work. It never worked. I could kill this code!
- verb_check_now (updater, 0, NULL);
- */
- updater_check_now(updater);
+ g_print ("Includes pkgmanager updates: %d.\n", updater->backend->includes_package_management_update);
+ if(updater->backend->includes_package_management_update)
+ updater_applet_restart(updater->applet);
+ else
+ updater_check_now(updater);
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/opensuse-updater-gnome-0.4.1/src/updater-backend.h new/opensuse-updater-gnome-0.4.2/src/updater-backend.h
--- old/opensuse-updater-gnome-0.4.1/src/updater-backend.h 2007-08-30 18:56:59.000000000 +0200
+++ new/opensuse-updater-gnome-0.4.2/src/updater-backend.h 2007-09-03 17:55:40.000000000 +0200
@@ -54,6 +54,8 @@
gboolean recommended_are_mandatory;
gboolean include_optional_patches;
gboolean include_third_party_packages;
+
+ gboolean includes_package_management_update;
// process' output buffers
guint8 *poutbuf;
@@ -103,7 +105,7 @@
void backend_install_watch (GPid pid,
gint status,
- gpointer backend);
+ gpointer backend_ptr);
GIOChannel *
set_up_io_channel (gint fd, GIOCondition cond, GIOFunc func, gpointer data);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/opensuse-updater-gnome-0.4.1/src/updater.c new/opensuse-updater-gnome-0.4.2/src/updater.c
--- old/opensuse-updater-gnome-0.4.1/src/updater.c 2007-08-30 18:56:59.000000000 +0200
+++ new/opensuse-updater-gnome-0.4.2/src/updater.c 2007-09-03 17:55:40.000000000 +0200
@@ -76,16 +76,34 @@
void updater_destroy(SUSEUpdater *updater)
{
+ // g_print ("We're in updater_destroy now.\n");
if (updater)
{
+ // g_print ("We have an updater object. Destroying now.\n");
if (updater->main_window)
+ {
+ // g_print ("Destroying main window.\n");
gtk_widget_destroy (updater->main_window);
+ }
if (updater->simple_window)
+ {
+ // g_print ("Destroying simple window.\n");
gtk_widget_destroy (updater->simple_window);
+ }
if (updater->backend)
+ {
+ // g_print ("Destroying backend.\n");
backend_destroy (updater->backend);
+ }
+ /*
if (updater->preferences_window)
+ {
+ g_print ("Destroying preferces window.\n");
gtk_widget_destroy (updater->preferences_window);
+ }
+ */
+ if (updater->update_timer)
+ g_timer_destroy (updater->update_timer);
g_free(updater);
}
@@ -195,9 +213,9 @@
updater->simple_window_checkbuttonRestart = glade_xml_get_widget(updater->simple_window_xml,
"checkbuttonRestart");
updater->simple_window_buttonDetails = glade_xml_get_widget(updater->simple_window_xml,
- "SimpleInstallButton");
- updater->simple_window_buttonInstall = glade_xml_get_widget(updater->simple_window_xml,
"DetailsButton");
+ updater->simple_window_buttonInstall = glade_xml_get_widget(updater->simple_window_xml,
+ "SimpleInstallButton");
/* autoconnect the signals in the interface */
glade_xml_signal_autoconnect(updater->simple_window_xml);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/opensuse-updater-gnome-0.4.1/src/updater-callbacks.c new/opensuse-updater-gnome-0.4.2/src/updater-callbacks.c
--- old/opensuse-updater-gnome-0.4.1/src/updater-callbacks.c 2007-08-30 18:56:59.000000000 +0200
+++ new/opensuse-updater-gnome-0.4.2/src/updater-callbacks.c 2007-09-03 17:55:40.000000000 +0200
@@ -286,7 +286,7 @@
{
SUSEUpdater *updater = user_data;
- gtk_widget_hide(widget);
+ gtk_widget_hide (widget);
updater->preferences_win_shown = FALSE;
updater_ui_update(updater);
return TRUE;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/opensuse-updater-gnome-0.4.1/src/updater-support.c new/opensuse-updater-gnome-0.4.2/src/updater-support.c
--- old/opensuse-updater-gnome-0.4.1/src/updater-support.c 2007-08-30 18:56:59.000000000 +0200
+++ new/opensuse-updater-gnome-0.4.2/src/updater-support.c 2007-09-03 17:55:40.000000000 +0200
@@ -334,7 +334,7 @@
g_free(str);
/* We have only additional updates */
- if (!gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON (updater->simple_window_checkbuttonRecommended)) && (mandatory_count == 0))
+ if ((mandatory_count == 0) && !gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON (updater->simple_window_checkbuttonRecommended)))
{
/* Only additional available and they are deselected */
gtk_widget_set_sensitive (updater->simple_window_buttonInstall, FALSE);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/opensuse-updater-gnome-0.4.1/src/zypp/updater-zypp.c new/opensuse-updater-gnome-0.4.2/src/zypp/updater-zypp.c
--- old/opensuse-updater-gnome-0.4.1/src/zypp/updater-zypp.c 2007-08-30 18:56:59.000000000 +0200
+++ new/opensuse-updater-gnome-0.4.2/src/zypp/updater-zypp.c 2007-09-03 17:55:40.000000000 +0200
@@ -93,6 +93,8 @@
backend->third_party_packages_count = 0;
backend->needrestart_updates_count = 0;
+ backend->includes_package_management_update = FALSE;
+
backend->updates_list_security = g_string_new(NULL);
backend->updates_list_security_needrestart = g_string_new(NULL);
backend->updates_list_recommended_patches = g_string_new(NULL);
@@ -141,6 +143,8 @@
if ((!xmlStrcmp(item->resolvabletype, (const xmlChar *)"patch")))
{
/* We have a patch */
+ if ((!xmlStrcmp(item->pkgmanager, (const xmlChar *)"true"))) /* A very special patch */
+ backend->includes_package_management_update = TRUE;
if (patch_source == "") /* Setting the patch source to exclude packages from this source */
{
@@ -148,7 +152,7 @@
g_print("Patch Source: %s\n", patch_source);
}
- if ((!xmlStrcmp(item->type, (const xmlChar *)"security")))
+ if ((!xmlStrcmp(item->type, (const xmlChar *)"security")) || (!xmlStrcmp(item->pkgmanager, (const xmlChar *)"true")))
{
/* It's a security patch! */
if ((!xmlStrcmp(item->restart, (const xmlChar *)"true")))
@@ -291,8 +295,6 @@
GPid zypp_install_start(UpdaterBackend *backend)
{
GPid pid;
- GString *zypper_cmd_patches;
- GString *zypper_cmd_packages;
GString *zypper_gui_cmd = g_string_new("/usr/sbin/updater-zypper-gui ");
GError *error = NULL;
gchar *tmp;
@@ -469,7 +471,8 @@
if (!gnomesu_spawn_command_async("root", install_argv, &pid))
return 0;
- g_free(install_argv);
+ g_string_free(zypper_gui_cmd, TRUE);
+ // g_free(install_argv);
return pid;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/opensuse-updater-gnome-0.4.1/VERSION.cmake new/opensuse-updater-gnome-0.4.2/VERSION.cmake
--- old/opensuse-updater-gnome-0.4.1/VERSION.cmake 2007-08-30 18:57:00.000000000 +0200
+++ new/opensuse-updater-gnome-0.4.2/VERSION.cmake 2007-09-03 17:55:40.000000000 +0200
@@ -20,4 +20,4 @@
SET(VERSION_MAJOR "0")
SET(VERSION_MINOR "4")
-SET(VERSION_PATCH "1")
+SET(VERSION_PATCH "2")
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org
