April 2014 - openSUSE Commits - openSUSE Mailing Lists

commit NetworkManager-strongswan for openSUSE:Factory
by root＠hilbert.suse.de 26 Apr '14

26 Apr '14

Hello community, here is the log from the commit of package NetworkManager-strongswan for openSUSE:Factory checked in at 2014-04-26 10:09:11 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/NetworkManager-strongswan (Old) and /work/SRC/openSUSE:Factory/.NetworkManager-strongswan.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "NetworkManager-strongswan" Changes: -------- --- /work/SRC/openSUSE:Factory/NetworkManager-strongswan/NetworkManager-strongswan.changes 2014-04-03 17:12:10.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.NetworkManager-strongswan.new/NetworkManager-strongswan.changes 2014-04-26 10:09:11.000000000 +0200 @@ -1,0 +2,7 @@ +Fri Apr 25 09:09:01 UTC 2014 - dimstar(a)opensuse.org + +- Update to version 1.3.1: + + Add PSK support. + + Updated translations. + +------------------------------------------------------------------- Old: ---- NetworkManager-strongswan-1.3.0.tar.bz2 New: ---- NetworkManager-strongswan-1.3.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ NetworkManager-strongswan.spec ++++++ --- /var/tmp/diff_new_pack.FTZe3K/_old 2014-04-26 10:09:12.000000000 +0200 +++ /var/tmp/diff_new_pack.FTZe3K/_new 2014-04-26 10:09:12.000000000 +0200 @@ -17,7 +17,7 @@ Name: NetworkManager-strongswan -Version: 1.3.0 +Version: 1.3.1 Release: 0 Summary: NetworkManager VPN support for strongSwan License: GPL-2.0+ ++++++ NetworkManager-strongswan-1.3.0.tar.bz2 -> NetworkManager-strongswan-1.3.1.tar.bz2 ++++++ ++++ 2162 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/NetworkManager-strongswan-1.3.0/Makefile.am new/NetworkManager-strongswan-1.3.1/Makefile.am --- old/NetworkManager-strongswan-1.3.0/Makefile.am 2011-09-07 13:58:05.000000000 +0200 +++ new/NetworkManager-strongswan-1.3.1/Makefile.am 2014-04-17 15:56:29.000000000 +0200 @@ -11,6 +11,7 @@ @INTLTOOL_DESKTOP_RULE@ nm-strongswan-service.name: $(srcdir)/nm-strongswan-service.name.in + $(AM_V_GEN) \ sed -e 's|[@]LIBEXECDIR[@]|$(libexecdir)|' \ -e 's|[@]CHARON[@]|$(charon)|' $< >$@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/NetworkManager-strongswan-1.3.0/NEWS new/NetworkManager-strongswan-1.3.1/NEWS --- old/NetworkManager-strongswan-1.3.0/NEWS 2011-09-07 15:38:06.000000000 +0200 +++ new/NetworkManager-strongswan-1.3.1/NEWS 2014-04-24 15:53:38.000000000 +0200 @@ -1,3 +1,9 @@ +NetworkManager-strongswan-1.3.1 +------------------------------- + +- Add PSK support +- Updated german translations + NetworkManager-strongswan-1.3.0 ------------------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/NetworkManager-strongswan-1.3.0/auth-dialog/main.c new/NetworkManager-strongswan-1.3.1/auth-dialog/main.c --- old/NetworkManager-strongswan-1.3.0/auth-dialog/main.c 2011-09-07 13:58:05.000000000 +0200 +++ new/NetworkManager-strongswan-1.3.1/auth-dialog/main.c 2014-04-17 15:56:29.000000000 +0200 @@ -99,7 +99,7 @@ fprintf (stderr, "Failed to read data and secrets from stdin.\n"); return NULL; } - + method = g_hash_table_lookup (data, "method"); if (method) method = g_strdup(method); @@ -118,7 +118,7 @@ gchar *name = NULL, *uuid = NULL, *service = NULL, *keyring = NULL, *pass; GOptionContext *context; char *agent, *type; - guint32 itemid; + guint32 itemid, minlen = 0; GtkWidget *dialog; GOptionEntry entries[] = { { "reprompt", 'r', 0, G_OPTION_ARG_NONE, &retry, "Reprompt for passwords", NULL}, @@ -159,7 +159,8 @@ fprintf(stderr, "Connection lookup failed\n"); return 1; } - if (!strcmp(type, "eap") || !strcmp(type, "key") || !strcmp(type, "smartcard")) + if (!strcmp(type, "eap") || !strcmp(type, "key") || !strcmp(type, "psk") || + !strcmp(type, "smartcard")) { pass = lookup_password(name, service); if ((!pass || retry) && allow_interaction) @@ -178,6 +179,14 @@ NULL, NULL, TRUE); gnome_password_dialog_set_show_remember(GNOME_PASSWORD_DIALOG(dialog), TRUE); } + else if (!strcmp(type, "psk")) + { + dialog = gnome_password_dialog_new(_("VPN password required"), + _("Pre-shared key required to establish VPN connection (min. 20 characters):"), + NULL, NULL, TRUE); + gnome_password_dialog_set_show_remember(GNOME_PASSWORD_DIALOG(dialog), TRUE); + minlen = 20; + } else /* smartcard */ { dialog = gnome_password_dialog_new(_("VPN password required"), @@ -190,12 +199,18 @@ { gnome_password_dialog_set_password(GNOME_PASSWORD_DIALOG(dialog), pass); } + +too_short_retry: if (!gnome_password_dialog_run_and_block(GNOME_PASSWORD_DIALOG(dialog))) { return 1; } pass = gnome_password_dialog_get_password(GNOME_PASSWORD_DIALOG(dialog)); + if (minlen && strlen(pass) < minlen) + { + goto too_short_retry; + } switch (gnome_password_dialog_get_remember(GNOME_PASSWORD_DIALOG(dialog))) { case GNOME_PASSWORD_DIALOG_REMEMBER_NOTHING: @@ -244,4 +259,3 @@ wait_for_quit (); return 0; } - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/NetworkManager-strongswan-1.3.0/configure.ac new/NetworkManager-strongswan-1.3.1/configure.ac --- old/NetworkManager-strongswan-1.3.0/configure.ac 2011-09-07 13:58:05.000000000 +0200 +++ new/NetworkManager-strongswan-1.3.1/configure.ac 2014-04-24 15:53:38.000000000 +0200 @@ -1,6 +1,6 @@ AC_PREREQ(2.52) -AC_INIT(NetworkManager-strongswan, 1.3.0, martin(a)strongswan.org, NetworkManager-strongswan) +AC_INIT(NetworkManager-strongswan, 1.3.1, martin(a)strongswan.org, NetworkManager-strongswan) AM_INIT_AUTOMAKE([subdir-objects]) AM_MAINTAINER_MODE @@ -71,9 +71,9 @@ AC_ARG_WITH( [charon], - AS_HELP_STRING([--with-charon=file],[path to the strongSwan IKEv2 daemon charon"]), + AS_HELP_STRING([--with-charon=file],[path to the strongSwan charon NetworkManager backend"]), [AC_SUBST(charon, "$withval")], - [AC_SUBST(charon, "${libexecdir}/ipsec/charon")] + [AC_SUBST(charon, "${libexecdir}/ipsec/charon-nm")] ) NM_COMPILER_WARNINGS diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/NetworkManager-strongswan-1.3.0/po/POTFILES.in new/NetworkManager-strongswan-1.3.1/po/POTFILES.in --- old/NetworkManager-strongswan-1.3.0/po/POTFILES.in 2011-09-07 13:58:05.000000000 +0200 +++ new/NetworkManager-strongswan-1.3.1/po/POTFILES.in 2014-04-17 15:56:29.000000000 +0200 @@ -1,5 +1,5 @@ # List of source files containing translatable strings. # Please keep this file sorted alphabetically. properties/nm-strongswan.c -properties/nm-strongswan-dialog.ui +[type: gettext/glade]properties/nm-strongswan-dialog.ui auth-dialog/main.c diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/NetworkManager-strongswan-1.3.0/po/de.po new/NetworkManager-strongswan-1.3.1/po/de.po --- old/NetworkManager-strongswan-1.3.0/po/de.po 2011-09-07 13:58:05.000000000 +0200 +++ new/NetworkManager-strongswan-1.3.1/po/de.po 2014-04-17 15:56:29.000000000 +0200 @@ -6,19 +6,20 @@ msgstr "" "Project-Id-Version: NetworkManager-strongswan\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-08-11 16:12+0200\n" +"POT-Creation-Date: 2013-11-25 18:14+0100\n" "PO-Revision-Date: 2010-02-18 09:20+0100\n" "Last-Translator: Martin Willi <martin(a)strongswan.org>\n" "Language-Team: de <martin(a)strongswan.org>\n" +"Language: German\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: ../properties/nm-strongswan.c:38 +#: ../properties/nm-strongswan.c:37 msgid "IPsec/IKEv2 (strongswan)" msgstr "IPsec/IKEv2 (strongswan)" -#: ../properties/nm-strongswan.c:39 +#: ../properties/nm-strongswan.c:38 msgid "IPsec with the IKEv2 key exchange protocol." msgstr "IPsec mit dem IKEv2 Protokoll." @@ -38,47 +39,27 @@ msgid "EAP" msgstr "EAP" -#: ../properties/nm-strongswan-dialog.glade.h:1 -msgid "<b>Client</b>" -msgstr "<b>Client</b>" +#: ../properties/nm-strongswan.c:212 +msgid "Pre-shared key" +msgstr "Pre-shared Key" -#: ../properties/nm-strongswan-dialog.glade.h:2 +#: ../properties/nm-strongswan-dialog.ui.h:1 msgid "<b>Gateway</b>" msgstr "<b>Gateway</b>" -#: ../properties/nm-strongswan-dialog.glade.h:3 -msgid "<b>Options</b>" -msgstr "<b>Optionen</b>" +#: ../properties/nm-strongswan-dialog.ui.h:2 +msgid "_Address:" +msgstr "_Adresse:" -#: ../properties/nm-strongswan-dialog.glade.h:4 +#: ../properties/nm-strongswan-dialog.ui.h:3 msgid "An IP address or hostname the Gateway can be contacted." msgstr "Ein IP-Adresse oder einen Rechnernamen des Gateways." -#: ../properties/nm-strongswan-dialog.glade.h:5 -msgid "Au_thentication:" -msgstr "Au_thentisierung:" - -#: ../properties/nm-strongswan-dialog.glade.h:6 -msgid "Authentication Method to use for authentication against the Gateway. " -msgstr "Methode zur Authentisierung gegenüber dem Gateway." - -#: ../properties/nm-strongswan-dialog.glade.h:7 +#: ../properties/nm-strongswan-dialog.ui.h:4 msgid "C_ertificate:" msgstr "Z_ertifikat:" -#: ../properties/nm-strongswan-dialog.glade.h:8 -msgid "Ce_rtificate:" -msgstr "Ze_rtifikat:" - -#: ../properties/nm-strongswan-dialog.glade.h:9 -msgid "Client certificate to use for client authentication." -msgstr "Zertifikat des Clients für dessen Authentisierung." - -#: ../properties/nm-strongswan-dialog.glade.h:10 -msgid "En_force UDP encapsulation" -msgstr "Erzwingen einer zusätzlichen Einbettung der Datenpakete in _UDP" - -#: ../properties/nm-strongswan-dialog.glade.h:11 +#: ../properties/nm-strongswan-dialog.ui.h:5 msgid "" "Gateway or CA certificate to use for gateway authentication. If none is " "specified, pre-installed CA certificates are used." @@ -86,19 +67,11 @@ "Gateway- oder CA-Zertifikat für die Authentisierung des Gateways. Ohne " "Angabe eines Zertifikates werden die CA-Zertifikate des Systems verwendet." -#: ../properties/nm-strongswan-dialog.glade.h:12 -msgid "" -"IPComp compresses raw IP packets before they get encrypted. This saves some " -"bandwidth, but uses more processing power." -msgstr "" -"IPComp komprimiert IP-Pakete, bevor sie verschlüsselt werden. Diese Option " -"kann Bandbreite sparen, benötigt jedoch zusätzliche Rechenleistung." - -#: ../properties/nm-strongswan-dialog.glade.h:13 -msgid "Private _key:" -msgstr "Privater _Schlüssel:" +#: ../properties/nm-strongswan-dialog.ui.h:6 +msgid "<b>Client</b>" +msgstr "<b>Client</b>" -#: ../properties/nm-strongswan-dialog.glade.h:14 +#: ../properties/nm-strongswan-dialog.ui.h:7 msgid "" "Private key to use for client authentication. This key has to match the " "certificates public key and may be encrypted." @@ -106,20 +79,39 @@ "Privater Schlüssel für die Authentisierung des Clients. Dieser Schlüssel " "muss zum konfigurierten Zertifikat passen und kann verschlüsselt sein." -#: ../properties/nm-strongswan-dialog.glade.h:15 +#: ../properties/nm-strongswan-dialog.ui.h:8 +msgid "Private _key:" +msgstr "Privater _Schlüssel:" + +#: ../properties/nm-strongswan-dialog.ui.h:9 +msgid "Au_thentication:" +msgstr "Au_thentisierung:" + +#: ../properties/nm-strongswan-dialog.ui.h:10 +msgid "_Username:" +msgstr "_Benutzername:" + +#: ../properties/nm-strongswan-dialog.ui.h:11 +msgid "The username (identity) to use for authentication against the gateway." +msgstr "Benutzername/Identität für die Authentisierung gegenüber dem Gateway." + +#: ../properties/nm-strongswan-dialog.ui.h:12 +msgid "Ce_rtificate:" +msgstr "Ze_rtifikat:" + +#: ../properties/nm-strongswan-dialog.ui.h:13 +msgid "Client certificate to use for client authentication." +msgstr "Zertifikat des Clients für dessen Authentisierung." + +#: ../properties/nm-strongswan-dialog.ui.h:14 +msgid "<b>Options</b>" +msgstr "<b>Optionen</b>" + +#: ../properties/nm-strongswan-dialog.ui.h:15 msgid "Request an _inner IP address" msgstr "_Innere IP-Adresse beziehen" -#: ../properties/nm-strongswan-dialog.glade.h:16 -msgid "" -"Some firewalls block ESP traffic. Enforcing UDP capsulation even if no NAT " -"situation is detected might help in such cases." -msgstr "" -"Manche Firewalls blockieren Datenverkehr mit dem ESP-Protokoll. Das " -"erzwingen einer zustzlichen Einbettung in UDP, auch wenn kein NAT-Router " -"detektiert wurde, kann in solchen Situationen hilfreich sein." - -#: ../properties/nm-strongswan-dialog.glade.h:17 +#: ../properties/nm-strongswan-dialog.ui.h:16 msgid "" "The Gateway may provide addresses from a pool to use for communication in " "the Gateways network. Check to request such an address." @@ -128,46 +120,61 @@ "Kommunikation im dahinterliegenden Netz verwenden kann. Aktivieren, um eine " "solche Adresse zu beziehen." -#: ../properties/nm-strongswan-dialog.glade.h:18 -msgid "The username (identity) to use for authentication against the gateway." -msgstr "Benutzername/Identität für die Authentisierung gegenüber dem Gateway." +#: ../properties/nm-strongswan-dialog.ui.h:17 +msgid "En_force UDP encapsulation" +msgstr "Erzwingen einer zusätzlichen Einbettung der Datenpakete in _UDP" -#: ../properties/nm-strongswan-dialog.glade.h:19 +#: ../properties/nm-strongswan-dialog.ui.h:18 +msgid "" +"Some firewalls block ESP traffic. Enforcing UDP capsulation even if no NAT " +"situation is detected might help in such cases." +msgstr "" +"Manche Firewalls blockieren Datenverkehr mit dem ESP-Protokoll. Das " +"erzwingen einer zustzlichen Einbettung in UDP, auch wenn kein NAT-Router " +"detektiert wurde, kann in solchen Situationen hilfreich sein." + +#: ../properties/nm-strongswan-dialog.ui.h:19 msgid "Use IP c_ompression" msgstr "IP-Pakete k_omprimieren" -#: ../properties/nm-strongswan-dialog.glade.h:20 -msgid "_Address:" -msgstr "_Adresse:" - -#: ../properties/nm-strongswan-dialog.glade.h:21 -msgid "_Username:" -msgstr "_Benutzername:" +#: ../properties/nm-strongswan-dialog.ui.h:20 +msgid "" +"IPComp compresses raw IP packets before they get encrypted. This saves some " +"bandwidth, but uses more processing power." +msgstr "" +"IPComp komprimiert IP-Pakete, bevor sie verschlüsselt werden. Diese Option " +"kann Bandbreite sparen, benötigt jedoch zusätzliche Rechenleistung." -#: ../auth-dialog/main.c:172 ../auth-dialog/main.c:179 -#: ../auth-dialog/main.c:186 +#: ../auth-dialog/main.c:170 ../auth-dialog/main.c:177 +#: ../auth-dialog/main.c:184 ../auth-dialog/main.c:191 msgid "VPN password required" msgstr "VPN Passwort notwendig" -#: ../auth-dialog/main.c:173 +#: ../auth-dialog/main.c:171 msgid "EAP password required to establish VPN connection:" msgstr "Für die Erstellung des VPN-Tunnels ist ein EAP-Passwort erforderlich:" -#: ../auth-dialog/main.c:180 +#: ../auth-dialog/main.c:178 msgid "Private key decryption password required to establish VPN connection:" msgstr "" "Der Private Schlüssel für die Erstellung des VPN-Tunnels ist durch ein " "Passwort geschützt:" -#: ../auth-dialog/main.c:187 -#, fuzzy +#: ../auth-dialog/main.c:185 +msgid "" +"Pre-shared key required to establish VPN connection (min. 20 characters):" +msgstr "" +"Für die Erstellung des VPN-Tunnels ist ein Pre-shared Key erforderlich (min. " +"20 Zeichen):" + +#: ../auth-dialog/main.c:192 msgid "Smartcard PIN required to establish VPN connection:" msgstr "Für die Smartcard ist eine PIN erforderlich:" -#: ../auth-dialog/main.c:233 +#: ../auth-dialog/main.c:242 msgid "" "Configuration uses ssh-agent for authentication, but ssh-agent is not " "running!" msgstr "" -"Die Konfiguration verwendet ssh-agent fr die Authentisierung, aber ssh-agent " -"ist nicht gestartet!" +"Die Konfiguration verwendet ssh-agent für die Authentisierung, aber ssh-" +"agent ist nicht gestartet!" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/NetworkManager-strongswan-1.3.0/properties/nm-strongswan.c new/NetworkManager-strongswan-1.3.1/properties/nm-strongswan.c --- old/NetworkManager-strongswan-1.3.0/properties/nm-strongswan.c 2011-09-07 13:58:05.000000000 +0200 +++ new/NetworkManager-strongswan-1.3.1/properties/nm-strongswan.c 2014-04-17 15:56:29.000000000 +0200 @@ -1,4 +1,5 @@ /* + * Copyright (C) 2013 Tobias Brunner * Copyright (C) 2008 Martin Willi * Hochschule fuer Technik Rapperswil * Copyright (C) 2005 David Zeuthen @@ -30,7 +31,6 @@ #include <nm-vpn-plugin-ui-interface.h> #include <nm-setting-vpn.h> #include <nm-setting-connection.h> -#include <nm-setting-ip4-config.h> #include "nm-strongswan.h" @@ -149,6 +149,7 @@ gtk_widget_hide (GTK_WIDGET (gtk_builder_get_object (priv->builder, "userkey-button"))); break; case 3: + case 4: gtk_widget_show (GTK_WIDGET (gtk_builder_get_object (priv->builder, "user-label"))); gtk_widget_show (GTK_WIDGET (gtk_builder_get_object (priv->builder, "user-entry"))); gtk_widget_hide (GTK_WIDGET (gtk_builder_get_object (priv->builder, "usercert-label"))); @@ -208,6 +209,7 @@ gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (widget), _("Certificate/ssh-agent")); gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (widget), _("Smartcard")); gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (widget), _("EAP")); + gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (widget), _("Pre-shared key")); value = nm_setting_vpn_get_data_item (settings, "method"); if (value) { if (g_strcmp0 (value, "key") == 0) { @@ -222,6 +224,9 @@ if (g_strcmp0 (value, "eap") == 0) { gtk_combo_box_set_active (GTK_COMBO_BOX (widget), 3); } + if (g_strcmp0 (value, "psk") == 0) { + gtk_combo_box_set_active (GTK_COMBO_BOX (widget), 4); + } } if (gtk_combo_box_get_active (GTK_COMBO_BOX (widget)) == -1) { @@ -351,6 +356,14 @@ } str = "eap"; break; + case 4: + widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "user-entry")); + str = (char *) gtk_entry_get_text (GTK_ENTRY (widget)); + if (str && strlen (str)) { + nm_setting_vpn_add_data_item (settings, "user", str); + } + str = "psk"; + break; } nm_setting_vpn_add_data_item (settings, "method", str); @@ -366,16 +379,8 @@ active = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)); nm_setting_vpn_add_data_item (settings, "ipcomp", active ? "yes" : "no"); - - if (!nm_setting_set_secret_flags (NM_SETTING (settings), - "password", NM_SETTING_SECRET_FLAG_AGENT_OWNED, NULL)) - { - fprintf(stderr, "no\n"); - } - else - { - fprintf(stderr, "yes\n"); - } + nm_setting_set_secret_flags (NM_SETTING (settings), "password", + NM_SETTING_SECRET_FLAG_AGENT_OWNED, NULL); nm_connection_add_setting (connection, NM_SETTING (settings)); return TRUE; @@ -544,4 +549,3 @@ return NM_VPN_PLUGIN_UI_INTERFACE (g_object_new (STRONGSWAN_TYPE_PLUGIN_UI, NULL)); } - -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit NetworkManager-gnome for openSUSE:Factory
by root＠hilbert.suse.de 26 Apr '14

26 Apr '14

Hello community, here is the log from the commit of package NetworkManager-gnome for openSUSE:Factory checked in at 2014-04-26 10:09:01 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/NetworkManager-gnome (Old) and /work/SRC/openSUSE:Factory/.NetworkManager-gnome.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "NetworkManager-gnome" Changes: -------- --- /work/SRC/openSUSE:Factory/NetworkManager-gnome/NetworkManager-gnome.changes 2014-04-08 11:46:09.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.NetworkManager-gnome.new/NetworkManager-gnome.changes 2014-04-26 10:09:02.000000000 +0200 @@ -1,0 +2,8 @@ +Fri Apr 25 08:20:46 UTC 2014 - dimstar(a)opensuse.org + +- Update to version 0.9.8.10: + + Fixed the applet to not show the PIN unlock dialog even if the + PIN was saved in the keyring. + + Fixed a GSettings-related warning when using GLib 2.40. + +------------------------------------------------------------------- Old: ---- network-manager-applet-0.9.8.9.tar.xz New: ---- network-manager-applet-0.9.8.10.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ NetworkManager-gnome.spec ++++++ --- /var/tmp/diff_new_pack.OVfYfX/_old 2014-04-26 10:09:03.000000000 +0200 +++ /var/tmp/diff_new_pack.OVfYfX/_new 2014-04-26 10:09:03.000000000 +0200 @@ -18,7 +18,7 @@ Name: NetworkManager-gnome Url: http://www.gnome.org/projects/NetworkManager/ -Version: 0.9.8.9 +Version: 0.9.8.10 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: dbus-1-devel ++++++ network-manager-applet-0.9.8.9.tar.xz -> network-manager-applet-0.9.8.10.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/network-manager-applet-0.9.8.9/NEWS new/network-manager-applet-0.9.8.10/NEWS --- old/network-manager-applet-0.9.8.9/NEWS 2014-04-02 19:52:35.000000000 +0200 +++ new/network-manager-applet-0.9.8.10/NEWS 2014-04-24 18:00:03.000000000 +0200 @@ -1,16 +1,18 @@ ========================================================= -network-manager-applet-0.9.8.9 +network-manager-applet-0.9.8.10 Overview of changes since network-manager-applet-0.9.8.8 ========================================================= -This is a pre-release of an upcoming stable release of -network-manager-applet. Notable changes include: +This is a new stable release of network-manager-applet. Notable changes include: * Changed the default configuration of WPA Enterprise EAP certificate lookup to not use the system CA store by default, since this turns out to be a bad default. +* Fixed the applet to not show the PIN unlock dialog even if the PIN was + saved in the keyring. * We no longer try to build the bluetooth widget when using newer versions of gnome-bluetooth (that no longer support plugins) +* Fixed a GSettings-related warning when using GLib 2.40 * Updated translations ========================================================= diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/network-manager-applet-0.9.8.9/configure new/network-manager-applet-0.9.8.10/configure --- old/network-manager-applet-0.9.8.9/configure 2014-04-02 21:06:40.000000000 +0200 +++ new/network-manager-applet-0.9.8.10/configure 2014-04-24 18:00:59.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for nm-applet 0.9.8.9. +# Generated by GNU Autoconf 2.69 for nm-applet 0.9.8.10. # # Report bugs to <https://bugzilla.gnome.org/enter_bug.cgi?product=NetworkManager>. # @@ -591,8 +591,8 @@ # Identity of this package. PACKAGE_NAME='nm-applet' PACKAGE_TARNAME='network-manager-applet' -PACKAGE_VERSION='0.9.8.9' -PACKAGE_STRING='nm-applet 0.9.8.9' +PACKAGE_VERSION='0.9.8.10' +PACKAGE_STRING='nm-applet 0.9.8.10' PACKAGE_BUGREPORT='https://bugzilla.gnome.org/enter_bug.cgi?product=NetworkManager' PACKAGE_URL='' @@ -1457,7 +1457,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures nm-applet 0.9.8.9 to adapt to many kinds of systems. +\`configure' configures nm-applet 0.9.8.10 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1528,7 +1528,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of nm-applet 0.9.8.9:";; + short | recursive ) echo "Configuration of nm-applet 0.9.8.10:";; esac cat <<\_ACEOF @@ -1698,7 +1698,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -nm-applet configure 0.9.8.9 +nm-applet configure 0.9.8.10 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2121,7 +2121,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by nm-applet $as_me 0.9.8.9, which was +It was created by nm-applet $as_me 0.9.8.10, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2989,7 +2989,7 @@ # Define the identity of the package. PACKAGE='network-manager-applet' - VERSION='0.9.8.9' + VERSION='0.9.8.10' cat >>confdefs.h <<_ACEOF @@ -16395,7 +16395,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by nm-applet $as_me 0.9.8.9, which was +This file was extended by nm-applet $as_me 0.9.8.10, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -16461,7 +16461,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -nm-applet config.status 0.9.8.9 +nm-applet config.status 0.9.8.10 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/network-manager-applet-0.9.8.9/configure.ac new/network-manager-applet-0.9.8.10/configure.ac --- old/network-manager-applet-0.9.8.9/configure.ac 2014-04-02 20:33:49.000000000 +0200 +++ new/network-manager-applet-0.9.8.10/configure.ac 2014-04-24 18:00:25.000000000 +0200 @@ -1,6 +1,6 @@ AC_PREREQ([2.63]) AC_INIT([nm-applet], - [0.9.8.9], + [0.9.8.10], [https://bugzilla.gnome.org/enter_bug.cgi?product=NetworkManager] [network-manager-applet]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/network-manager-applet-0.9.8.9/po/id.po new/network-manager-applet-0.9.8.10/po/id.po --- old/network-manager-applet-0.9.8.9/po/id.po 2014-04-02 16:59:17.000000000 +0200 +++ new/network-manager-applet-0.9.8.10/po/id.po 2014-04-24 17:53:18.000000000 +0200 @@ -2,25 +2,25 @@ # Copyright (C) 2009 THE network-manager-applet'S COPYRIGHT HOLDER # This file is distributed under the same license as the network-manager-applet package. # -# Andika Triwidada <andika(a)gmail.com>, 2009-2013. -# Dirgita <dirgitadevina(a)yahoo.co.id>, 2011. # +# Andika Triwidada <andika(a)gmail.com>, 2009, 2010, 2011, 2012, 2013. +# Dirgita <dirgitadevina(a)yahoo.co.id>, 2011, 2014. msgid "" msgstr "" "Project-Id-Version: network-manager-applet nma-0-9-8\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" "product=NetworkManager&keywords=I18N+L10N&component=nm-applet\n" -"POT-Creation-Date: 2013-06-28 20:18+0000\n" -"PO-Revision-Date: 2013-07-02 19:58+0700\n" -"Last-Translator: Andika Triwidada <andika(a)gmail.com>\n" -"Language-Team: Indonesian <gnome(a)i15n.org>\n" -"Language: id\n" +"POT-Creation-Date: 2014-04-05 22:47+0000\n" +"PO-Revision-Date: 2014-04-10 19:35+0700\n" +"Last-Translator: Dirgita <dirgitadevina(a)gmail.com>\n" +"Language-Team: Indonesian <gnome-l10n-id(a)googlegroups.com>\n" +"Language: Indonesian\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" "X-Poedit-SourceCharset: UTF-8\n" -"X-Generator: Poedit 1.5.5\n" +"X-Generator: Lokalize 1.5\n" #: ../nm-applet.desktop.in.h:1 msgid "Network" @@ -129,37 +129,37 @@ msgid "_Network name:" msgstr "_Nama jaringan:" -#: ../src/applet.c:541 +#: ../src/applet.c:539 msgid "Failed to add/activate connection" msgstr "Gagal menambah/mengaktifkan koneksi" -#: ../src/applet.c:543 ../src/applet.c:587 ../src/applet.c:613 +#: ../src/applet.c:541 ../src/applet.c:585 ../src/applet.c:611 #: ../src/applet-device-wifi.c:1376 ../src/applet-device-wifi.c:1395 msgid "Unknown error" msgstr "Galat tak dikenal" -#: ../src/applet.c:546 ../src/applet.c:616 ../src/applet-device-wifi.c:1379 +#: ../src/applet.c:544 ../src/applet.c:614 ../src/applet-device-wifi.c:1379 #: ../src/applet-device-wifi.c:1398 msgid "Connection failure" msgstr "Kegagalan koneksi" -#: ../src/applet.c:585 +#: ../src/applet.c:583 msgid "Device disconnect failed" msgstr "Pemutusan perangkat gagal" -#: ../src/applet.c:590 +#: ../src/applet.c:588 msgid "Disconnect failure" msgstr "Pemutusan gagal" -#: ../src/applet.c:611 +#: ../src/applet.c:609 msgid "Connection activation failed" msgstr "Aktivasi koneksi gagal" -#: ../src/applet.c:982 ../src/applet-device-wifi.c:1069 +#: ../src/applet.c:980 ../src/applet-device-wifi.c:1069 msgid "Don't show this message again" msgstr "Jangan tunjukkan pesan ini lagi" -#: ../src/applet.c:1071 +#: ../src/applet.c:1069 #, c-format msgid "" "\n" @@ -169,7 +169,7 @@ "\n" "Sambungan VPN '%s' gagal karena sambungan jaringan terputus." -#: ../src/applet.c:1074 +#: ../src/applet.c:1072 #, c-format msgid "" "\n" @@ -178,7 +178,7 @@ "\n" "Sambungan VPN '%s' gagal karena layanan VPN berhenti tak disangka-sangka." -#: ../src/applet.c:1077 +#: ../src/applet.c:1075 #, c-format msgid "" "\n" @@ -189,7 +189,7 @@ "Sambungan VPN '%s' gagal karena layanan VPN mengembalikan konfigurasi yang " "tidak benar." -#: ../src/applet.c:1080 +#: ../src/applet.c:1078 #, c-format msgid "" "\n" @@ -198,7 +198,7 @@ "\n" "Sambungan VPN '%s' gagal karena batas waktu percobaan sambungan sudah habis." -#: ../src/applet.c:1083 +#: ../src/applet.c:1081 #, c-format msgid "" "\n" @@ -207,7 +207,7 @@ "\n" "Sambungan VPN '%s' gagal karena layanan VPN tidak mulai pada waktunya." -#: ../src/applet.c:1086 +#: ../src/applet.c:1084 #, c-format msgid "" "\n" @@ -216,7 +216,7 @@ "\n" "Sambungan VPN '%s' gagal karena layanan VPN gagal dijalankan." -#: ../src/applet.c:1089 +#: ../src/applet.c:1087 #, c-format msgid "" "\n" @@ -225,7 +225,7 @@ "\n" "Sambungan VPN '%s' gagal karena tidak ada kode rahasia VPN yang valid." -#: ../src/applet.c:1092 +#: ../src/applet.c:1090 #, c-format msgid "" "\n" @@ -234,7 +234,7 @@ "\n" "Sambungan VPN '%s' gagal karena kode rahasia VPN yang tak valid." -#: ../src/applet.c:1099 +#: ../src/applet.c:1097 #, c-format msgid "" "\n" @@ -243,7 +243,7 @@ "\n" "Sambungan VPN '%s' gagal." -#: ../src/applet.c:1117 +#: ../src/applet.c:1115 #, c-format msgid "" "\n" @@ -253,7 +253,7 @@ "\n" "Sambungan VPN '%s' terputus karena sambungan jaringan terputus." -#: ../src/applet.c:1120 +#: ../src/applet.c:1118 #, c-format msgid "" "\n" @@ -262,7 +262,7 @@ "\n" "Sambungan VPN '%s' terputus karena layanan VPN berhenti." -#: ../src/applet.c:1126 +#: ../src/applet.c:1124 #, c-format msgid "" "\n" @@ -271,7 +271,7 @@ "\n" "Sambungan VPN '%s' terputus." -#: ../src/applet.c:1156 +#: ../src/applet.c:1154 #, c-format msgid "" "VPN connection has been successfully established.\n" @@ -282,19 +282,19 @@ "\n" "%s\n" -#: ../src/applet.c:1158 +#: ../src/applet.c:1156 msgid "VPN connection has been successfully established.\n" msgstr "Koneksi VPN telah sukses dijalin.\n" -#: ../src/applet.c:1160 +#: ../src/applet.c:1158 msgid "VPN Login Message" msgstr "Pesan Login VPN" -#: ../src/applet.c:1166 ../src/applet.c:1174 ../src/applet.c:1224 +#: ../src/applet.c:1164 ../src/applet.c:1172 ../src/applet.c:1222 msgid "VPN Connection Failed" msgstr "Sambungan VPN Gagal" -#: ../src/applet.c:1231 +#: ../src/applet.c:1229 #, c-format msgid "" "\n" @@ -307,7 +307,7 @@ "\n" "%s" -#: ../src/applet.c:1234 +#: ../src/applet.c:1232 #, c-format msgid "" "\n" @@ -320,169 +320,169 @@ "\n" "%s" -#: ../src/applet.c:1549 +#: ../src/applet.c:1547 msgid "device not ready (firmware missing)" msgstr "perangkat tak siap (tak ada firmware)" -#: ../src/applet.c:1551 +#: ../src/applet.c:1549 msgid "device not ready" msgstr "perangkat tak siap" #. Notify user of unmanaged or unavailable device -#: ../src/applet.c:1561 ../src/applet-device-ethernet.c:229 +#: ../src/applet.c:1559 ../src/applet-device-ethernet.c:229 msgid "disconnected" msgstr "terputus" -#: ../src/applet.c:1577 +#: ../src/applet.c:1575 msgid "Disconnect" msgstr "Putuskan" -#: ../src/applet.c:1591 +#: ../src/applet.c:1589 msgid "device not managed" msgstr "perangkat tidak dikelola" -#: ../src/applet.c:1635 +#: ../src/applet.c:1633 msgid "No network devices available" msgstr "Tak ada perangkat jaringan yang tersedia" -#: ../src/applet.c:1723 +#: ../src/applet.c:1721 msgid "_VPN Connections" msgstr "Sambungan _VPN" -#: ../src/applet.c:1780 +#: ../src/applet.c:1778 msgid "_Configure VPN..." msgstr "Mena_ta VPN..." -#: ../src/applet.c:1784 +#: ../src/applet.c:1782 msgid "_Disconnect VPN" msgstr "_Memutus VPN" -#: ../src/applet.c:1878 +#: ../src/applet.c:1876 msgid "NetworkManager is not running..." msgstr "NetworkManager tidak sedang jalan..." -#: ../src/applet.c:1883 ../src/applet.c:2735 +#: ../src/applet.c:1881 ../src/applet.c:2733 msgid "Networking disabled" msgstr "Fungsi jaringan dimatikan" #. 'Enable Networking' item -#: ../src/applet.c:2104 +#: ../src/applet.c:2102 msgid "Enable _Networking" msgstr "Fungsika_n Jaringan" #. 'Enable Wi-Fi' item -#: ../src/applet.c:2113 +#: ../src/applet.c:2111 msgid "Enable _Wi-Fi" msgstr "Fungsikan Ni_rkabel" #. 'Enable Mobile Broadband' item -#: ../src/applet.c:2122 +#: ../src/applet.c:2120 msgid "Enable _Mobile Broadband" msgstr "Fungsikan _Data Seluler" #. 'Enable WiMAX Mobile Broadband' item -#: ../src/applet.c:2131 +#: ../src/applet.c:2129 msgid "Enable WiMA_X Mobile Broadband" msgstr "Fungsikan Data Seluler WiMA_X" #. Toggle notifications item -#: ../src/applet.c:2142 +#: ../src/applet.c:2140 msgid "Enable N_otifications" msgstr "Fungsikan N_otifikasi" #. 'Connection Information' item -#: ../src/applet.c:2153 +#: ../src/applet.c:2151 msgid "Connection _Information" msgstr "_Informasi Sambungan" #. 'Edit Connections...' item -#: ../src/applet.c:2163 +#: ../src/applet.c:2161 msgid "Edit Connections..." msgstr "Sunting Sambungan..." #. Help item -#: ../src/applet.c:2177 +#: ../src/applet.c:2175 msgid "_Help" msgstr "Ba_ntuan" #. About item -#: ../src/applet.c:2186 +#: ../src/applet.c:2184 msgid "_About" msgstr "Tent_ang" -#: ../src/applet.c:2364 +#: ../src/applet.c:2362 msgid "Disconnected" msgstr "Terputus" -#: ../src/applet.c:2365 +#: ../src/applet.c:2363 msgid "The network connection has been disconnected." msgstr "Sambungan jaringan terputus." -#: ../src/applet.c:2598 +#: ../src/applet.c:2596 #, c-format msgid "Preparing network connection '%s'..." msgstr "Menyiapkan sambungan jaringan '%s'..." -#: ../src/applet.c:2601 +#: ../src/applet.c:2599 #, c-format msgid "User authentication required for network connection '%s'..." msgstr "Otentikasi pengguna diperlukan untuk sambungan jaringan '%s'..." -#: ../src/applet.c:2604 ../src/applet-device-bt.c:235 +#: ../src/applet.c:2602 ../src/applet-device-bt.c:235 #: ../src/applet-device-wimax.c:469 ../src/mobile-helpers.c:594 #, c-format msgid "Requesting a network address for '%s'..." msgstr "Meminta alamat jaringan untuk '%s'..." -#: ../src/applet.c:2607 +#: ../src/applet.c:2605 #, c-format msgid "Network connection '%s' active" msgstr "Sambungan jaringan '%s' aktif" -#: ../src/applet.c:2690 +#: ../src/applet.c:2688 #, c-format msgid "Starting VPN connection '%s'..." msgstr "Memulai sambungan VPN '%s'..." -#: ../src/applet.c:2693 +#: ../src/applet.c:2691 #, c-format msgid "User authentication required for VPN connection '%s'..." msgstr "Otentikasi pengguna diperlukan untuk sambungan VPN '%s'..." -#: ../src/applet.c:2696 +#: ../src/applet.c:2694 #, c-format msgid "Requesting a VPN address for '%s'..." msgstr "Meminta alamat VPN untuk '%s'..." -#: ../src/applet.c:2699 +#: ../src/applet.c:2697 #, c-format msgid "VPN connection '%s' active" msgstr "Sambungan VPN '%s' aktif" -#: ../src/applet.c:2740 +#: ../src/applet.c:2738 msgid "No network connection" msgstr "Tak ada sambungan jaringan" -#: ../src/applet.c:3442 +#: ../src/applet.c:3426 msgid "NetworkManager Applet" msgstr "Aplet NetworkManager" #: ../src/applet-device-bt.c:169 ../src/applet-device-cdma.c:303 -#: ../src/applet-device-ethernet.c:237 ../src/applet-device-broadband.c:772 +#: ../src/applet-device-ethernet.c:237 ../src/applet-device-broadband.c:769 #: ../src/applet-device-gsm.c:359 ../src/applet-device-wifi.c:859 #: ../src/applet-device-wimax.c:275 msgid "Available" msgstr "Tersedia" #: ../src/applet-device-bt.c:195 ../src/applet-device-cdma.c:345 -#: ../src/applet-device-ethernet.c:266 ../src/applet-device-broadband.c:816 +#: ../src/applet-device-ethernet.c:266 ../src/applet-device-broadband.c:813 #: ../src/applet-device-gsm.c:401 ../src/applet-device-wimax.c:419 #, c-format msgid "You are now connected to '%s'." msgstr "Anda sekarang tersambung ke '%s'." #: ../src/applet-device-bt.c:199 ../src/applet-device-cdma.c:349 -#: ../src/applet-device-ethernet.c:270 ../src/applet-device-broadband.c:820 +#: ../src/applet-device-ethernet.c:270 ../src/applet-device-broadband.c:817 #: ../src/applet-device-gsm.c:405 ../src/applet-device-wifi.c:1261 #: ../src/applet-device-wimax.c:423 msgid "Connection Established" @@ -508,20 +508,20 @@ #: ../src/mobile-helpers.c:591 #, c-format msgid "User authentication required for mobile broadband connection '%s'..." -msgstr "Otentikasi pengguna dibutuhkan untuk sambungan data seluler '%s'..." +msgstr "Otentikasi pengguna diperlukan untuk sambungan data seluler '%s'..." #: ../src/applet-device-bt.c:239 ../src/mobile-helpers.c:611 #, c-format msgid "Mobile broadband connection '%s' active" msgstr "Sambungan data seluler '%s' aktif" -#: ../src/applet-device-cdma.c:249 ../src/applet-device-broadband.c:718 +#: ../src/applet-device-cdma.c:249 ../src/applet-device-broadband.c:715 #: ../src/applet-device-gsm.c:305 ../src/applet-dialogs.c:424 #, c-format msgid "Mobile Broadband (%s)" msgstr "Data Seluler (%s)" -#: ../src/applet-device-cdma.c:251 ../src/applet-device-broadband.c:720 +#: ../src/applet-device-cdma.c:251 ../src/applet-device-broadband.c:717 #: ../src/applet-device-gsm.c:307 #: ../src/connection-editor/new-connection.c:113 #: ../src/connection-editor/page-mobile.c:389 @@ -542,12 +542,12 @@ msgid "CDMA network." msgstr "Jaringan CDMA." -#: ../src/applet-device-cdma.c:418 ../src/applet-device-broadband.c:958 +#: ../src/applet-device-cdma.c:418 ../src/applet-device-broadband.c:955 #: ../src/applet-device-gsm.c:678 msgid "You are now registered on the home network." msgstr "Anda kini terdaftar ke jaringan rumah." -#: ../src/applet-device-cdma.c:424 ../src/applet-device-broadband.c:964 +#: ../src/applet-device-cdma.c:424 ../src/applet-device-broadband.c:961 #: ../src/applet-device-gsm.c:684 msgid "You are now registered on a roaming network." msgstr "Anda kini terdaftar ke jaringan roaming." @@ -621,15 +621,15 @@ msgstr "Mengirim kode pembuka..." #. Default connection item -#: ../src/applet-device-broadband.c:785 +#: ../src/applet-device-broadband.c:782 msgid "New Mobile Broadband connection..." msgstr "Sambungan Data Seluler baru…" -#: ../src/applet-device-broadband.c:821 +#: ../src/applet-device-broadband.c:818 msgid "You are now connected to the Mobile Broadband network." msgstr "Anda kini tersambung ke jaringan Data Seluler." -#: ../src/applet-device-broadband.c:957 ../src/applet-device-broadband.c:963 +#: ../src/applet-device-broadband.c:954 ../src/applet-device-broadband.c:960 msgid "Mobile Broadband network." msgstr "Jaringan Data Seluler." @@ -1125,7 +1125,7 @@ "Pilih tipe koneksi yang ingin Anda buat.\n" "\n" "Bila Anda membuat suatu VPN, dan sambungan VPN yang ingin Anda buat tidak " -"muncul pada daftar, mungkin Anda belum memasang plugin VPN yang tepat." +"muncul pada daftar, mungkin Anda belum memasang pengaya VPN yang tepat." #: ../src/connection-editor/ce-new-connection.ui.h:6 msgid "Create…" @@ -1601,7 +1601,7 @@ #: ../src/connection-editor/ce-page-mobile.ui.h:18 msgid "Allow _roaming if home network is not available" -msgstr "Ijinkan _roaming bila jaringan rumah tak tersedia" +msgstr "Izinkan _roaming bila jaringan rumah tak tersedia" #: ../src/connection-editor/ce-page-mobile.ui.h:19 msgid "Sho_w passwords" @@ -1613,7 +1613,7 @@ #: ../src/connection-editor/ce-page-ppp.ui.h:2 msgid "Allowed methods:" -msgstr "Metoda yang diijinkan:" +msgstr "Metoda yang diizinkan:" #: ../src/connection-editor/ce-page-ppp.ui.h:3 msgid "Configure _Methods…" @@ -1637,11 +1637,11 @@ #: ../src/connection-editor/ce-page-ppp.ui.h:8 msgid "Allow _BSD data compression" -msgstr "Ijinkan pemampatan data _BSD" +msgstr "Izinkan pemampatan data _BSD" #: ../src/connection-editor/ce-page-ppp.ui.h:9 msgid "Allow _Deflate data compression" -msgstr "Ijinkan pemampatan data _Deflate" +msgstr "Izinkan pemampatan data _Deflate" #: ../src/connection-editor/ce-page-ppp.ui.h:10 msgid "Use TCP _header compression" @@ -1739,7 +1739,7 @@ #: ../src/connection-editor/ce-ppp-auth-methods.ui.h:1 msgid "Allowed Authentication Methods" -msgstr "Metoda Otentikasi yang Diijinkan" +msgstr "Metoda Otentikasi yang Diizinkan" #: ../src/connection-editor/ce-ppp-auth-methods.ui.h:2 msgid "_EAP" @@ -1848,7 +1848,7 @@ msgstr "InfiniBand" #: ../src/connection-editor/new-connection.c:137 -#: ../src/connection-editor/page-bond.c:419 ../src/libnm-gtk/nm-ui-utils.c:337 +#: ../src/connection-editor/page-bond.c:439 ../src/libnm-gtk/nm-ui-utils.c:337 #: ../src/libnm-gtk/nm-ui-utils.c:559 msgid "Bond" msgstr "Bond" @@ -1860,7 +1860,7 @@ msgstr "Bridge" #: ../src/connection-editor/new-connection.c:149 -#: ../src/connection-editor/page-vlan.c:480 ../src/libnm-gtk/nm-ui-utils.c:341 +#: ../src/connection-editor/page-vlan.c:484 ../src/libnm-gtk/nm-ui-utils.c:341 #: ../src/libnm-gtk/nm-ui-utils.c:563 msgid "VLAN" msgstr "VLAN" @@ -2051,12 +2051,12 @@ #: ../src/connection-editor/nm-connection-list.c:943 msgid "No VPN plugins are installed." -msgstr "Tak ada plugin VPN yang terpasang." +msgstr "Tak ada pengaya VPN yang terpasang." #: ../src/connection-editor/nm-connection-list.c:945 #, c-format msgid "Don't know how to create '%s' connections" -msgstr "Tidak tahu bagaimana membuat sambungan '%s'" +msgstr "Tak tahu bagaimana membuat sambungan '%s'" #: ../src/connection-editor/nm-connection-list.c:947 msgid "Error creating connection" @@ -2069,7 +2069,7 @@ #: ../src/connection-editor/nm-connection-list.c:1004 #, c-format msgid "Did not find a connection with UUID '%s'" -msgstr "Tidak menemukan koneksi dengan UUID '%s'" +msgstr "Tak menemukan koneksi dengan UUID '%s'" #: ../src/connection-editor/page-8021x-security.c:121 msgid "802.1x Security" @@ -2077,17 +2077,17 @@ #: ../src/connection-editor/page-8021x-security.c:123 msgid "Could not load 802.1x Security user interface." -msgstr "Tidak dapat memuat antar muka pengguna Keamanan 802.1x." +msgstr "Tak dapat memuat antar muka pengguna Keamanan 802.1x." #: ../src/connection-editor/page-8021x-security.c:141 msgid "Use 802.1_X security for this connection" msgstr "Gunakan keamanan 802.1_X untuk sambungan ini" -#: ../src/connection-editor/page-bond.c:422 +#: ../src/connection-editor/page-bond.c:442 msgid "Could not load bond user interface." msgstr "Tak dapat memuat antar muka pengguna bond." -#: ../src/connection-editor/page-bond.c:561 +#: ../src/connection-editor/page-bond.c:584 #, c-format msgid "Bond connection %d" msgstr "Koneksi bond %d" @@ -2277,7 +2277,7 @@ #: ../src/connection-editor/page-mobile.c:391 msgid "Could not load mobile broadband user interface." -msgstr "Tidak dapat memuat antar muka pengguna data seluler." +msgstr "Tak dapat memuat antar muka pengguna data seluler." #: ../src/connection-editor/page-mobile.c:408 msgid "Unsupported mobile broadband connection type." @@ -2359,11 +2359,11 @@ msgid "Could not load PPP user interface." msgstr "Tak dapat memuat antar muka pengguna PPP." -#: ../src/connection-editor/page-vlan.c:482 +#: ../src/connection-editor/page-vlan.c:486 msgid "Could not load vlan user interface." msgstr "Tak dapat memuat antar muka pengguna vlan." -#: ../src/connection-editor/page-vlan.c:678 +#: ../src/connection-editor/page-vlan.c:682 #, c-format msgid "VLAN connection %d" msgstr "Sambungan VLAN %d" @@ -2375,7 +2375,7 @@ #: ../src/connection-editor/page-vpn.c:130 #, c-format msgid "Could not find VPN plugin service for '%s'." -msgstr "Tak dapat menemukan layanan plugin VPN bagi '%s'." +msgstr "Tak menemukan layanan pengaya VPN bagi '%s'." #: ../src/connection-editor/page-vpn.c:224 #: ../src/connection-editor/page-vpn.c:321 @@ -2389,7 +2389,7 @@ "\n" "Error: no VPN service type." msgstr "" -"Plugin VPN gagal mengimpor sambungan VPN dengan benar\n" +"Pengaya VPN gagal mengimpor sambungan VPN dengan benar\n" "\n" "Galat: tak ada tipe layanan VPN." @@ -2405,7 +2405,7 @@ msgstr "" "Pilih tipe VPN yang ingin Anda pakai untuk sambungan baru. Bila tipe " "sambungan VPN yang ingin Anda buat tidak muncul pada daftar, mungkin Anda " -"belum memasang plugin VPN yang tepat." +"belum memasang pengaya VPN yang tepat." #: ../src/connection-editor/page-wifi.c:98 msgid "" @@ -2488,11 +2488,11 @@ msgid "WiMAX connection %d" msgstr "Koneksi WiMAX %d" -#: ../src/connection-editor/vpn-helpers.c:207 +#: ../src/connection-editor/vpn-helpers.c:212 msgid "Cannot import VPN connection" msgstr "Tak dapat mengimpor sambungan VPN" -#: ../src/connection-editor/vpn-helpers.c:209 +#: ../src/connection-editor/vpn-helpers.c:214 #, c-format msgid "" "The file '%s' could not be read or does not contain recognized VPN " @@ -2505,31 +2505,31 @@ "\n" "Galat: %s." -#: ../src/connection-editor/vpn-helpers.c:241 +#: ../src/connection-editor/vpn-helpers.c:239 msgid "Select file to import" msgstr "Pilih berkas untuk diimpor" -#: ../src/connection-editor/vpn-helpers.c:292 +#: ../src/connection-editor/vpn-helpers.c:289 #, c-format msgid "A file named \"%s\" already exists." msgstr "Berkas bernama \"%s\" sudah ada." -#: ../src/connection-editor/vpn-helpers.c:294 +#: ../src/connection-editor/vpn-helpers.c:291 msgid "_Replace" msgstr "_Timpa" -#: ../src/connection-editor/vpn-helpers.c:296 +#: ../src/connection-editor/vpn-helpers.c:293 #, c-format msgid "Do you want to replace %s with the VPN connection you are saving?" msgstr "" "Apakah Anda ingin menggantikan %s dengan sambungan VPN yang sedang Anda " "simpan?" -#: ../src/connection-editor/vpn-helpers.c:332 +#: ../src/connection-editor/vpn-helpers.c:329 msgid "Cannot export VPN connection" -msgstr "Tidak dapat mengekspor sambungan VPN" +msgstr "Tak dapat mengekspor sambungan VPN" -#: ../src/connection-editor/vpn-helpers.c:334 +#: ../src/connection-editor/vpn-helpers.c:331 #, c-format msgid "" "The VPN connection '%s' could not be exported to %s.\n" @@ -2540,7 +2540,7 @@ "\n" "Galat: %s." -#: ../src/connection-editor/vpn-helpers.c:369 +#: ../src/connection-editor/vpn-helpers.c:366 msgid "Export VPN connection..." msgstr "Ekspor sambungan VPN..." @@ -2879,7 +2879,7 @@ #: ../src/libnm-gtk/nm-wifi-dialog.c:1158 msgid "Authentication required by Wi-Fi network" -msgstr "Otentikasi dibutuhkan oleh jaringan Wi-Fi" +msgstr "Otentikasi diperlukan oleh jaringan Wi-Fi" #: ../src/libnm-gtk/nm-wifi-dialog.c:1163 msgid "Create New Wi-Fi Network" @@ -2921,11 +2921,11 @@ msgid "Wi-Fi _adapter:" msgstr "_Adaptor Wi-Fi:" -#: ../src/main.c:73 +#: ../src/main.c:72 msgid "Usage:" msgstr "Penggunaan:" -#: ../src/main.c:75 +#: ../src/main.c:74 msgid "" "This program is a component of NetworkManager (https://wiki.gnome.org/" "Projects/NetworkManager/)." @@ -2933,7 +2933,7 @@ "Program ini adalah komponen dari NetworkManager (https://wiki.gnome.org/" "Projects/NetworkManager/)." -#: ../src/main.c:76 +#: ../src/main.c:75 msgid "" "It is not intended for command-line interaction but instead runs in the " "GNOME desktop environment." @@ -3034,7 +3034,7 @@ #: ../src/mobile-helpers.c:458 msgid "PIN code is needed for the mobile broadband device" -msgstr "Kode PIN dibutuhkan untuk perangkat data seluler" +msgstr "Kode PIN diperlukan untuk perangkat data seluler" #. The %s is a mobile provider name, eg "T-Mobile" #: ../src/utils/utils.c:174 @@ -3044,7 +3044,7 @@ #: ../src/wireless-security/eap-method.c:275 msgid "No Certificate Authority certificate chosen" -msgstr "Tidak ada sertifikat dari Certificate Authority yang dipilih" +msgstr "Tak ada sertifikat dari Certificate Authority yang dipilih" #: ../src/wireless-security/eap-method.c:276 msgid "" @@ -3052,7 +3052,7 @@ "to insecure, rogue Wi-Fi networks. Would you like to choose a Certificate " "Authority certificate?" msgstr "" -"Tidak menggunakan sertifikat dari Certificate Authority (CA) dapat " +"Tak menggunakan sertifikat dari Certificate Authority (CA) dapat " "menyebabkan sambungan ke jaringan Wi-Fi liar yang tak aman. Apakah Anda " "ingin memilih sebuah sertifikat Certificate Authority?" @@ -3115,7 +3115,7 @@ #: ../src/wireless-security/eap-method-fast.ui.h:8 msgid "Allow automatic PAC pro_visioning" -msgstr "Otomatis ijinkan pro_visi PAC" +msgstr "Otomatis izinkan pro_visi PAC" #: ../src/wireless-security/eap-method-peap.c:263 #: ../src/wireless-security/wireless-security.c:382 @@ -3123,7 +3123,7 @@ msgstr "MD5" #: ../src/wireless-security/eap-method-peap.c:350 -#: ../src/wireless-security/eap-method-tls.c:434 +#: ../src/wireless-security/eap-method-tls.c:433 #: ../src/wireless-security/eap-method-ttls.c:350 msgid "Choose a Certificate Authority certificate..." msgstr "Pilih sebuah sertifikat Certificate Authority..." @@ -3150,11 +3150,11 @@ msgid "As_k for this password every time" msgstr "Tanya_kan sandi ini setiap saat" -#: ../src/wireless-security/eap-method-tls.c:260 +#: ../src/wireless-security/eap-method-tls.c:259 msgid "Unencrypted private keys are insecure" msgstr "Kunci privat tak tersandi tidak aman" -#: ../src/wireless-security/eap-method-tls.c:263 +#: ../src/wireless-security/eap-method-tls.c:262 msgid "" "The selected private key does not appear to be protected by a password. " "This could allow your security credentials to be compromised. Please select " @@ -3168,11 +3168,11 @@ "\n" "(Anda dapat melindungi kunci pribadi Anda dengan openssl)" -#: ../src/wireless-security/eap-method-tls.c:428 +#: ../src/wireless-security/eap-method-tls.c:427 msgid "Choose your personal certificate..." msgstr "Pilih sertifikat pribadi Anda..." -#: ../src/wireless-security/eap-method-tls.c:440 +#: ../src/wireless-security/eap-method-tls.c:439 msgid "Choose your private key..." msgstr "Pilih kunci privat Anda..." @@ -3261,3 +3261,5 @@ #: ../src/wireless-security/ws-wep-key.ui.h:10 msgid "WEP inde_x:" msgstr "Inde_ks WEP:" + + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/network-manager-applet-0.9.8.9/src/applet-device-broadband.c new/network-manager-applet-0.9.8.10/src/applet-device-broadband.c --- old/network-manager-applet-0.9.8.9/src/applet-device-broadband.c 2014-04-02 16:30:10.000000000 +0200 +++ new/network-manager-applet-0.9.8.10/src/applet-device-broadband.c 2014-04-24 17:53:18.000000000 +0200 @@ -450,9 +450,6 @@ /* Couldn't get a device ID, but unlock required; present dialog */ unlock_dialog_new (info->device, info); } - - /* Couldn't get a device ID, but unlock required; present dialog */ - unlock_dialog_new (info->device, info); } /********************************************************************/ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/network-manager-applet-0.9.8.9/src/connection-editor/ip4-routes-dialog.c new/network-manager-applet-0.9.8.10/src/connection-editor/ip4-routes-dialog.c --- old/network-manager-applet-0.9.8.9/src/connection-editor/ip4-routes-dialog.c 2014-04-02 16:30:10.000000000 +0200 +++ new/network-manager-applet-0.9.8.10/src/connection-editor/ip4-routes-dialog.c 2014-04-24 17:53:18.000000000 +0200 @@ -380,7 +380,7 @@ user_data); gtk_editable_insert_text (editable, result, count, position); g_free (last_edited); - last_edited = g_strdup (gtk_editable_get_chars (editable, 0, -1)); + last_edited = gtk_editable_get_chars (editable, 0, -1); g_signal_handlers_unblock_by_func (G_OBJECT (editable), G_CALLBACK (ip_address_filter_cb), user_data); @@ -406,7 +406,7 @@ /* Keep last_edited up-to-date */ g_free (last_edited); - last_edited = g_strdup (gtk_editable_get_chars (editable, 0, -1)); + last_edited = gtk_editable_get_chars (editable, 0, -1); /* Desensitize the OK button during input to simplify input validation. * All routes will be validated on focus-out, which will then re-enable @@ -577,7 +577,7 @@ user_data); gtk_editable_insert_text (editable, result, count, position); g_free (last_edited); - last_edited = g_strdup (gtk_editable_get_chars (editable, 0, -1)); + last_edited = gtk_editable_get_chars (editable, 0, -1); g_signal_handlers_unblock_by_func (G_OBJECT (editable), G_CALLBACK (uint_filter_cb), user_data); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/network-manager-applet-0.9.8.9/src/connection-editor/ip6-routes-dialog.c new/network-manager-applet-0.9.8.10/src/connection-editor/ip6-routes-dialog.c --- old/network-manager-applet-0.9.8.9/src/connection-editor/ip6-routes-dialog.c 2014-04-02 16:30:10.000000000 +0200 +++ new/network-manager-applet-0.9.8.10/src/connection-editor/ip6-routes-dialog.c 2014-04-24 17:53:18.000000000 +0200 @@ -331,7 +331,7 @@ user_data); gtk_editable_insert_text (editable, result, count, position); g_free (last_edited); - last_edited = g_strdup (gtk_editable_get_chars (editable, 0, -1)); + last_edited = gtk_editable_get_chars (editable, 0, -1); g_signal_handlers_unblock_by_func (G_OBJECT (editable), G_CALLBACK (ip_address_filter_cb), user_data); @@ -357,7 +357,7 @@ /* Keep last_edited up-to-date */ g_free (last_edited); - last_edited = g_strdup (gtk_editable_get_chars (editable, 0, -1)); + last_edited = gtk_editable_get_chars (editable, 0, -1); /* Desensitize the OK button during input to simplify input validation. * All routes will be validated on focus-out, which will then re-enable @@ -518,7 +518,7 @@ user_data); gtk_editable_insert_text (editable, result, count, position); g_free (last_edited); - last_edited = g_strdup (gtk_editable_get_chars (editable, 0, -1)); + last_edited = gtk_editable_get_chars (editable, 0, -1); g_signal_handlers_unblock_by_func (G_OBJECT (editable), G_CALLBACK (uint_filter_cb), user_data); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/network-manager-applet-0.9.8.9/src/connection-editor/page-ip4.c new/network-manager-applet-0.9.8.10/src/connection-editor/page-ip4.c --- old/network-manager-applet-0.9.8.9/src/connection-editor/page-ip4.c 2014-04-02 16:30:10.000000000 +0200 +++ new/network-manager-applet-0.9.8.10/src/connection-editor/page-ip4.c 2014-04-24 17:53:18.000000000 +0200 @@ -639,7 +639,7 @@ user_data); gtk_editable_insert_text (editable, result, count, position); g_free (priv->last_edited); - priv->last_edited = g_strdup (gtk_editable_get_chars (editable, 0, -1)); + priv->last_edited = gtk_editable_get_chars (editable, 0, -1); g_signal_handlers_unblock_by_func (G_OBJECT (editable), G_CALLBACK (ip_address_filter_cb), user_data); @@ -660,7 +660,7 @@ /* Keep last_edited up-to-date */ g_free (priv->last_edited); - priv->last_edited = g_strdup (gtk_editable_get_chars (editable, 0, -1)); + priv->last_edited = gtk_editable_get_chars (editable, 0, -1); } static gboolean diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/network-manager-applet-0.9.8.9/src/connection-editor/page-ip6.c new/network-manager-applet-0.9.8.10/src/connection-editor/page-ip6.c --- old/network-manager-applet-0.9.8.9/src/connection-editor/page-ip6.c 2014-04-02 16:30:10.000000000 +0200 +++ new/network-manager-applet-0.9.8.10/src/connection-editor/page-ip6.c 2014-04-24 17:53:18.000000000 +0200 @@ -621,7 +621,7 @@ user_data); gtk_editable_insert_text (editable, result, count, position); g_free (priv->last_edited); - priv->last_edited = g_strdup (gtk_editable_get_chars (editable, 0, -1)); + priv->last_edited = gtk_editable_get_chars (editable, 0, -1); g_signal_handlers_unblock_by_func (G_OBJECT (editable), G_CALLBACK (ip_address_filter_cb), user_data); @@ -642,7 +642,7 @@ /* Keep last_edited up-to-date */ g_free (priv->last_edited); - priv->last_edited = g_strdup (gtk_editable_get_chars (editable, 0, -1)); + priv->last_edited = gtk_editable_get_chars (editable, 0, -1); } static gboolean diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/network-manager-applet-0.9.8.9/src/wireless-security/eap-method.c new/network-manager-applet-0.9.8.10/src/wireless-security/eap-method.c --- old/network-manager-applet-0.9.8.9/src/wireless-security/eap-method.c 2014-04-02 16:30:10.000000000 +0200 +++ new/network-manager-applet-0.9.8.10/src/wireless-security/eap-method.c 2014-04-24 17:53:18.000000000 +0200 @@ -118,7 +118,7 @@ GSettings *settings; char *path = NULL; - path = g_strdup_printf ("/org/gnome/nm-applet/eap/%s", uuid); + path = g_strdup_printf ("/org/gnome/nm-applet/eap/%s/", uuid); settings = g_settings_new_with_path ("org.gnome.nm-applet.eap", path); g_free (path); -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit NetworkManager for openSUSE:Factory
by root＠hilbert.suse.de 26 Apr '14

26 Apr '14

Hello community, here is the log from the commit of package NetworkManager for openSUSE:Factory checked in at 2014-04-26 10:08:43 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/NetworkManager (Old) and /work/SRC/openSUSE:Factory/.NetworkManager.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "NetworkManager" Changes: -------- --- /work/SRC/openSUSE:Factory/NetworkManager/NetworkManager.changes 2014-04-08 11:45:45.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.NetworkManager.new/NetworkManager.changes 2014-04-26 10:08:44.000000000 +0200 @@ -1,0 +2,7 @@ +Fri Apr 25 07:15:03 UTC 2014 - dimstar(a)opensuse.org + +- Update to version 0.9.8.10: + + Fixed a bug that allowed a user to disconnect a connection that + they didn't have permissions on. + +------------------------------------------------------------------- Old: ---- NetworkManager-0.9.8.9.tar.xz New: ---- NetworkManager-0.9.8.10.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ NetworkManager.spec ++++++ --- /var/tmp/diff_new_pack.nXH2nz/_old 2014-04-26 10:08:45.000000000 +0200 +++ /var/tmp/diff_new_pack.nXH2nz/_new 2014-04-26 10:08:45.000000000 +0200 @@ -22,7 +22,7 @@ Name: NetworkManager Url: http://www.gnome.org/projects/NetworkManager/ -Version: 0.9.8.9 +Version: 0.9.8.10 Release: 0 Summary: Network Link Manager and User Applications License: GPL-2.0+ ++++++ NetworkManager-0.9.8.9.tar.xz -> NetworkManager-0.9.8.10.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/NetworkManager-0.9.8.9/NEWS new/NetworkManager-0.9.8.10/NEWS --- old/NetworkManager-0.9.8.9/NEWS 2014-04-02 19:45:36.000000000 +0200 +++ new/NetworkManager-0.9.8.10/NEWS 2014-04-24 17:20:40.000000000 +0200 @@ -1,14 +1,15 @@ ================================================ -NetworkManager-0.9.8.9 +NetworkManager-0.9.8.10 Overview of changes since NetworkManager-0.9.8.8 ================================================ -This is a prerelease of an upcoming stable release of NetworkManager. -Notable changes include: +This is a new stable release of NetworkManager. Notable changes include: * Fixed two problems that could result in gnome-shell showing incorrect icons. (In particular, fixed the problem where the network icon would disappear when certain VPNs were activated.) +* Fixed a bug that allowed a user to disconnect a connection that + they didn't have permissions on. * Dispatcher scripts now receive correct IPv6 addresses, and also correct DHCP information on lease-change events. * NetworkManager no longer tries to start ModemManager itself on diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/NetworkManager-0.9.8.9/configure new/NetworkManager-0.9.8.10/configure --- old/NetworkManager-0.9.8.9/configure 2014-04-02 20:57:53.000000000 +0200 +++ new/NetworkManager-0.9.8.10/configure 2014-04-24 17:24:18.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for NetworkManager 0.9.8.9. +# Generated by GNU Autoconf 2.69 for NetworkManager 0.9.8.10. # # Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=NetworkManager>. # @@ -591,8 +591,8 @@ # Identity of this package. PACKAGE_NAME='NetworkManager' PACKAGE_TARNAME='NetworkManager' -PACKAGE_VERSION='0.9.8.9' -PACKAGE_STRING='NetworkManager 0.9.8.9' +PACKAGE_VERSION='0.9.8.10' +PACKAGE_STRING='NetworkManager 0.9.8.10' PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=NetworkManager' PACKAGE_URL='' @@ -1610,7 +1610,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures NetworkManager 0.9.8.9 to adapt to many kinds of systems. +\`configure' configures NetworkManager 0.9.8.10 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1680,7 +1680,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of NetworkManager 0.9.8.9:";; + short | recursive ) echo "Configuration of NetworkManager 0.9.8.10:";; esac cat <<\_ACEOF @@ -1916,7 +1916,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -NetworkManager configure 0.9.8.9 +NetworkManager configure 0.9.8.10 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2460,7 +2460,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by NetworkManager $as_me 0.9.8.9, which was +It was created by NetworkManager $as_me 0.9.8.10, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -3329,7 +3329,7 @@ # Define the identity of the package. PACKAGE='NetworkManager' - VERSION='0.9.8.9' + VERSION='0.9.8.10' cat >>confdefs.h <<_ACEOF @@ -16582,8 +16582,8 @@ NM_MAJOR_VERSION=0 NM_MINOR_VERSION=9 NM_MICRO_VERSION=8 -NM_VERSION=0.9.8.9 -NM_GIT_SHA=76a9c6e0fb7cfd95f08106afa09fd592170eb43c +NM_VERSION=0.9.8.10 +NM_GIT_SHA=b784f9700adc363b077d26e5ac6412ff7c410b22 @@ -24332,7 +24332,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by NetworkManager $as_me 0.9.8.9, which was +This file was extended by NetworkManager $as_me 0.9.8.10, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -24398,7 +24398,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -NetworkManager config.status 0.9.8.9 +NetworkManager config.status 0.9.8.10 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/NetworkManager-0.9.8.9/configure.ac new/NetworkManager-0.9.8.10/configure.ac --- old/NetworkManager-0.9.8.9/configure.ac 2014-04-02 19:45:43.000000000 +0200 +++ new/NetworkManager-0.9.8.10/configure.ac 2014-04-24 17:21:27.000000000 +0200 @@ -4,7 +4,7 @@ m4_define([nm_major_version], [0]) m4_define([nm_minor_version], [9]) m4_define([nm_micro_version], [8]) -m4_define([nm_nano_version], [9]) +m4_define([nm_nano_version], [10]) m4_define([nm_version], [nm_major_version.nm_minor_version.nm_micro_version.nm_nano_version]) m4_define([nm_git_sha], [m4_esyscmd([ ( [[ -d ./.git/ && "$(realpath ./.git/)" = "$(realpath "$(git rev-parse --git-dir 2>/dev/null)" 2>/dev/null)" ]] && git rev-parse --verify -q HEAD 2>/dev/null ) || true ])]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/NetworkManager-0.9.8.9/docs/api/html/index.html new/NetworkManager-0.9.8.10/docs/api/html/index.html --- old/NetworkManager-0.9.8.9/docs/api/html/index.html 2014-04-02 21:06:09.000000000 +0200 +++ new/NetworkManager-0.9.8.10/docs/api/html/index.html 2014-04-24 17:25:55.000000000 +0200 @@ -14,7 +14,7 @@ <div class="titlepage"> <div> <div><table class="navigation" id="top" width="100%" cellpadding="2" cellspacing="0"><tr><th valign="middle"><p class="title">NetworkManager D-Bus Reference Manual</p></th></tr></table></div> -<div><p class="releaseinfo">Version 0.9.8.9 +<div><p class="releaseinfo">Version 0.9.8.10 </p></div> <div><p class="copyright">Copyright © 2012 The NetworkManager Authors</p></div> <div><div class="legalnotice"> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/NetworkManager-0.9.8.9/docs/api/html/spec.html new/NetworkManager-0.9.8.10/docs/api/html/spec.html --- old/NetworkManager-0.9.8.9/docs/api/html/spec.html 2014-04-02 21:06:09.000000000 +0200 +++ new/NetworkManager-0.9.8.10/docs/api/html/spec.html 2014-04-24 17:25:55.000000000 +0200 @@ -1,4 +1,4 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"><html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=ascii" /><title>NetworkManager D-Bus Interface Specification version 0.9.8.9</title><style type="text/css"> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"><html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=ascii" /><title>NetworkManager D-Bus Interface Specification version 0.9.8.10</title><style type="text/css"> body { font-family: sans-serif; @@ -97,7 +97,7 @@ margin-right: 4em; } - </style></head><body><h1 class="topbox">NetworkManager D-Bus Interface Specification</h1><h2>Version 0.9.8.9</h2><div>Copyright (C) 2008 - 2011 Red Hat, Inc.</div><div>Copyright (C) 2008 - 2009 Novell, Inc.</div><div class="license"> + </style></head><body><h1 class="topbox">NetworkManager D-Bus Interface Specification</h1><h2>Version 0.9.8.10</h2><div>Copyright (C) 2008 - 2011 Red Hat, Inc.</div><div>Copyright (C) 2008 - 2009 Novell, Inc.</div><div class="license"> <p>This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/NetworkManager-0.9.8.9/docs/api/spec.html new/NetworkManager-0.9.8.10/docs/api/spec.html --- old/NetworkManager-0.9.8.9/docs/api/spec.html 2014-04-02 20:59:16.000000000 +0200 +++ new/NetworkManager-0.9.8.10/docs/api/spec.html 2014-04-24 17:25:42.000000000 +0200 @@ -1,4 +1,4 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"><html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=ascii" /><title>NetworkManager D-Bus Interface Specification version 0.9.8.9</title><style type="text/css"> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"><html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=ascii" /><title>NetworkManager D-Bus Interface Specification version 0.9.8.10</title><style type="text/css"> body { font-family: sans-serif; @@ -97,7 +97,7 @@ margin-right: 4em; } - </style></head><body><h1 class="topbox">NetworkManager D-Bus Interface Specification</h1><h2>Version 0.9.8.9</h2><div>Copyright (C) 2008 - 2011 Red Hat, Inc.</div><div>Copyright (C) 2008 - 2009 Novell, Inc.</div><div class="license"> + </style></head><body><h1 class="topbox">NetworkManager D-Bus Interface Specification</h1><h2>Version 0.9.8.10</h2><div>Copyright (C) 2008 - 2011 Red Hat, Inc.</div><div>Copyright (C) 2008 - 2009 Novell, Inc.</div><div class="license"> <p>This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/NetworkManager-0.9.8.9/docs/api/version.xml new/NetworkManager-0.9.8.10/docs/api/version.xml --- old/NetworkManager-0.9.8.9/docs/api/version.xml 2014-04-02 20:58:02.000000000 +0200 +++ new/NetworkManager-0.9.8.10/docs/api/version.xml 2014-04-24 17:24:27.000000000 +0200 @@ -1 +1 @@ -0.9.8.9 +0.9.8.10 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/NetworkManager-0.9.8.9/docs/libnm-glib/html/index.html new/NetworkManager-0.9.8.10/docs/libnm-glib/html/index.html --- old/NetworkManager-0.9.8.9/docs/libnm-glib/html/index.html 2014-04-02 21:06:09.000000000 +0200 +++ new/NetworkManager-0.9.8.10/docs/libnm-glib/html/index.html 2014-04-24 17:25:55.000000000 +0200 @@ -15,7 +15,7 @@ <div> <div><table class="navigation" id="top" width="100%" cellpadding="2" cellspacing="0"><tr><th valign="middle"><p class="title">libnm-glib Reference Manual</p></th></tr></table></div> <div><p class="releaseinfo"> - for libnm-glib 0.9.8.9 + for libnm-glib 0.9.8.10 The latest version of this documentation can be found on-line at <a class="ulink" href="https://developer.gnome.org/libnm-glib/0.9/" target="_top">https://developer.gnome.org/libnm-glib/0.9/</a>. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/NetworkManager-0.9.8.9/docs/libnm-glib/version.xml new/NetworkManager-0.9.8.10/docs/libnm-glib/version.xml --- old/NetworkManager-0.9.8.9/docs/libnm-glib/version.xml 2014-04-02 20:58:02.000000000 +0200 +++ new/NetworkManager-0.9.8.10/docs/libnm-glib/version.xml 2014-04-24 17:24:27.000000000 +0200 @@ -1 +1 @@ -0.9.8.9 +0.9.8.10 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/NetworkManager-0.9.8.9/docs/libnm-util/html/index.html new/NetworkManager-0.9.8.10/docs/libnm-util/html/index.html --- old/NetworkManager-0.9.8.9/docs/libnm-util/html/index.html 2014-04-02 21:06:09.000000000 +0200 +++ new/NetworkManager-0.9.8.10/docs/libnm-util/html/index.html 2014-04-24 17:25:55.000000000 +0200 @@ -15,7 +15,7 @@ <div> <div><table class="navigation" id="top" width="100%" cellpadding="2" cellspacing="0"><tr><th valign="middle"><p class="title">libnm-util Reference Manual</p></th></tr></table></div> <div><p class="releaseinfo"> - for libnm-util 0.9.8.9 + for libnm-util 0.9.8.10 The latest version of this documentation can be found on-line at <a class="ulink" href="https://developer.gnome.org/libnm-util/0.9/" target="_top">https://developer.gnome.org/libnm-util/0.9/</a>. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/NetworkManager-0.9.8.9/docs/libnm-util/version.xml new/NetworkManager-0.9.8.10/docs/libnm-util/version.xml --- old/NetworkManager-0.9.8.9/docs/libnm-util/version.xml 2014-04-02 20:58:02.000000000 +0200 +++ new/NetworkManager-0.9.8.10/docs/libnm-util/version.xml 2014-04-24 17:24:27.000000000 +0200 @@ -1 +1 @@ -0.9.8.9 +0.9.8.10 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/NetworkManager-0.9.8.9/src/generated/nm-enum-types.c new/NetworkManager-0.9.8.10/src/generated/nm-enum-types.c --- old/NetworkManager-0.9.8.9/src/generated/nm-enum-types.c 2014-04-02 20:58:19.000000000 +0200 +++ new/NetworkManager-0.9.8.10/src/generated/nm-enum-types.c 2014-04-24 17:24:49.000000000 +0200 @@ -5,21 +5,12 @@ #include "nm-enum-types.h" -#include "nm-ip4-config.h" -#include "nm-hostname-provider.h" -#include "nm-sleep-monitor.h" -#include "nm-device-factory.h" -#include "nm-rfkill.h" -#include "NetworkManagerUtils.h" -#include "nm-properties-changed-signal.h" +#include "nm-active-connection.h" #include "nm-wifi-ap.h" #include "nm-device-bt.h" +#include "nm-device-infiniband.h" #include "nm-device-bond.h" -#include "nm-dbus-manager.h" #include "nm-device-wired.h" -#include "nm-active-connection.h" -#include "nm-device-bridge.h" -#include "nm-system.h" #include "nm-dhcp6-config.h" #include "nm-session-utils.h" #include "nm-netlink-compat.h" @@ -27,30 +18,39 @@ #include "nm-connection-provider.h" #include "nm-device-ethernet.h" #include "nm-call-store.h" +#include "nm-config.h" +#include "nm-policy-hosts.h" +#include "nm-rfkill.h" #include "nm-dispatcher.h" +#include "nm-ip4-config.h" #include "nm-manager.h" #include "nm-device-modem.h" #include "nm-activation-request.h" #include "nm-wifi-ap-utils.h" -#include "nm-device-adsl.h" +#include "nm-dbus-manager.h" +#include "nm-policy-hostname.h" #include "nm-device.h" #include "nm-types.h" -#include "nm-device-olpc-mesh.h" -#include "nm-device-infiniband.h" #include "nm-ip6-config.h" -#include "nm-device-private.h" +#include "nm-system.h" #include "nm-policy.h" #include "nm-manager-auth.h" +#include "nm-device-bridge.h" #include "nm-device-wifi.h" -#include "nm-config.h" -#include "nm-policy-hostname.h" +#include "nm-device-private.h" #include "nm-netlink-utils.h" #include "nm-dhcp4-config.h" -#include "nm-policy-hosts.h" #include "nm-udev-manager.h" #include "nm-connectivity.h" -#include "nm-netlink-monitor.h" #include "nm-device-vlan.h" +#include "nm-netlink-monitor.h" +#include "nm-device-olpc-mesh.h" +#include "nm-hostname-provider.h" +#include "nm-sleep-monitor.h" +#include "nm-device-factory.h" +#include "NetworkManagerUtils.h" +#include "nm-device-adsl.h" +#include "nm-properties-changed-signal.h" #include "nm-logging.h" #include "nm-dns-utils.h" #include "nm-dns-plugin.h" @@ -86,10 +86,10 @@ #include "nm-bluez4-adapter.h" #include "nm-firewall-manager.h" #include "nm-settings-connection.h" +#include "nm-settings.h" #include "nm-default-wired-connection.h" #include "nm-system-config-interface.h" #include "nm-settings-utils.h" -#include "nm-settings.h" #include "nm-settings-error.h" #include "nm-agent-manager.h" #include "nm-inotify-helper.h" @@ -101,173 +101,161 @@ #include "nm-wimax-nsp.h" GType -nm_ip4_config_compare_flags_get_type (void) +nm_bt_error_get_type (void) { static volatile gsize g_define_type_id__volatile = 0; if (g_once_init_enter (&g_define_type_id__volatile)) { static const GEnumValue values[] = { - { NM_IP4_COMPARE_FLAG_NONE, "NM_IP4_COMPARE_FLAG_NONE", "none" }, - { NM_IP4_COMPARE_FLAG_ADDRESSES, "NM_IP4_COMPARE_FLAG_ADDRESSES", "addresses" }, - { NM_IP4_COMPARE_FLAG_PTP_ADDRESS, "NM_IP4_COMPARE_FLAG_PTP_ADDRESS", "ptp-address" }, - { NM_IP4_COMPARE_FLAG_NAMESERVERS, "NM_IP4_COMPARE_FLAG_NAMESERVERS", "nameservers" }, - { NM_IP4_COMPARE_FLAG_ROUTES, "NM_IP4_COMPARE_FLAG_ROUTES", "routes" }, - { NM_IP4_COMPARE_FLAG_DOMAINS, "NM_IP4_COMPARE_FLAG_DOMAINS", "domains" }, - { NM_IP4_COMPARE_FLAG_SEARCHES, "NM_IP4_COMPARE_FLAG_SEARCHES", "searches" }, - { NM_IP4_COMPARE_FLAG_MTU, "NM_IP4_COMPARE_FLAG_MTU", "mtu" }, - { NM_IP4_COMPARE_FLAG_MSS, "NM_IP4_COMPARE_FLAG_MSS", "mss" }, - { NM_IP4_COMPARE_FLAG_WINS_SERVERS, "NM_IP4_COMPARE_FLAG_WINS_SERVERS", "wins-servers" }, - { NM_IP4_COMPARE_FLAG_NIS_SERVERS, "NM_IP4_COMPARE_FLAG_NIS_SERVERS", "nis-servers" }, - { NM_IP4_COMPARE_FLAG_NIS_DOMAIN, "NM_IP4_COMPARE_FLAG_NIS_DOMAIN", "nis-domain" }, - { NM_IP4_COMPARE_FLAG_ALL, "NM_IP4_COMPARE_FLAG_ALL", "all" }, + { NM_BT_ERROR_CONNECTION_NOT_BT, "NM_BT_ERROR_CONNECTION_NOT_BT", "ConnectionNotBt" }, + { NM_BT_ERROR_CONNECTION_INVALID, "NM_BT_ERROR_CONNECTION_INVALID", "ConnectionInvalid" }, + { NM_BT_ERROR_CONNECTION_INCOMPATIBLE, "NM_BT_ERROR_CONNECTION_INCOMPATIBLE", "ConnectionIncompatible" }, { 0, NULL, NULL } }; GType g_define_type_id = - g_enum_register_static (g_intern_static_string ("NMIP4ConfigCompareFlags"), values); + g_enum_register_static (g_intern_static_string ("NMBtError"), values); g_once_init_leave (&g_define_type_id__volatile, g_define_type_id); } return g_define_type_id__volatile; } GType -nm_rf_kill_state_get_type (void) +nm_infiniband_error_get_type (void) { static volatile gsize g_define_type_id__volatile = 0; if (g_once_init_enter (&g_define_type_id__volatile)) { static const GEnumValue values[] = { - { RFKILL_UNBLOCKED, "RFKILL_UNBLOCKED", "unblocked" }, - { RFKILL_SOFT_BLOCKED, "RFKILL_SOFT_BLOCKED", "soft-blocked" }, - { RFKILL_HARD_BLOCKED, "RFKILL_HARD_BLOCKED", "hard-blocked" }, + { NM_INFINIBAND_ERROR_CONNECTION_NOT_INFINIBAND, "NM_INFINIBAND_ERROR_CONNECTION_NOT_INFINIBAND", "ConnectionNotInfiniband" }, + { NM_INFINIBAND_ERROR_CONNECTION_INVALID, "NM_INFINIBAND_ERROR_CONNECTION_INVALID", "ConnectionInvalid" }, + { NM_INFINIBAND_ERROR_CONNECTION_INCOMPATIBLE, "NM_INFINIBAND_ERROR_CONNECTION_INCOMPATIBLE", "ConnectionIncompatible" }, { 0, NULL, NULL } }; GType g_define_type_id = - g_enum_register_static (g_intern_static_string ("RfKillState"), values); + g_enum_register_static (g_intern_static_string ("NMInfinibandError"), values); g_once_init_leave (&g_define_type_id__volatile, g_define_type_id); } return g_define_type_id__volatile; } GType -nm_rf_kill_type_get_type (void) +nm_bond_error_get_type (void) { static volatile gsize g_define_type_id__volatile = 0; if (g_once_init_enter (&g_define_type_id__volatile)) { static const GEnumValue values[] = { - { RFKILL_TYPE_WLAN, "RFKILL_TYPE_WLAN", "wlan" }, - { RFKILL_TYPE_WWAN, "RFKILL_TYPE_WWAN", "wwan" }, - { RFKILL_TYPE_WIMAX, "RFKILL_TYPE_WIMAX", "wimax" }, - { RFKILL_TYPE_UNKNOWN, "RFKILL_TYPE_UNKNOWN", "unknown" }, - { RFKILL_TYPE_MAX, "RFKILL_TYPE_MAX", "max" }, + { NM_BOND_ERROR_CONNECTION_NOT_BOND, "NM_BOND_ERROR_CONNECTION_NOT_BOND", "ConnectionNotBond" }, + { NM_BOND_ERROR_CONNECTION_INVALID, "NM_BOND_ERROR_CONNECTION_INVALID", "ConnectionInvalid" }, + { NM_BOND_ERROR_CONNECTION_INCOMPATIBLE, "NM_BOND_ERROR_CONNECTION_INCOMPATIBLE", "ConnectionIncompatible" }, { 0, NULL, NULL } }; GType g_define_type_id = - g_enum_register_static (g_intern_static_string ("RfKillType"), values); + g_enum_register_static (g_intern_static_string ("NMBondError"), values); g_once_init_leave (&g_define_type_id__volatile, g_define_type_id); } return g_define_type_id__volatile; } GType -nm_bt_error_get_type (void) +nm_session_monitor_error_get_type (void) { static volatile gsize g_define_type_id__volatile = 0; if (g_once_init_enter (&g_define_type_id__volatile)) { static const GEnumValue values[] = { - { NM_BT_ERROR_CONNECTION_NOT_BT, "NM_BT_ERROR_CONNECTION_NOT_BT", "ConnectionNotBt" }, - { NM_BT_ERROR_CONNECTION_INVALID, "NM_BT_ERROR_CONNECTION_INVALID", "ConnectionInvalid" }, - { NM_BT_ERROR_CONNECTION_INCOMPATIBLE, "NM_BT_ERROR_CONNECTION_INCOMPATIBLE", "ConnectionIncompatible" }, + { NM_SESSION_MONITOR_ERROR_IO_ERROR, "NM_SESSION_MONITOR_ERROR_IO_ERROR", "IOError" }, + { NM_SESSION_MONITOR_ERROR_MALFORMED_DATABASE, "NM_SESSION_MONITOR_ERROR_MALFORMED_DATABASE", "MalformedDatabase" }, + { NM_SESSION_MONITOR_ERROR_UNKNOWN_USER, "NM_SESSION_MONITOR_ERROR_UNKNOWN_USER", "UnknownUser" }, + { NM_SESSION_MONITOR_ERROR_NO_DATABASE, "NM_SESSION_MONITOR_ERROR_NO_DATABASE", "NoDatabase" }, { 0, NULL, NULL } }; GType g_define_type_id = - g_enum_register_static (g_intern_static_string ("NMBtError"), values); + g_enum_register_static (g_intern_static_string ("NMSessionMonitorError"), values); g_once_init_leave (&g_define_type_id__volatile, g_define_type_id); } return g_define_type_id__volatile; } GType -nm_bond_error_get_type (void) +nm_ethernet_error_get_type (void) { static volatile gsize g_define_type_id__volatile = 0; if (g_once_init_enter (&g_define_type_id__volatile)) { static const GEnumValue values[] = { - { NM_BOND_ERROR_CONNECTION_NOT_BOND, "NM_BOND_ERROR_CONNECTION_NOT_BOND", "ConnectionNotBond" }, - { NM_BOND_ERROR_CONNECTION_INVALID, "NM_BOND_ERROR_CONNECTION_INVALID", "ConnectionInvalid" }, - { NM_BOND_ERROR_CONNECTION_INCOMPATIBLE, "NM_BOND_ERROR_CONNECTION_INCOMPATIBLE", "ConnectionIncompatible" }, + { NM_ETHERNET_ERROR_CONNECTION_NOT_WIRED, "NM_ETHERNET_ERROR_CONNECTION_NOT_WIRED", "ConnectionNotWired" }, + { NM_ETHERNET_ERROR_CONNECTION_INVALID, "NM_ETHERNET_ERROR_CONNECTION_INVALID", "ConnectionInvalid" }, + { NM_ETHERNET_ERROR_CONNECTION_INCOMPATIBLE, "NM_ETHERNET_ERROR_CONNECTION_INCOMPATIBLE", "ConnectionIncompatible" }, { 0, NULL, NULL } }; GType g_define_type_id = - g_enum_register_static (g_intern_static_string ("NMBondError"), values); + g_enum_register_static (g_intern_static_string ("NMEthernetError"), values); g_once_init_leave (&g_define_type_id__volatile, g_define_type_id); } return g_define_type_id__volatile; } GType -nm_bridge_error_get_type (void) +nm_config_error_get_type (void) { static volatile gsize g_define_type_id__volatile = 0; if (g_once_init_enter (&g_define_type_id__volatile)) { static const GEnumValue values[] = { - { NM_BRIDGE_ERROR_CONNECTION_NOT_BRIDGE, "NM_BRIDGE_ERROR_CONNECTION_NOT_BRIDGE", "ConnectionNotBridge" }, - { NM_BRIDGE_ERROR_CONNECTION_INVALID, "NM_BRIDGE_ERROR_CONNECTION_INVALID", "ConnectionInvalid" }, - { NM_BRIDGE_ERROR_CONNECTION_INCOMPATIBLE, "NM_BRIDGE_ERROR_CONNECTION_INCOMPATIBLE", "ConnectionIncompatible" }, + { NM_CONFIG_ERROR_NO_MEMORY, "NM_CONFIG_ERROR_NO_MEMORY", "NoMemory" }, { 0, NULL, NULL } }; GType g_define_type_id = - g_enum_register_static (g_intern_static_string ("NMBridgeError"), values); + g_enum_register_static (g_intern_static_string ("NMConfigError"), values); g_once_init_leave (&g_define_type_id__volatile, g_define_type_id); } return g_define_type_id__volatile; } GType -nm_session_monitor_error_get_type (void) +nm_rf_kill_state_get_type (void) { static volatile gsize g_define_type_id__volatile = 0; if (g_once_init_enter (&g_define_type_id__volatile)) { static const GEnumValue values[] = { - { NM_SESSION_MONITOR_ERROR_IO_ERROR, "NM_SESSION_MONITOR_ERROR_IO_ERROR", "IOError" }, - { NM_SESSION_MONITOR_ERROR_MALFORMED_DATABASE, "NM_SESSION_MONITOR_ERROR_MALFORMED_DATABASE", "MalformedDatabase" }, - { NM_SESSION_MONITOR_ERROR_UNKNOWN_USER, "NM_SESSION_MONITOR_ERROR_UNKNOWN_USER", "UnknownUser" }, - { NM_SESSION_MONITOR_ERROR_NO_DATABASE, "NM_SESSION_MONITOR_ERROR_NO_DATABASE", "NoDatabase" }, + { RFKILL_UNBLOCKED, "RFKILL_UNBLOCKED", "unblocked" }, + { RFKILL_SOFT_BLOCKED, "RFKILL_SOFT_BLOCKED", "soft-blocked" }, + { RFKILL_HARD_BLOCKED, "RFKILL_HARD_BLOCKED", "hard-blocked" }, { 0, NULL, NULL } }; GType g_define_type_id = - g_enum_register_static (g_intern_static_string ("NMSessionMonitorError"), values); + g_enum_register_static (g_intern_static_string ("RfKillState"), values); g_once_init_leave (&g_define_type_id__volatile, g_define_type_id); } return g_define_type_id__volatile; } GType -nm_ethernet_error_get_type (void) +nm_rf_kill_type_get_type (void) { static volatile gsize g_define_type_id__volatile = 0; if (g_once_init_enter (&g_define_type_id__volatile)) { static const GEnumValue values[] = { - { NM_ETHERNET_ERROR_CONNECTION_NOT_WIRED, "NM_ETHERNET_ERROR_CONNECTION_NOT_WIRED", "ConnectionNotWired" }, - { NM_ETHERNET_ERROR_CONNECTION_INVALID, "NM_ETHERNET_ERROR_CONNECTION_INVALID", "ConnectionInvalid" }, - { NM_ETHERNET_ERROR_CONNECTION_INCOMPATIBLE, "NM_ETHERNET_ERROR_CONNECTION_INCOMPATIBLE", "ConnectionIncompatible" }, + { RFKILL_TYPE_WLAN, "RFKILL_TYPE_WLAN", "wlan" }, + { RFKILL_TYPE_WWAN, "RFKILL_TYPE_WWAN", "wwan" }, + { RFKILL_TYPE_WIMAX, "RFKILL_TYPE_WIMAX", "wimax" }, + { RFKILL_TYPE_UNKNOWN, "RFKILL_TYPE_UNKNOWN", "unknown" }, + { RFKILL_TYPE_MAX, "RFKILL_TYPE_MAX", "max" }, { 0, NULL, NULL } }; GType g_define_type_id = - g_enum_register_static (g_intern_static_string ("NMEthernetError"), values); + g_enum_register_static (g_intern_static_string ("RfKillType"), values); g_once_init_leave (&g_define_type_id__volatile, g_define_type_id); } @@ -300,48 +288,58 @@ return g_define_type_id__volatile; } GType -nm_manager_error_get_type (void) +nm_ip4_config_compare_flags_get_type (void) { static volatile gsize g_define_type_id__volatile = 0; if (g_once_init_enter (&g_define_type_id__volatile)) { static const GEnumValue values[] = { - { NM_MANAGER_ERROR_UNKNOWN_CONNECTION, "NM_MANAGER_ERROR_UNKNOWN_CONNECTION", "UnknownConnection" }, - { NM_MANAGER_ERROR_UNKNOWN_DEVICE, "NM_MANAGER_ERROR_UNKNOWN_DEVICE", "UnknownDevice" }, - { NM_MANAGER_ERROR_UNMANAGED_DEVICE, "NM_MANAGER_ERROR_UNMANAGED_DEVICE", "UnmanagedDevice" }, - { NM_MANAGER_ERROR_SYSTEM_CONNECTION, "NM_MANAGER_ERROR_SYSTEM_CONNECTION", "SystemConnection" }, - { NM_MANAGER_ERROR_PERMISSION_DENIED, "NM_MANAGER_ERROR_PERMISSION_DENIED", "PermissionDenied" }, - { NM_MANAGER_ERROR_CONNECTION_NOT_ACTIVE, "NM_MANAGER_ERROR_CONNECTION_NOT_ACTIVE", "ConnectionNotActive" }, - { NM_MANAGER_ERROR_ALREADY_ASLEEP_OR_AWAKE, "NM_MANAGER_ERROR_ALREADY_ASLEEP_OR_AWAKE", "AlreadyAsleepOrAwake" }, - { NM_MANAGER_ERROR_ALREADY_ENABLED_OR_DISABLED, "NM_MANAGER_ERROR_ALREADY_ENABLED_OR_DISABLED", "AlreadyEnabledOrDisabled" }, - { NM_MANAGER_ERROR_UNSUPPORTED_CONNECTION_TYPE, "NM_MANAGER_ERROR_UNSUPPORTED_CONNECTION_TYPE", "UnsupportedConnectionType" }, - { NM_MANAGER_ERROR_DEPENDENCY_FAILED, "NM_MANAGER_ERROR_DEPENDENCY_FAILED", "DependencyFailed" }, - { NM_MANAGER_ERROR_AUTOCONNECT_NOT_ALLOWED, "NM_MANAGER_ERROR_AUTOCONNECT_NOT_ALLOWED", "AutoconnectNotAllowed" }, + { NM_IP4_COMPARE_FLAG_NONE, "NM_IP4_COMPARE_FLAG_NONE", "none" }, + { NM_IP4_COMPARE_FLAG_ADDRESSES, "NM_IP4_COMPARE_FLAG_ADDRESSES", "addresses" }, + { NM_IP4_COMPARE_FLAG_PTP_ADDRESS, "NM_IP4_COMPARE_FLAG_PTP_ADDRESS", "ptp-address" }, + { NM_IP4_COMPARE_FLAG_NAMESERVERS, "NM_IP4_COMPARE_FLAG_NAMESERVERS", "nameservers" }, + { NM_IP4_COMPARE_FLAG_ROUTES, "NM_IP4_COMPARE_FLAG_ROUTES", "routes" }, + { NM_IP4_COMPARE_FLAG_DOMAINS, "NM_IP4_COMPARE_FLAG_DOMAINS", "domains" }, + { NM_IP4_COMPARE_FLAG_SEARCHES, "NM_IP4_COMPARE_FLAG_SEARCHES", "searches" }, + { NM_IP4_COMPARE_FLAG_MTU, "NM_IP4_COMPARE_FLAG_MTU", "mtu" }, + { NM_IP4_COMPARE_FLAG_MSS, "NM_IP4_COMPARE_FLAG_MSS", "mss" }, + { NM_IP4_COMPARE_FLAG_WINS_SERVERS, "NM_IP4_COMPARE_FLAG_WINS_SERVERS", "wins-servers" }, + { NM_IP4_COMPARE_FLAG_NIS_SERVERS, "NM_IP4_COMPARE_FLAG_NIS_SERVERS", "nis-servers" }, + { NM_IP4_COMPARE_FLAG_NIS_DOMAIN, "NM_IP4_COMPARE_FLAG_NIS_DOMAIN", "nis-domain" }, + { NM_IP4_COMPARE_FLAG_ALL, "NM_IP4_COMPARE_FLAG_ALL", "all" }, { 0, NULL, NULL } }; GType g_define_type_id = - g_enum_register_static (g_intern_static_string ("NMManagerError"), values); + g_enum_register_static (g_intern_static_string ("NMIP4ConfigCompareFlags"), values); g_once_init_leave (&g_define_type_id__volatile, g_define_type_id); } return g_define_type_id__volatile; } GType -nm_adsl_error_get_type (void) +nm_manager_error_get_type (void) { static volatile gsize g_define_type_id__volatile = 0; if (g_once_init_enter (&g_define_type_id__volatile)) { static const GEnumValue values[] = { - { NM_ADSL_ERROR_CONNECTION_NOT_ADSL, "NM_ADSL_ERROR_CONNECTION_NOT_ADSL", "ConnectionNotAdsl" }, - { NM_ADSL_ERROR_CONNECTION_INVALID, "NM_ADSL_ERROR_CONNECTION_INVALID", "ConnectionInvalid" }, - { NM_ADSL_ERROR_CONNECTION_INCOMPATIBLE, "NM_ADSL_ERROR_CONNECTION_INCOMPATIBLE", "ConnectionIncompatible" }, + { NM_MANAGER_ERROR_UNKNOWN_CONNECTION, "NM_MANAGER_ERROR_UNKNOWN_CONNECTION", "UnknownConnection" }, + { NM_MANAGER_ERROR_UNKNOWN_DEVICE, "NM_MANAGER_ERROR_UNKNOWN_DEVICE", "UnknownDevice" }, + { NM_MANAGER_ERROR_UNMANAGED_DEVICE, "NM_MANAGER_ERROR_UNMANAGED_DEVICE", "UnmanagedDevice" }, + { NM_MANAGER_ERROR_SYSTEM_CONNECTION, "NM_MANAGER_ERROR_SYSTEM_CONNECTION", "SystemConnection" }, + { NM_MANAGER_ERROR_PERMISSION_DENIED, "NM_MANAGER_ERROR_PERMISSION_DENIED", "PermissionDenied" }, + { NM_MANAGER_ERROR_CONNECTION_NOT_ACTIVE, "NM_MANAGER_ERROR_CONNECTION_NOT_ACTIVE", "ConnectionNotActive" }, + { NM_MANAGER_ERROR_ALREADY_ASLEEP_OR_AWAKE, "NM_MANAGER_ERROR_ALREADY_ASLEEP_OR_AWAKE", "AlreadyAsleepOrAwake" }, + { NM_MANAGER_ERROR_ALREADY_ENABLED_OR_DISABLED, "NM_MANAGER_ERROR_ALREADY_ENABLED_OR_DISABLED", "AlreadyEnabledOrDisabled" }, + { NM_MANAGER_ERROR_UNSUPPORTED_CONNECTION_TYPE, "NM_MANAGER_ERROR_UNSUPPORTED_CONNECTION_TYPE", "UnsupportedConnectionType" }, + { NM_MANAGER_ERROR_DEPENDENCY_FAILED, "NM_MANAGER_ERROR_DEPENDENCY_FAILED", "DependencyFailed" }, + { NM_MANAGER_ERROR_AUTOCONNECT_NOT_ALLOWED, "NM_MANAGER_ERROR_AUTOCONNECT_NOT_ALLOWED", "AutoconnectNotAllowed" }, { 0, NULL, NULL } }; GType g_define_type_id = - g_enum_register_static (g_intern_static_string ("NMAdslError"), values); + g_enum_register_static (g_intern_static_string ("NMManagerError"), values); g_once_init_leave (&g_define_type_id__volatile, g_define_type_id); } @@ -368,46 +366,6 @@ return g_define_type_id__volatile; } GType -nm_olpc_mesh_error_get_type (void) -{ - static volatile gsize g_define_type_id__volatile = 0; - - if (g_once_init_enter (&g_define_type_id__volatile)) - { - static const GEnumValue values[] = { - { NM_OLPC_MESH_ERROR_CONNECTION_NOT_MESH, "NM_OLPC_MESH_ERROR_CONNECTION_NOT_MESH", "ConnectionNotMesh" }, - { NM_OLPC_MESH_ERROR_CONNECTION_INVALID, "NM_OLPC_MESH_ERROR_CONNECTION_INVALID", "ConnectionInvalid" }, - { NM_OLPC_MESH_ERROR_CONNECTION_INCOMPATIBLE, "NM_OLPC_MESH_ERROR_CONNECTION_INCOMPATIBLE", "ConnectionIncompatible" }, - { 0, NULL, NULL } - }; - GType g_define_type_id = - g_enum_register_static (g_intern_static_string ("NMOlpcMeshError"), values); - g_once_init_leave (&g_define_type_id__volatile, g_define_type_id); - } - - return g_define_type_id__volatile; -} -GType -nm_infiniband_error_get_type (void) -{ - static volatile gsize g_define_type_id__volatile = 0; - - if (g_once_init_enter (&g_define_type_id__volatile)) - { - static const GEnumValue values[] = { - { NM_INFINIBAND_ERROR_CONNECTION_NOT_INFINIBAND, "NM_INFINIBAND_ERROR_CONNECTION_NOT_INFINIBAND", "ConnectionNotInfiniband" }, - { NM_INFINIBAND_ERROR_CONNECTION_INVALID, "NM_INFINIBAND_ERROR_CONNECTION_INVALID", "ConnectionInvalid" }, - { NM_INFINIBAND_ERROR_CONNECTION_INCOMPATIBLE, "NM_INFINIBAND_ERROR_CONNECTION_INCOMPATIBLE", "ConnectionIncompatible" }, - { 0, NULL, NULL } - }; - GType g_define_type_id = - g_enum_register_static (g_intern_static_string ("NMInfinibandError"), values); - g_once_init_leave (&g_define_type_id__volatile, g_define_type_id); - } - - return g_define_type_id__volatile; -} -GType nm_ip6_config_compare_flags_get_type (void) { static volatile gsize g_define_type_id__volatile = 0; @@ -455,6 +413,26 @@ return g_define_type_id__volatile; } GType +nm_bridge_error_get_type (void) +{ + static volatile gsize g_define_type_id__volatile = 0; + + if (g_once_init_enter (&g_define_type_id__volatile)) + { + static const GEnumValue values[] = { + { NM_BRIDGE_ERROR_CONNECTION_NOT_BRIDGE, "NM_BRIDGE_ERROR_CONNECTION_NOT_BRIDGE", "ConnectionNotBridge" }, + { NM_BRIDGE_ERROR_CONNECTION_INVALID, "NM_BRIDGE_ERROR_CONNECTION_INVALID", "ConnectionInvalid" }, + { NM_BRIDGE_ERROR_CONNECTION_INCOMPATIBLE, "NM_BRIDGE_ERROR_CONNECTION_INCOMPATIBLE", "ConnectionIncompatible" }, + { 0, NULL, NULL } + }; + GType g_define_type_id = + g_enum_register_static (g_intern_static_string ("NMBridgeError"), values); + g_once_init_leave (&g_define_type_id__volatile, g_define_type_id); + } + + return g_define_type_id__volatile; +} +GType nm_wifi_error_get_type (void) { static volatile gsize g_define_type_id__volatile = 0; @@ -479,40 +457,42 @@ return g_define_type_id__volatile; } GType -nm_config_error_get_type (void) +nm_nm_nl_prop_get_type (void) { static volatile gsize g_define_type_id__volatile = 0; if (g_once_init_enter (&g_define_type_id__volatile)) { static const GEnumValue values[] = { - { NM_CONFIG_ERROR_NO_MEMORY, "NM_CONFIG_ERROR_NO_MEMORY", "NoMemory" }, + { NMNL_PROP_INVALID, "NMNL_PROP_INVALID", "invalid" }, + { NMNL_PROP_PROT, "NMNL_PROP_PROT", "prot" }, + { NMNL_PROP_SCOPE, "NMNL_PROP_SCOPE", "scope" }, + { NMNL_PROP_TABLE, "NMNL_PROP_TABLE", "table" }, + { NMNL_PROP_PRIO, "NMNL_PROP_PRIO", "prio" }, { 0, NULL, NULL } }; GType g_define_type_id = - g_enum_register_static (g_intern_static_string ("NMConfigError"), values); + g_enum_register_static (g_intern_static_string ("NmNlProp"), values); g_once_init_leave (&g_define_type_id__volatile, g_define_type_id); } return g_define_type_id__volatile; } GType -nm_nm_nl_prop_get_type (void) +nm_vlan_error_get_type (void) { static volatile gsize g_define_type_id__volatile = 0; if (g_once_init_enter (&g_define_type_id__volatile)) { static const GEnumValue values[] = { - { NMNL_PROP_INVALID, "NMNL_PROP_INVALID", "invalid" }, - { NMNL_PROP_PROT, "NMNL_PROP_PROT", "prot" }, - { NMNL_PROP_SCOPE, "NMNL_PROP_SCOPE", "scope" }, - { NMNL_PROP_TABLE, "NMNL_PROP_TABLE", "table" }, - { NMNL_PROP_PRIO, "NMNL_PROP_PRIO", "prio" }, + { NM_VLAN_ERROR_CONNECTION_NOT_VLAN, "NM_VLAN_ERROR_CONNECTION_NOT_VLAN", "ConnectionNotVlan" }, + { NM_VLAN_ERROR_CONNECTION_INVALID, "NM_VLAN_ERROR_CONNECTION_INVALID", "ConnectionInvalid" }, + { NM_VLAN_ERROR_CONNECTION_INCOMPATIBLE, "NM_VLAN_ERROR_CONNECTION_INCOMPATIBLE", "ConnectionIncompatible" }, { 0, NULL, NULL } }; GType g_define_type_id = - g_enum_register_static (g_intern_static_string ("NmNlProp"), values); + g_enum_register_static (g_intern_static_string ("NMVlanError"), values); g_once_init_leave (&g_define_type_id__volatile, g_define_type_id); } @@ -545,20 +525,40 @@ return g_define_type_id__volatile; } GType -nm_vlan_error_get_type (void) +nm_olpc_mesh_error_get_type (void) { static volatile gsize g_define_type_id__volatile = 0; if (g_once_init_enter (&g_define_type_id__volatile)) { static const GEnumValue values[] = { - { NM_VLAN_ERROR_CONNECTION_NOT_VLAN, "NM_VLAN_ERROR_CONNECTION_NOT_VLAN", "ConnectionNotVlan" }, - { NM_VLAN_ERROR_CONNECTION_INVALID, "NM_VLAN_ERROR_CONNECTION_INVALID", "ConnectionInvalid" }, - { NM_VLAN_ERROR_CONNECTION_INCOMPATIBLE, "NM_VLAN_ERROR_CONNECTION_INCOMPATIBLE", "ConnectionIncompatible" }, + { NM_OLPC_MESH_ERROR_CONNECTION_NOT_MESH, "NM_OLPC_MESH_ERROR_CONNECTION_NOT_MESH", "ConnectionNotMesh" }, + { NM_OLPC_MESH_ERROR_CONNECTION_INVALID, "NM_OLPC_MESH_ERROR_CONNECTION_INVALID", "ConnectionInvalid" }, + { NM_OLPC_MESH_ERROR_CONNECTION_INCOMPATIBLE, "NM_OLPC_MESH_ERROR_CONNECTION_INCOMPATIBLE", "ConnectionIncompatible" }, { 0, NULL, NULL } }; GType g_define_type_id = - g_enum_register_static (g_intern_static_string ("NMVlanError"), values); + g_enum_register_static (g_intern_static_string ("NMOlpcMeshError"), values); + g_once_init_leave (&g_define_type_id__volatile, g_define_type_id); + } + + return g_define_type_id__volatile; +} +GType +nm_adsl_error_get_type (void) +{ + static volatile gsize g_define_type_id__volatile = 0; + + if (g_once_init_enter (&g_define_type_id__volatile)) + { + static const GEnumValue values[] = { + { NM_ADSL_ERROR_CONNECTION_NOT_ADSL, "NM_ADSL_ERROR_CONNECTION_NOT_ADSL", "ConnectionNotAdsl" }, + { NM_ADSL_ERROR_CONNECTION_INVALID, "NM_ADSL_ERROR_CONNECTION_INVALID", "ConnectionInvalid" }, + { NM_ADSL_ERROR_CONNECTION_INCOMPATIBLE, "NM_ADSL_ERROR_CONNECTION_INCOMPATIBLE", "ConnectionIncompatible" }, + { 0, NULL, NULL } + }; + GType g_define_type_id = + g_enum_register_static (g_intern_static_string ("NMAdslError"), values); g_once_init_leave (&g_define_type_id__volatile, g_define_type_id); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/NetworkManager-0.9.8.9/src/generated/nm-enum-types.h new/NetworkManager-0.9.8.10/src/generated/nm-enum-types.h --- old/NetworkManager-0.9.8.9/src/generated/nm-enum-types.h 2014-04-02 20:58:19.000000000 +0200 +++ new/NetworkManager-0.9.8.10/src/generated/nm-enum-types.h 2014-04-24 17:24:49.000000000 +0200 @@ -9,48 +9,48 @@ #include <glib-object.h> G_BEGIN_DECLS -GType nm_ip4_config_compare_flags_get_type (void) G_GNUC_CONST; -#define NM_TYPE_IP4_CONFIG_COMPARE_FLAGS (nm_ip4_config_compare_flags_get_type ()) -GType nm_rf_kill_state_get_type (void) G_GNUC_CONST; -#define NM_TYPE_RF_KILL_STATE (nm_rf_kill_state_get_type ()) -GType nm_rf_kill_type_get_type (void) G_GNUC_CONST; -#define NM_TYPE_RF_KILL_TYPE (nm_rf_kill_type_get_type ()) GType nm_bt_error_get_type (void) G_GNUC_CONST; #define NM_TYPE_BT_ERROR (nm_bt_error_get_type ()) +GType nm_infiniband_error_get_type (void) G_GNUC_CONST; +#define NM_TYPE_INFINIBAND_ERROR (nm_infiniband_error_get_type ()) GType nm_bond_error_get_type (void) G_GNUC_CONST; #define NM_TYPE_BOND_ERROR (nm_bond_error_get_type ()) -GType nm_bridge_error_get_type (void) G_GNUC_CONST; -#define NM_TYPE_BRIDGE_ERROR (nm_bridge_error_get_type ()) GType nm_session_monitor_error_get_type (void) G_GNUC_CONST; #define NM_TYPE_SESSION_MONITOR_ERROR (nm_session_monitor_error_get_type ()) GType nm_ethernet_error_get_type (void) G_GNUC_CONST; #define NM_TYPE_ETHERNET_ERROR (nm_ethernet_error_get_type ()) +GType nm_config_error_get_type (void) G_GNUC_CONST; +#define NM_TYPE_CONFIG_ERROR (nm_config_error_get_type ()) +GType nm_rf_kill_state_get_type (void) G_GNUC_CONST; +#define NM_TYPE_RF_KILL_STATE (nm_rf_kill_state_get_type ()) +GType nm_rf_kill_type_get_type (void) G_GNUC_CONST; +#define NM_TYPE_RF_KILL_TYPE (nm_rf_kill_type_get_type ()) GType nm_dispatcher_action_get_type (void) G_GNUC_CONST; #define NM_TYPE_DISPATCHER_ACTION (nm_dispatcher_action_get_type ()) +GType nm_ip4_config_compare_flags_get_type (void) G_GNUC_CONST; +#define NM_TYPE_IP4_CONFIG_COMPARE_FLAGS (nm_ip4_config_compare_flags_get_type ()) GType nm_manager_error_get_type (void) G_GNUC_CONST; #define NM_TYPE_MANAGER_ERROR (nm_manager_error_get_type ()) -GType nm_adsl_error_get_type (void) G_GNUC_CONST; -#define NM_TYPE_ADSL_ERROR (nm_adsl_error_get_type ()) GType nm_device_error_get_type (void) G_GNUC_CONST; #define NM_TYPE_DEVICE_ERROR (nm_device_error_get_type ()) -GType nm_olpc_mesh_error_get_type (void) G_GNUC_CONST; -#define NM_TYPE_OLPC_MESH_ERROR (nm_olpc_mesh_error_get_type ()) -GType nm_infiniband_error_get_type (void) G_GNUC_CONST; -#define NM_TYPE_INFINIBAND_ERROR (nm_infiniband_error_get_type ()) GType nm_ip6_config_compare_flags_get_type (void) G_GNUC_CONST; #define NM_TYPE_IP6_CONFIG_COMPARE_FLAGS (nm_ip6_config_compare_flags_get_type ()) GType nm_auth_call_result_get_type (void) G_GNUC_CONST; #define NM_TYPE_AUTH_CALL_RESULT (nm_auth_call_result_get_type ()) +GType nm_bridge_error_get_type (void) G_GNUC_CONST; +#define NM_TYPE_BRIDGE_ERROR (nm_bridge_error_get_type ()) GType nm_wifi_error_get_type (void) G_GNUC_CONST; #define NM_TYPE_WIFI_ERROR (nm_wifi_error_get_type ()) -GType nm_config_error_get_type (void) G_GNUC_CONST; -#define NM_TYPE_CONFIG_ERROR (nm_config_error_get_type ()) GType nm_nm_nl_prop_get_type (void) G_GNUC_CONST; #define NM_TYPE_NM_NL_PROP (nm_nm_nl_prop_get_type ()) -GType nm_netlink_monitor_error_get_type (void) G_GNUC_CONST; -#define NM_TYPE_NETLINK_MONITOR_ERROR (nm_netlink_monitor_error_get_type ()) GType nm_vlan_error_get_type (void) G_GNUC_CONST; #define NM_TYPE_VLAN_ERROR (nm_vlan_error_get_type ()) +GType nm_netlink_monitor_error_get_type (void) G_GNUC_CONST; +#define NM_TYPE_NETLINK_MONITOR_ERROR (nm_netlink_monitor_error_get_type ()) +GType nm_olpc_mesh_error_get_type (void) G_GNUC_CONST; +#define NM_TYPE_OLPC_MESH_ERROR (nm_olpc_mesh_error_get_type ()) +GType nm_adsl_error_get_type (void) G_GNUC_CONST; +#define NM_TYPE_ADSL_ERROR (nm_adsl_error_get_type ()) GType nm_logging_error_get_type (void) G_GNUC_CONST; #define NM_TYPE_LOGGING_ERROR (nm_logging_error_get_type ()) GType nm_dns_manager_error_get_type (void) G_GNUC_CONST; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/NetworkManager-0.9.8.9/src/nm-manager.c new/NetworkManager-0.9.8.10/src/nm-manager.c --- old/NetworkManager-0.9.8.9/src/nm-manager.c 2014-04-02 17:15:49.000000000 +0200 +++ new/NetworkManager-0.9.8.10/src/nm-manager.c 2014-04-24 17:19:04.000000000 +0200 @@ -2889,6 +2889,7 @@ char *iface; NMDevice *master_device = NULL; NMConnection *master_connection = NULL; + NMConnection *existing_connection = NULL; NMActiveConnection *master_ac = NULL; gboolean matched; char *error_desc = NULL; @@ -3020,6 +3021,28 @@ return NULL; } + if (dbus_sender) { + /* If the device is active and its connection is not visible to the + * user that's requesting this new activation, fail, since other users + * should not be allowed to implicitly deactivate private connections + * by activating a connection of their own. + */ + existing_connection = nm_device_get_connection (device); + if (existing_connection && + !nm_auth_uid_in_acl (existing_connection, + priv->session_monitor, + sender_uid, + &error_desc)) { + g_set_error (error, + NM_MANAGER_ERROR, + NM_MANAGER_ERROR_PERMISSION_DENIED, + "Private connection already active on the device: %s", + error_desc); + g_free (error_desc); + return FALSE; + } + } + /* Try to find the master connection/device if the connection has a dependency */ if (!find_master (manager, connection, device, &master_connection, &master_device)) { g_set_error_literal (error, NM_MANAGER_ERROR, NM_MANAGER_ERROR_UNKNOWN_DEVICE, -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit mdds for openSUSE:Factory
by root＠hilbert.suse.de 26 Apr '14

26 Apr '14

Hello community, here is the log from the commit of package mdds for openSUSE:Factory checked in at 2014-04-26 10:08:29 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mdds (Old) and /work/SRC/openSUSE:Factory/.mdds.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "mdds" Changes: -------- --- /work/SRC/openSUSE:Factory/mdds/mdds.changes 2014-02-28 07:24:26.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.mdds.new/mdds.changes 2014-04-26 10:08:30.000000000 +0200 @@ -1,0 +2,6 @@ +Fri Apr 25 10:01:09 UTC 2014 - tchvatal(a)suse.com + +- Version bump to 0.10.3: + * Various bugfixes among 0.10 series found during lo 4.2.3 phase. + +------------------------------------------------------------------- Old: ---- mdds_0.10.2.tar.bz2 New: ---- mdds_0.10.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mdds.spec ++++++ --- /var/tmp/diff_new_pack.33FIfQ/_old 2014-04-26 10:08:31.000000000 +0200 +++ /var/tmp/diff_new_pack.33FIfQ/_new 2014-04-26 10:08:31.000000000 +0200 @@ -17,7 +17,7 @@ Name: mdds -Version: 0.10.2 +Version: 0.10.3 Release: 0 Summary: A collection of multi-dimensional data structure and indexing algorithm License: MIT ++++++ mdds_0.10.2.tar.bz2 -> mdds_0.10.3.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mdds_0.10.2/NEWS new/mdds_0.10.3/NEWS --- old/mdds_0.10.2/NEWS 2014-02-12 15:34:42.000000000 +0100 +++ new/mdds_0.10.3/NEWS 2014-04-23 21:22:00.000000000 +0200 @@ -1,3 +1,23 @@ +mdds 0.10.3 + +* multi_type_vector + + * added 2 variants of release_range() that take start and end positions, + to allow releasing of elements in specified interval. One of the + variants takes iterator as a block position hint. + + * iterator release_range(size_type start_pos, size_type end_pos) + + * iterator release_range(const iterator& pos_hint, size_type start_pos, size_type end_pos) + + * added push_back() and push_back_empty(), to allow efficient way to + append new values to the end of the container. + + * template<typename _T> + iterator push_back(const _T& value) + + * iterator push_back_empty() + mdds 0.10.2 * multi_type_vector diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mdds_0.10.2/configure new/mdds_0.10.3/configure --- old/mdds_0.10.2/configure 2014-02-12 15:34:42.000000000 +0100 +++ new/mdds_0.10.3/configure 2014-04-23 21:22:00.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for mdds 0.10.2. +# Generated by GNU Autoconf 2.69 for mdds 0.10.3. # # Report bugs to <kohei.yoshida(a)gmail.com>. # @@ -579,8 +579,8 @@ # Identity of this package. PACKAGE_NAME='mdds' PACKAGE_TARNAME='mdds' -PACKAGE_VERSION='0.10.2' -PACKAGE_STRING='mdds 0.10.2' +PACKAGE_VERSION='0.10.3' +PACKAGE_STRING='mdds 0.10.3' PACKAGE_BUGREPORT='kohei.yoshida(a)gmail.com' PACKAGE_URL='' @@ -1181,7 +1181,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures mdds 0.10.2 to adapt to many kinds of systems. +\`configure' configures mdds 0.10.3 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1242,7 +1242,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of mdds 0.10.2:";; + short | recursive ) echo "Configuration of mdds 0.10.3:";; esac cat <<\_ACEOF @@ -1335,7 +1335,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -mdds configure 0.10.2 +mdds configure 0.10.3 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1352,7 +1352,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by mdds $as_me 0.10.2, which was +It was created by mdds $as_me 0.10.3, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -1701,7 +1701,7 @@ -VERSION=0.10.2 +VERSION=0.10.3 PACKAGE_TARNAME=mdds @@ -2298,7 +2298,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by mdds $as_me 0.10.2, which was +This file was extended by mdds $as_me 0.10.3, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -2351,7 +2351,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -mdds config.status 0.10.2 +mdds config.status 0.10.3 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" @@ -3455,7 +3455,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by mdds $as_me 0.10.2, which was +This file was extended by mdds $as_me 0.10.3, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -3508,7 +3508,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -mdds config.status 0.10.2 +mdds config.status 0.10.3 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" @@ -4613,7 +4613,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by mdds $as_me 0.10.2, which was +This file was extended by mdds $as_me 0.10.3, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -4666,7 +4666,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -mdds config.status 0.10.2 +mdds config.status 0.10.3 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" @@ -5772,7 +5772,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by mdds $as_me 0.10.2, which was +This file was extended by mdds $as_me 0.10.3, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -5825,7 +5825,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -mdds config.status 0.10.2 +mdds config.status 0.10.3 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mdds_0.10.2/configure.ac new/mdds_0.10.3/configure.ac --- old/mdds_0.10.2/configure.ac 2014-02-12 15:34:42.000000000 +0100 +++ new/mdds_0.10.3/configure.ac 2014-04-23 21:22:00.000000000 +0200 @@ -1,4 +1,4 @@ -AC_INIT(mdds, 0.10.2, kohei.yoshida(a)gmail.com) +AC_INIT(mdds, 0.10.3, kohei.yoshida(a)gmail.com) VERSION=AC_PACKAGE_VERSION AC_SUBST(VERSION) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mdds_0.10.2/include/mdds/multi_type_vector.hpp new/mdds_0.10.3/include/mdds/multi_type_vector.hpp --- old/mdds_0.10.2/include/mdds/multi_type_vector.hpp 2014-02-12 15:34:42.000000000 +0100 +++ new/mdds_0.10.3/include/mdds/multi_type_vector.hpp 2014-04-23 21:22:00.000000000 +0200 @@ -1,6 +1,6 @@ /************************************************************************* * - * Copyright (c) 2011-2013 Kohei Yoshida + * Copyright (c) 2011-2014 Kohei Yoshida * * Permission is hereby granted, free of charge, to any person * obtaining a copy of this software and associated documentation @@ -261,7 +261,7 @@ * position to yield any performance benefit.</p> * * <p>The caller is responsible for ensuring that the passed iterator is - * valid. The behavior of this method when passing an invalid iteraotr is + * valid. The behavior of this method when passing an invalid iterator is * undefined.</p> * * <p>The method will throw an <code>std::out_of_range</code> exception @@ -319,7 +319,7 @@ * position to yield any performance benefit.</p> * * <p>The caller is responsible for ensuring that the passed iterator is - * valid. The behavior of this method when passing an invalid iteraotr is + * valid. The behavior of this method when passing an invalid iterator is * undefined.</p> * * <p>The method will throw an <code>std::out_of_range</code> exception if @@ -345,6 +345,27 @@ iterator set(const iterator& pos_hint, size_type pos, const _T& it_begin, const _T& it_end); /** + * Append a new value to the end of the container. + * + * @param value new value to be appended to the end of the container. + * + * @return iterator position pointing to the block where the value is + * appended, which in this case is always the last block of the + * container. + */ + template<typename _T> + iterator push_back(const _T& value); + + /** + * Append a new empty element to the end of the container. + * + * @return iterator position pointing to the block where the new empty + * element is appended, which in this case is always the last + * block of the container. + */ + iterator push_back_empty(); + + /** * Insert multiple values of identical type to a specified position. * Existing values that occur at or below the specified position will get * shifted after the insertion. No existing values will be overwritten by @@ -384,7 +405,7 @@ * position to yield any performance benefit.</p> * * <p>The caller is responsible for ensuring that the passed iterator is - * valid. The behavior of this method when passing an invalid iteraotr is + * valid. The behavior of this method when passing an invalid iterator is * undefined.</p> * * <p>The method will throw an <code>std::out_of_range</code> exception @@ -497,6 +518,49 @@ void release(); /** + * Make all elements within specified range empty, and relinquish the + * ownership of the elements in that range. All elements in the managed + * blocks within the range will be released and the container will no + * longer manage their life cycles after the call. + * + * <p>The method will throw an <code>std::out_of_range</code> exception if + * either the starting or the ending position is outside the current + * container size.</p> + * + * @param start_pos starting position + * @param end_pos ending position, inclusive. + * @return iterator position pointing to the block where the elements are + * released. + */ + iterator release_range(size_type start_pos, size_type end_pos); + + /** + * Make all elements within specified range empty, and relinquish the + * ownership of the elements in that range. All elements in the managed + * blocks within the range will be released and the container will no + * longer manage their life cycles after the call. + * + * <p>This variant takes an iterator as an additional parameter, which is + * used as a block position hint to speed up the lookup of the first block + * to empty. The other variant that doesn't take an iterator always + * starts the block lookup from the first block, which does not + * scale well as the block size grows.</p> + * + * <p>The method will throw an <code>std::out_of_range</code> exception if + * either the starting or the ending position is outside the current + * container size.</p> + * + * @param pos_hint iterator used as a block position hint, to specify + * which block to start when searching for the right + * blocks in which elements are to be released. + * @param start_pos starting position + * @param end_pos ending position, inclusive. + * @return iterator position pointing to the block where the elements are + * released. + */ + iterator release_range(const iterator& pos_hint, size_type start_pos, size_type end_pos); + + /** * Given the logical position of an element, get the iterator of the block * where the element is located, and its offset from the first element of * that block. @@ -661,7 +725,7 @@ * position to yield any performance benefit.</p> * * <p>The caller is responsible for ensuring that the passed iterator is - * valid. The behavior of this method when passing an invalid iteraotr is + * valid. The behavior of this method when passing an invalid iterator is * undefined.</p> * * <p>The method will throw an <code>std::out_of_range</code> exception if @@ -725,7 +789,7 @@ * position to yield any performance benefit.</p> * * <p>The caller is responsible for ensuring that the passed iterator is - * valid. The behavior of this method when passing an invalid iteraotr is + * valid. The behavior of this method when passing an invalid iterator is * undefined.</p> * * <p>The method will throw an <code>std::out_of_range</code> exception if @@ -910,7 +974,9 @@ size_type start_pos_in_block2, size_type block_index2, multi_type_vector& dest, size_type dest_pos); - iterator set_empty_impl(size_type start_pos, size_type end_pos, size_type start_pos_in_block1, size_type block_index1); + iterator set_empty_impl( + size_type start_pos, size_type end_pos, size_type start_pos_in_block1, size_type block_index1, + bool overwrite); void swap_impl( multi_type_vector& other, size_type start_pos, size_type end_pos, size_type other_pos, @@ -1060,6 +1126,8 @@ size_type dst_index1, size_type dst_offset1, size_type dst_index2, size_type dst_offset2, size_type len, blocks_type& new_blocks); + bool append_empty(size_type len); + inline iterator get_iterator(size_type block_index, size_type start_row) { typename blocks_type::iterator block_pos = m_blocks.begin(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mdds_0.10.2/include/mdds/multi_type_vector_def.inl new/mdds_0.10.3/include/mdds/multi_type_vector_def.inl --- old/mdds_0.10.2/include/mdds/multi_type_vector_def.inl 2014-02-12 15:34:42.000000000 +0100 +++ new/mdds_0.10.3/include/mdds/multi_type_vector_def.inl 2014-04-23 21:22:00.000000000 +0200 @@ -1,6 +1,6 @@ /************************************************************************* * - * Copyright (c) 2012-2013 Kohei Yoshida + * Copyright (c) 2012-2014 Kohei Yoshida * * Permission is hereby granted, free of charge, to any person * obtaining a copy of this software and associated documentation @@ -494,6 +494,69 @@ template<typename _CellBlockFunc> template<typename _T> typename multi_type_vector<_CellBlockFunc>::iterator +multi_type_vector<_CellBlockFunc>::push_back(const _T& value) +{ + element_category_type cat = mdds_mtv_get_element_type(value); + + block* blk_last = m_blocks.empty() ? NULL : m_blocks.back(); + if (!blk_last || !blk_last->mp_data || cat != get_block_type(*blk_last->mp_data)) + { + // Either there is no block, or the last block is empty or of + // different type. Append a new block. + size_type block_index = m_blocks.size(); + size_type start_pos = m_cur_size; + + m_blocks.push_back(new block(1)); + block* blk = m_blocks.back(); + create_new_block_with_new_cell(blk->mp_data, value); + ++m_cur_size; + + return get_iterator(block_index, start_pos); + } + + assert(blk_last); + assert(blk_last->mp_data); + assert(cat == get_block_type(*blk_last->mp_data)); + + // Append the new value to the last block. + size_type block_index = m_blocks.size() - 1; + size_type start_pos = m_cur_size - blk_last->m_size; + + mdds_mtv_append_value(*blk_last->mp_data, value); + ++blk_last->m_size; + ++m_cur_size; + + return get_iterator(block_index, start_pos); +} + +template<typename _CellBlockFunc> +typename multi_type_vector<_CellBlockFunc>::iterator +multi_type_vector<_CellBlockFunc>::push_back_empty() +{ + size_type last_block_size = 0; + if (!m_blocks.empty()) + last_block_size = m_blocks.back()->m_size; + + size_type block_index = m_blocks.size(); + size_type start_pos = m_cur_size; + + if (!append_empty(1)) + { + // Last empty block has been extended. + --block_index; + start_pos -= last_block_size; + } + + // Get the iterator of the last block. + typename blocks_type::iterator block_pos = m_blocks.end(); + --block_pos; + + return iterator(block_pos, m_blocks.end(), start_pos, block_index); +} + +template<typename _CellBlockFunc> +template<typename _T> +typename multi_type_vector<_CellBlockFunc>::iterator multi_type_vector<_CellBlockFunc>::insert(size_type pos, const _T& it_begin, const _T& it_end) { size_type block_index = 0, start_pos = 0; @@ -1204,6 +1267,29 @@ } template<typename _CellBlockFunc> +typename multi_type_vector<_CellBlockFunc>::iterator +multi_type_vector<_CellBlockFunc>::release_range(size_type start_pos, size_type end_pos) +{ + size_type start_pos_in_block1 = 0; + size_type block_index1 = 0; + if (!get_block_position(start_pos, start_pos_in_block1, block_index1)) + throw std::out_of_range("Block position not found!"); + + return set_empty_impl(start_pos, end_pos, start_pos_in_block1, block_index1, false); +} + +template<typename _CellBlockFunc> +typename multi_type_vector<_CellBlockFunc>::iterator +multi_type_vector<_CellBlockFunc>::release_range( + const iterator& pos_hint, size_type start_pos, size_type end_pos) +{ + size_type start_pos_in_block1 = 0; + size_type block_index1 = 0; + get_block_position(pos_hint, start_pos, start_pos_in_block1, block_index1); + return set_empty_impl(start_pos, end_pos, start_pos_in_block1, block_index1, false); +} + +template<typename _CellBlockFunc> typename multi_type_vector<_CellBlockFunc>::position_type multi_type_vector<_CellBlockFunc>::position(size_type pos) { @@ -1361,7 +1447,7 @@ if (!get_block_position(start_pos, start_pos_in_block1, block_index1)) throw std::out_of_range("Block position not found!"); - return set_empty_impl(start_pos, end_pos, start_pos_in_block1, block_index1); + return set_empty_impl(start_pos, end_pos, start_pos_in_block1, block_index1, true); } template<typename _CellBlockFunc> @@ -1371,7 +1457,7 @@ size_type start_pos_in_block1 = 0; size_type block_index1 = 0; get_block_position(pos_hint, start_pos, start_pos_in_block1, block_index1); - return set_empty_impl(start_pos, end_pos, start_pos_in_block1, block_index1); + return set_empty_impl(start_pos, end_pos, start_pos_in_block1, block_index1, true); } template<typename _CellBlockFunc> @@ -1381,7 +1467,12 @@ multi_type_vector& dest, size_type dest_pos) { if (start_pos > end_pos) - throw std::out_of_range("Start row is larger than the end row."); + { + std::ostringstream os; + os << "multi_type_vector::transfer_impl: start position is larger than the end position. (start="; + os << start_pos << ", end=" << end_pos << ")"; + throw std::out_of_range(os.str()); + } size_type start_pos_in_block2 = start_pos_in_block1; size_type block_index2 = block_index1; @@ -1744,7 +1835,8 @@ template<typename _CellBlockFunc> typename multi_type_vector<_CellBlockFunc>::iterator multi_type_vector<_CellBlockFunc>::set_empty_impl( - size_type start_pos, size_type end_pos, size_type start_pos_in_block1, size_type block_index1) + size_type start_pos, size_type end_pos, size_type start_pos_in_block1, size_type block_index1, + bool overwrite) { if (start_pos > end_pos) throw std::out_of_range("Start row is larger than the end row."); @@ -1761,10 +1853,10 @@ iterator ret_it; if (block_index1 == block_index2) - ret_it = set_empty_in_single_block(start_pos, end_pos, block_index1, start_pos_in_block1, true); + ret_it = set_empty_in_single_block(start_pos, end_pos, block_index1, start_pos_in_block1, overwrite); else ret_it = set_empty_in_multi_blocks( - start_pos, end_pos, block_index1, start_pos_in_block1, block_index2, start_pos_in_block2, true); + start_pos, end_pos, block_index1, start_pos_in_block1, block_index2, start_pos_in_block2, overwrite); #ifdef MDDS_MULTI_TYPE_VECTOR_DEBUG if (!check_block_integrity()) @@ -2838,6 +2930,39 @@ } template<typename _CellBlockFunc> +bool multi_type_vector<_CellBlockFunc>::append_empty(size_type len) +{ + // Append empty cells. + if (m_blocks.empty()) + { + // No existing block. Create a new one. + assert(m_cur_size == 0); + m_blocks.push_back(new block(len)); + m_cur_size = len; + return true; + } + + bool new_block_added = false; + block* blk_last = m_blocks.back(); + + if (!blk_last->mp_data) + { + // Last block is empty. Just increase its size. + blk_last->m_size += len; + } + else + { + // Append a new empty block. + m_blocks.push_back(new block(len)); + new_block_added = true; + } + + m_cur_size += len; + + return new_block_added; +} + +template<typename _CellBlockFunc> void multi_type_vector<_CellBlockFunc>::exchange_elements( const element_block_type& src_data, size_type src_offset, size_type dst_index1, size_type dst_offset1, size_type dst_index2, size_type dst_offset2, @@ -3452,29 +3577,7 @@ if (new_size > m_cur_size) { // Append empty cells. - if (m_blocks.empty()) - { - // No existing block. Create a new one. - assert(m_cur_size == 0); - m_blocks.push_back(new block(new_size)); - m_cur_size = new_size; - return; - } - - block* blk_last = m_blocks.back(); - size_type delta = new_size - m_cur_size; - - if (!blk_last->mp_data) - { - // Last block is empty. Just increase its size. - blk_last->m_size += delta; - } - else - { - // Append a new empty block. - m_blocks.push_back(new block(delta)); - } - m_cur_size = new_size; + append_empty(new_size - m_cur_size); return; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mdds_0.10.2/src/multi_type_vector_test_custom.cpp new/mdds_0.10.3/src/multi_type_vector_test_custom.cpp --- old/mdds_0.10.2/src/multi_type_vector_test_custom.cpp 2014-02-12 15:34:42.000000000 +0100 +++ new/mdds_0.10.3/src/multi_type_vector_test_custom.cpp 2014-04-23 21:22:00.000000000 +0200 @@ -1,6 +1,6 @@ /************************************************************************* * - * Copyright (c) 2012 Kohei Yoshida + * Copyright (c) 2012-2014 Kohei Yoshida * * Permission is hereby granted, free of charge, to any person * obtaining a copy of this software and associated documentation @@ -1430,10 +1430,62 @@ { stack_printer __stack_printer__("::mtv_test_release"); mtv_type db(3); - muser_cell c1(1.2), c2(1.3); + muser_cell c1(1.2), c2(1.3); // allocated on the stack. db.set(0, &c1); db.set(2, &c2); db.release(); // Prevent invalid free when db goes out of scope. + + // Variant with no argument should make the container empty after the call. + assert(db.empty()); + + db.push_back(new muser_cell(10.0)); + db.push_back(&c1); + db.push_back(&c2); + db.push_back(new muser_cell(10.1)); + + assert(db.size() == 4); + assert(db.block_size() == 1); + + // Release those allocated on the stack to avoid double deletion. + mtv_type::iterator it = db.release_range(1, 2); + + // Check the integrity of the returned iterator. + assert(it->type == mtv::element_type_empty); + assert(it->size == 2); + mtv_type::iterator check = it; + --check; + assert(check == db.begin()); + check = it; + ++check; + ++check; + assert(check == db.end()); + + db.push_back(new muser_cell(10.2)); + assert(db.size() == 5); + + muser_cell* p1 = db.get<muser_cell*>(3); + muser_cell* p2 = db.get<muser_cell*>(4); + assert(p1->value == 10.1); + assert(p2->value == 10.2); + + // Pass iterator as a position hint. + it = db.release_range(it, 3, 4); + assert(db.block_size() == 2); + + // Check the returned iterator. + check = it; + --check; + assert(check == db.begin()); + assert(check->type == element_type_muser_block); + assert(check->size == 1); + assert(it->type == mtv::element_type_empty); + assert(it->size == 4); + ++it; + assert(it == db.end()); + + // It should be safe to delete these instances now that they've been released. + delete p1; + delete p2; } void mtv_test_construction_with_array() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mdds_0.10.2/src/multi_type_vector_test_default.cpp new/mdds_0.10.3/src/multi_type_vector_test_default.cpp --- old/mdds_0.10.2/src/multi_type_vector_test_default.cpp 2014-02-12 15:34:42.000000000 +0100 +++ new/mdds_0.10.3/src/multi_type_vector_test_default.cpp 2014-04-23 21:22:00.000000000 +0200 @@ -1,6 +1,6 @@ /************************************************************************* * - * Copyright (c) 2011-2013 Kohei Yoshida + * Copyright (c) 2011-2014 Kohei Yoshida * * Permission is hereby granted, free of charge, to any person * obtaining a copy of this software and associated documentation @@ -4880,6 +4880,104 @@ it = db1.transfer(1, 2, db2, 1); } +void mtv_test_push_back() +{ + stack_printer __stack_printer__("::mtv_test_push_back"); + + mtv_type db; + assert(db.size() == 0); + assert(db.block_size() == 0); + + // Append an empty element into an empty container. + mtv_type::iterator it = db.push_back_empty(); + assert(db.size() == 1); + assert(db.block_size() == 1); + assert(it->size == 1); + assert(it->type == mtv::element_type_empty); + assert(it->__private_data.block_index == 0); + assert(it == db.begin()); + ++it; + assert(it == db.end()); + + // ... and again. + it = db.push_back_empty(); + assert(db.size() == 2); + assert(db.block_size() == 1); + assert(it->size == 2); + assert(it->type == mtv::element_type_empty); + assert(it->__private_data.block_index == 0); + assert(it == db.begin()); + ++it; + assert(it == db.end()); + + // Append non-empty this time. + it = db.push_back(1.1); + assert(db.size() == 3); + assert(db.block_size() == 2); + assert(it->size == 1); + assert(it->type == mtv::element_type_numeric); + assert(it->__private_data.block_index == 1); + mtv_type::iterator check = it; + --check; + assert(check == db.begin()); + ++it; + assert(it == db.end()); + + // followed by an empty element again. + it = db.push_back_empty(); + assert(db.size() == 4); + assert(db.block_size() == 3); + assert(it->size == 1); + assert(it->type == mtv::element_type_empty); + assert(it->__private_data.block_index == 2); + check = it; + --check; + --check; + assert(check == db.begin()); + ++it; + assert(it == db.end()); + + // Check the values. + assert(db.is_empty(0)); + assert(db.is_empty(1)); + assert(db.get<double>(2) == 1.1); + assert(db.is_empty(3)); + + // Empty the container and push back a non-empty element. + db.clear(); + it = db.push_back(string("push me")); + assert(db.size() == 1); + assert(db.block_size() == 1); + assert(it->size == 1); + assert(it->type == mtv::element_type_string); + assert(it->__private_data.block_index == 0); + assert(it == db.begin()); + ++it; + assert(it == db.end()); + assert(db.get<string>(0) == "push me"); + + // Push back a non-empty element of the same type. + it = db.push_back(string("again")); + assert(db.size() == 2); + assert(db.block_size() == 1); + assert(it->size == 2); + assert(it->type == mtv::element_type_string); + assert(it->__private_data.block_index == 0); + assert(it == db.begin()); + ++it; + assert(it == db.end()); + + assert(db.get<string>(0) == "push me"); + assert(db.get<string>(1) == "again"); + + // Push back another non-empty element of a different type. + it = db.push_back(23.4); + assert(db.size() == 3); + assert(db.block_size() == 2); + assert(it->size == 1); + assert(it->type == mtv::element_type_numeric); +} + } int main (int argc, char **argv) @@ -4916,6 +5014,7 @@ mtv_test_value_type(); mtv_test_block_identifier(); mtv_test_transfer(); + mtv_test_push_back(); cout << "Test finished successfully!" << endl; return EXIT_SUCCESS; -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit mate-power-manager for openSUSE:Factory
by root＠hilbert.suse.de 26 Apr '14

26 Apr '14

Hello community, here is the log from the commit of package mate-power-manager for openSUSE:Factory checked in at 2014-04-26 10:06:19 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mate-power-manager (Old) and /work/SRC/openSUSE:Factory/.mate-power-manager.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "mate-power-manager" Changes: -------- --- /work/SRC/openSUSE:Factory/mate-power-manager/mate-power-manager.changes 2014-03-22 18:01:43.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.mate-power-manager.new/mate-power-manager.changes 2014-04-26 10:06:21.000000000 +0200 @@ -1,0 +2,30 @@ +Thu Apr 24 20:24:35 UTC 2014 - p.drouand(a)gmail.com + +- Add mate-power-manager-fixes-for-upower1-api-changes.patch +- Add mate-power-manager-improve-upower1-support.patch + +------------------------------------------------------------------- +Thu Apr 17 10:24:28 UTC 2014 - p.drouand(a)gmail.com + +- Rebase upower-0.99 support : + + Remove mate-power-manager_fix-use-g_signal-notify.patch; + mate-power-manager_upower-remove-recall.patch; + mate-power-manager_upower-update-for-libupower-glib-API-changes.patch; + mate-power-manager_upower-use-g_signal-notify.patch + mate-power-manager_upower.patch + + Add mate-power-manager-avoid-levels_is_0-warning.patch; + mate-power-manager-port-to-upower-0.99_API.patch; + mate-power-manager-remove-battery-recall-logic.patch +- Explicitely require upower + +------------------------------------------------------------------- +Sun Apr 13 17:36:45 UTC 2014 - p.drouand(a)gmail.com + +- Add mate-power-manager_upower-update-for-libupower-glib-API-changes-fix.patch, + mate-power-manager_fix-pref-apply.patch and + mate-power-manager-statistics-fix.patch; more fixes for upower >= 0.99 + compatibility +- Remove hard requirement of pm-utils, udisks and splashy; package works + without these packages + +------------------------------------------------------------------- Old: ---- mate-power-manager_fix-use-g_signal-notify.patch mate-power-manager_upower-remove-recall.patch mate-power-manager_upower-update-for-libupower-glib-API-changes.patch mate-power-manager_upower-use-g_signal-notify.patch mate-power-manager_upower.patch New: ---- mate-power-manager-avoid-levels_is_0-warning.patch mate-power-manager-fixes-for-upower1-api-changes.patch mate-power-manager-improve-upower1-support.patch mate-power-manager-port-to-upower-0.99_API.patch mate-power-manager-remove-battery-recall-logic.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mate-power-manager.spec ++++++ --- /var/tmp/diff_new_pack.xHah7A/_old 2014-04-26 10:06:22.000000000 +0200 +++ /var/tmp/diff_new_pack.xHah7A/_new 2014-04-26 10:06:22.000000000 +0200 @@ -13,35 +13,32 @@ # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Name: mate-power-manager Version: 1.8.0 Release: 0 -License: GPL-2.0 Summary: MATE Desktop UPower policy management -Url: http://mate-desktop.org +License: GPL-2.0 Group: System/GUI/Other +Url: http://mate-desktop.org Source0: http://pub.mate-desktop.org/releases/1.8/%{name}-%{version}.tar.xz # PATCH-FIX-UPSTREAM mate-power-manager_dbus_interface_keyboard_backlight_controls.patch --fix gsettings schema # to fix keyboard backlight support Patch0: mate-power-manager_dbus_interface_keyboard_backlight_controls.patch -# PATCH-FIX-UPSTREAM mate-power-manager_fix-use-g_signal-notify.patch --fix build with different upower version -Patch6: mate-power-manager_fix-use-g_signal-notify.patch -# PATCH-FIX-UPSTREAM mate-power-manager_upower-remove-recall.patch --recall command has been dropped of -# upower 1.x API -Patch3: mate-power-manager_upower-remove-recall.patch -# PATCH-FIX-UPSTREAM mate-power-manager_upower-update-for-libupower-glib-API-changes.patch --fix engine device -# support for upower >= 1.0 -Patch5: mate-power-manager_upower-update-for-libupower-glib-API-changes.patch -# PATCH-FIX-UPSTREAM mate-power-manager_upower-use-g_signal-notify.patch --use gsignal for backlight support with upower -Patch4: mate-power-manager_upower-use-g_signal-notify.patch -# PATCH-FIX-UPSTREAM mate-power-manager_upower.patch --drop suspend support in mpm with upower 1.0 as it's -# unsupported for now -Patch2: mate-power-manager_upower.patch -# upower is required by pm-utils -Requires: pm-utils -Requires: udisks -Requires: splashy +# PATCH-FIX-UPSTREAM mate-power-manager-avoid-levels_is_0-warning.patch --avoid "levels is 0" warning if no +# kbd backlight present +Patch1: mate-power-manager-avoid-levels_is_0-warning.patch +# PATCH-FIX-UPSTREAM mate-power-manager-port-to-upower-0.99_API.patch --fix mate-power-manager for current upower versions +Patch2: mate-power-manager-port-to-upower-0.99_API.patch +# PATCH-FIX-UPSTREAM mate-power-manager-remove-battery-recall-logic.patch --the database is outdated several years +# now and the whole interface is removed from current UPower release +Patch3: mate-power-manager-remove-battery-recall-logic.patch +# PATCH-FIX-UPSTREAM mate-power-manager-fixes-for-upower1-api-changes.patch --adapt upstream code to API changes +Patch4: mate-power-manager-fixes-for-upower1-api-changes.patch +# PATCH-FIX-UPSTREAM mate-power-manager-improve-upower1-support.patch --fix support of devices for upower >=1.0 +Patch5: mate-power-manager-improve-upower1-support.patch +Requires: upower Recommends: %{name}-lang %glib2_gsettings_schema_requires @@ -71,11 +68,11 @@ %prep %setup -q %patch0 -p1 -%patch2 -p1 +%patch1 -p1 %patch3 -p1 -%patch4 -p1 +%patch2 -p1 %patch5 -p1 -%patch6 -p1 +%patch4 -p1 %build autoreconf -fiv ++++++ mate-power-manager-avoid-levels_is_0-warning.patch ++++++ >From 2b3cf01f84204dd5d8204d519e2167b41cda6bc0 Mon Sep 17 00:00:00 2001 From: Stefan Seyfried <seife+dev(a)b1-systems.com> Date: Wed, 9 Apr 2014 14:43:44 +0200 Subject: [PATCH] avoid "levels is 0" warning if no kbd backlight present --- src/gpm-kbd-backlight.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/gpm-kbd-backlight.c b/src/gpm-kbd-backlight.c index 0ac6801..a439e94 100644 --- a/src/gpm-kbd-backlight.c +++ b/src/gpm-kbd-backlight.c @@ -113,6 +113,9 @@ gpm_kbd_backlight_set (GpmKbdBacklight *backlight, guint goal; g_return_val_if_fail (GPM_IS_KBD_BACKLIGHT (backlight), FALSE); + /* avoid warnings if no keyboard brightness is available */ + if (backlight->priv->max_brightness < 1) + return FALSE; /* if we're setting the same we are, don't bother */ //g_return_val_if_fail (backlight->priv->brightness_percent != percentage, FALSE); -- 1.9.1 ++++++ mate-power-manager-fixes-for-upower1-api-changes.patch ++++++ >From 8f734c679de61292f0ae1bd9923fc67801ab041c Mon Sep 17 00:00:00 2001 From: Stefano Karapetsas <stefano(a)karapetsas.com> Date: Thu, 24 Apr 2014 20:19:01 +0200 Subject: [PATCH] Other round of fixes for UPower 0.99 API changes --- src/gpm-engine.c | 85 ++++++++++++++++++++++++++++++++++++++++++------------- src/gpm-manager.c | 4 ++- 2 files changed, 68 insertions(+), 21 deletions(-) diff --git a/src/gpm-engine.c b/src/gpm-engine.c index fe458e3..56d19e2 100644 --- a/src/gpm-engine.c +++ b/src/gpm-engine.c @@ -84,7 +84,29 @@ static UpDevice *gpm_engine_get_composite_device (GpmEngine *engine, UpDevice *o static UpDevice *gpm_engine_update_composite_device (GpmEngine *engine, UpDevice *original_device); #if UP_CHECK_VERSION (0, 99, 0) static void gpm_engine_device_changed_cb (UpDevice *device, GParamSpec *pspec, GpmEngine *engine); -#endif + +#define GPM_ENGINE_WARNING_NONE UP_DEVICE_LEVEL_NONE +#define GPM_ENGINE_WARNING_DISCHARGING UP_DEVICE_LEVEL_DISCHARGING +#define GPM_ENGINE_WARNING_LOW UP_DEVICE_LEVEL_LOW +#define GPM_ENGINE_WARNING_CRITICAL UP_DEVICE_LEVEL_CRITICAL +#define GPM_ENGINE_WARNING_ACTION UP_DEVICE_LEVEL_ACTION + +/** + * gpm_engine_get_warning: + * + * This gets the possible engine state for the device according to the + * policy, which could be per-percent, or per-time. + * + * Return value: A GpmEngine state, e.g. GPM_ENGINE_WARNING_DISCHARGING + **/ +static UpDeviceLevel +gpm_engine_get_warning (GpmEngine *engine, UpDevice *device) +{ + UpDeviceLevel warning; + g_object_get (device, "warning-level", &warning, NULL); + return warning; +} +#else typedef enum { GPM_ENGINE_WARNING_NONE = 0, @@ -226,6 +248,7 @@ gpm_engine_get_warning (GpmEngine *engine, UpDevice *device) out: return warning_type; } +#endif /** * gpm_engine_get_summary: @@ -282,12 +305,20 @@ gpm_engine_get_summary (GpmEngine *engine) * Returns the icon **/ static gchar * +#if UP_CHECK_VERSION (0, 99, 0) +gpm_engine_get_icon_priv (GpmEngine *engine, UpDeviceKind device_kind, UpDeviceLevel warning, gboolean use_state) +#else gpm_engine_get_icon_priv (GpmEngine *engine, UpDeviceKind device_kind, GpmEngineWarning warning, gboolean use_state) +#endif { guint i; GPtrArray *array; UpDevice *device; +#if UP_CHECK_VERSION (0, 99, 0) + UpDeviceLevel warning_temp; +#else GpmEngineWarning warning_temp; +#endif UpDeviceKind kind; UpDeviceState state; gboolean is_present; @@ -572,6 +603,9 @@ gpm_engine_device_check_capacity (GpmEngine *engine, UpDevice *device) static UpDevice * gpm_engine_get_composite_device (GpmEngine *engine, UpDevice *original_device) { +#if UP_CHECK_VERSION (0, 99, 0) + return engine->priv->battery_composite; +#else guint battery_devices = 0; GPtrArray *array; UpDevice *device; @@ -601,6 +635,7 @@ gpm_engine_get_composite_device (GpmEngine *engine, UpDevice *original_device) out: /* return composite device or original device */ return device; +#endif } /** @@ -609,6 +644,18 @@ gpm_engine_get_composite_device (GpmEngine *engine, UpDevice *original_device) static UpDevice * gpm_engine_update_composite_device (GpmEngine *engine, UpDevice *original_device) { +#if UP_CHECK_VERSION (0, 99, 0) + gchar *text; + + text = up_device_to_text (engine->priv->battery_composite); + egg_debug ("composite:\n%s", text); + g_free (text); + + /* force update of icon */ + gpm_engine_recalculate_state_icon (engine); + + return engine->priv->battery_composite; +#else guint i; gdouble percentage = 0.0; gdouble energy = 0.0; @@ -720,6 +767,7 @@ gpm_engine_update_composite_device (GpmEngine *engine, UpDevice *original_device out: /* return composite device or original device */ return device; +#endif } /** @@ -728,7 +776,11 @@ gpm_engine_update_composite_device (GpmEngine *engine, UpDevice *original_device static void gpm_engine_device_add (GpmEngine *engine, UpDevice *device) { +#if UP_CHECK_VERSION (0, 99, 0) + UpDeviceLevel warning; +#else GpmEngineWarning warning; +#endif UpDeviceState state; UpDeviceKind kind; UpDevice *composite; @@ -762,9 +814,9 @@ gpm_engine_device_add (GpmEngine *engine, UpDevice *device) } #if UP_CHECK_VERSION (0, 99, 0) - if (kind == UP_DEVICE_KIND_BATTERY || kind == UP_DEVICE_KIND_UPS || kind == UP_DEVICE_KIND_LINE_POWER) - return; g_signal_connect (device, "notify", G_CALLBACK (gpm_engine_device_changed_cb), engine); + g_ptr_array_add (engine->priv->array, g_object_ref (device)); + gpm_engine_recalculate_state (engine); #endif } @@ -820,10 +872,14 @@ gpm_engine_coldplug_idle_cb (GpmEngine *engine) static void gpm_engine_device_added_cb (UpClient *client, UpDevice *device, GpmEngine *engine) { +#if UP_CHECK_VERSION (0, 99, 0) + gpm_engine_device_add (engine, device); +#else /* add to list */ g_ptr_array_add (engine->priv->array, g_object_ref (device)); gpm_engine_recalculate_state (engine); +#endif } /** @@ -866,15 +922,17 @@ gpm_engine_device_changed_cb (UpDevice *device, GParamSpec *pspec, GpmEngine *en gpm_engine_device_changed_cb (UpClient *client, UpDevice *device, GpmEngine *engine) #endif { -#if !UP_CHECK_VERSION(0, 99, 0) UpDeviceKind kind; -#endif UpDeviceState state; UpDeviceState state_old; +#if UP_CHECK_VERSION(0, 99, 0) + UpDeviceLevel warning_old; + UpDeviceLevel warning; +#else GpmEngineWarning warning_old; GpmEngineWarning warning; +#endif -#if !UP_CHECK_VERSION(0, 99, 0) /* get device properties */ g_object_get (device, "kind", &kind, @@ -885,7 +943,6 @@ gpm_engine_device_changed_cb (UpClient *client, UpDevice *device, GpmEngine *eng egg_debug ("updating because %s changed", up_device_get_object_path (device)); device = gpm_engine_update_composite_device (engine, device); } -#endif /* get device properties (may be composite) */ g_object_get (device, @@ -1070,22 +1127,10 @@ gpm_engine_init (GpmEngine *engine) g_signal_connect (engine->priv->phone, "device-refresh", G_CALLBACK (phone_device_refresh_cb), engine); -#if UP_CHECK_VERSION(0, 99, 0) - /* coldplug */ - array = up_client_get_devices(engine->priv->client); - if (array) { - for (i = 0; i < array->len; i++) { - UpDevice *device = g_ptr_array_index (array, i); - gpm_engine_device_added_cb(engine->priv->client, device, engine); - } - g_ptr_array_free (array, TRUE); - } -#endif - /* create a fake virtual composite battery */ #if UP_CHECK_VERSION(0, 99, 0) engine->priv->battery_composite = up_client_get_display_device (engine->priv->client); - g_signal_connect (engine->priv->client, "notify", + g_signal_connect (engine->priv->battery_composite, "notify", G_CALLBACK (gpm_engine_device_changed_cb), engine); #else engine->priv->battery_composite = up_device_new (); diff --git a/src/gpm-manager.c b/src/gpm-manager.c index df84cac..09bd0c0 100644 --- a/src/gpm-manager.c +++ b/src/gpm-manager.c @@ -1858,7 +1858,9 @@ gpm_manager_init (GpmManager *manager) G_CALLBACK (gpm_manager_settings_changed_cb), manager); manager->priv->client = up_client_new (); #if UP_CHECK_VERSION(0, 99, 0) - g_signal_connect (manager->priv->client, "notify", + g_signal_connect (manager->priv->client, "notify::lid-is-closed", + G_CALLBACK (gpm_manager_client_changed_cb), manager); + g_signal_connect (manager->priv->client, "notify::on-battery", G_CALLBACK (gpm_manager_client_changed_cb), manager); #else g_signal_connect (manager->priv->client, "changed", -- 1.9.1 ++++++ mate-power-manager-improve-upower1-support.patch ++++++ >From 1fb28703f76a97421f3554d5c553b06707f890a7 Mon Sep 17 00:00:00 2001 From: Stefano Karapetsas <stefano(a)karapetsas.com> Date: Thu, 24 Apr 2014 18:17:35 +0200 Subject: [PATCH] Improve UPower1 support --- src/gpm-engine.c | 32 +++++++++++++++++++++++--------- 1 file changed, 23 insertions(+), 9 deletions(-) diff --git a/src/gpm-engine.c b/src/gpm-engine.c index e6c6bf2..fe458e3 100644 --- a/src/gpm-engine.c +++ b/src/gpm-engine.c @@ -82,6 +82,9 @@ G_DEFINE_TYPE (GpmEngine, gpm_engine, G_TYPE_OBJECT) static UpDevice *gpm_engine_get_composite_device (GpmEngine *engine, UpDevice *original_device); static UpDevice *gpm_engine_update_composite_device (GpmEngine *engine, UpDevice *original_device); +#if UP_CHECK_VERSION (0, 99, 0) +static void gpm_engine_device_changed_cb (UpDevice *device, GParamSpec *pspec, GpmEngine *engine); +#endif typedef enum { GPM_ENGINE_WARNING_NONE = 0, @@ -757,6 +760,13 @@ gpm_engine_device_add (GpmEngine *engine, UpDevice *device) g_object_get (composite, "state", &state, NULL); g_object_set_data (G_OBJECT(composite), "engine-state-old", GUINT_TO_POINTER(state)); } + +#if UP_CHECK_VERSION (0, 99, 0) + if (kind == UP_DEVICE_KIND_BATTERY || kind == UP_DEVICE_KIND_UPS || kind == UP_DEVICE_KIND_LINE_POWER) + return; + g_signal_connect (device, "notify", G_CALLBACK (gpm_engine_device_changed_cb), engine); +#endif + } /** @@ -851,19 +861,20 @@ gpm_engine_device_removed_cb (UpClient *client, UpDevice *device, GpmEngine *eng **/ static void #if UP_CHECK_VERSION(0, 99, 0) -gpm_engine_device_changed_cb (UpClient *client, GParamSpec *pspec, GpmEngine *engine) -{ - gpm_engine_recalculate_state (engine); -} +gpm_engine_device_changed_cb (UpDevice *device, GParamSpec *pspec, GpmEngine *engine) #else gpm_engine_device_changed_cb (UpClient *client, UpDevice *device, GpmEngine *engine) +#endif { +#if !UP_CHECK_VERSION(0, 99, 0) UpDeviceKind kind; +#endif UpDeviceState state; UpDeviceState state_old; GpmEngineWarning warning_old; GpmEngineWarning warning; +#if !UP_CHECK_VERSION(0, 99, 0) /* get device properties */ g_object_get (device, "kind", &kind, @@ -874,6 +885,7 @@ gpm_engine_device_changed_cb (UpClient *client, UpDevice *device, GpmEngine *eng egg_debug ("updating because %s changed", up_device_get_object_path (device)); device = gpm_engine_update_composite_device (engine, device); } +#endif /* get device properties (may be composite) */ g_object_get (device, @@ -917,7 +929,6 @@ gpm_engine_device_changed_cb (UpClient *client, UpDevice *device, GpmEngine *eng gpm_engine_recalculate_state (engine); } -#endif /** * gpm_engine_get_devices: @@ -1042,10 +1053,7 @@ gpm_engine_init (GpmEngine *engine) G_CALLBACK (gpm_engine_device_added_cb), engine); g_signal_connect (engine->priv->client, "device-removed", G_CALLBACK (gpm_engine_device_removed_cb), engine); -#if UP_CHECK_VERSION(0, 99, 0) - g_signal_connect (engine->priv->client, "notify", - G_CALLBACK (gpm_engine_device_changed_cb), engine); -#else +#if !UP_CHECK_VERSION(0, 99, 0) g_signal_connect (engine->priv->client, "device-changed", G_CALLBACK (gpm_engine_device_changed_cb), engine); #endif @@ -1075,6 +1083,11 @@ gpm_engine_init (GpmEngine *engine) #endif /* create a fake virtual composite battery */ +#if UP_CHECK_VERSION(0, 99, 0) + engine->priv->battery_composite = up_client_get_display_device (engine->priv->client); + g_signal_connect (engine->priv->client, "notify", + G_CALLBACK (gpm_engine_device_changed_cb), engine); +#else engine->priv->battery_composite = up_device_new (); g_object_set (engine->priv->battery_composite, "kind", UP_DEVICE_KIND_BATTERY, @@ -1083,6 +1096,7 @@ gpm_engine_init (GpmEngine *engine) "power-supply", TRUE, "is-present", TRUE, NULL); +#endif engine->priv->previous_icon = NULL; engine->priv->previous_summary = NULL; -- 1.9.1 ++++++ mate-power-manager-port-to-upower-0.99_API.patch ++++++ >From d59f4b8bd38e1628af3a992ae8e96b8e069ab738 Mon Sep 17 00:00:00 2001 From: Stefan Seyfried <seife+dev(a)b1-systems.com> Date: Wed, 9 Apr 2014 15:12:17 +0200 Subject: [PATCH] port mate-power-manager to upower-0.99 API fix mate-power-manager for current upower versions --- src/gpm-backlight.c | 9 ++++++++ src/gpm-button.c | 10 ++++++++- src/gpm-control.c | 6 ++++-- src/gpm-engine.c | 55 +++++++++++++++++++++++++++++++++++++++++++++---- src/gpm-kbd-backlight.c | 8 +++++++ src/gpm-manager.c | 9 ++++++++ src/gpm-prefs-core.c | 8 +++++-- src/gpm-statistics.c | 17 +++++++++++++-- 8 files changed, 111 insertions(+), 11 deletions(-) diff --git a/src/gpm-backlight.c b/src/gpm-backlight.c index 1f1d834..d2938a4 100644 --- a/src/gpm-backlight.c +++ b/src/gpm-backlight.c @@ -410,7 +410,11 @@ gpm_settings_key_changed_cb (GSettings *settings, const gchar *key, GpmBacklight * Does the actions when the ac power source is inserted/removed. **/ static void +#if UP_CHECK_VERSION(0, 99, 0) +gpm_backlight_client_changed_cb (UpClient *client, GParamSpec *pspec, GpmBacklight *backlight) +#else gpm_backlight_client_changed_cb (UpClient *client, GpmBacklight *backlight) +#endif { gpm_backlight_brightness_evaluate_and_set (backlight, FALSE, TRUE); } @@ -727,8 +731,13 @@ gpm_backlight_init (GpmBacklight *backlight) /* we use up_client for the ac-adapter-changed signal */ backlight->priv->client = up_client_new (); +#if UP_CHECK_VERSION(0, 99, 0) + g_signal_connect (backlight->priv->client, "notify", + G_CALLBACK (gpm_backlight_client_changed_cb), backlight); +#else g_signal_connect (backlight->priv->client, "changed", G_CALLBACK (gpm_backlight_client_changed_cb), backlight); +#endif /* gets caps */ backlight->priv->can_dim = gpm_brightness_has_hw (backlight->priv->brightness); diff --git a/src/gpm-button.c b/src/gpm-button.c index 1e38173..b331cf6 100644 --- a/src/gpm-button.c +++ b/src/gpm-button.c @@ -324,7 +324,11 @@ gpm_button_reset_time (GpmButton *button) * gpm_button_client_changed_cb **/ static void +#if UP_CHECK_VERSION(0, 99, 0) +gpm_button_client_changed_cb (UpClient *client, GParamSpec *pspec, GpmButton *button) +#else gpm_button_client_changed_cb (UpClient *client, GpmButton *button) +#endif { gboolean lid_is_closed; @@ -363,9 +367,13 @@ gpm_button_init (GpmButton *button) button->priv->client = up_client_new (); button->priv->lid_is_closed = up_client_get_lid_is_closed (button->priv->client); +#if UP_CHECK_VERSION(0, 99, 0) + g_signal_connect (button->priv->client, "notify", + G_CALLBACK (gpm_button_client_changed_cb), button); +#else g_signal_connect (button->priv->client, "changed", G_CALLBACK (gpm_button_client_changed_cb), button); - +#endif /* register the brightness keys */ gpm_button_xevent_key (button, XF86XK_PowerOff, GPM_BUTTON_POWER); #ifdef HAVE_XF86XK_SUSPEND diff --git a/src/gpm-control.c b/src/gpm-control.c index ec50136..0562d38 100644 --- a/src/gpm-control.c +++ b/src/gpm-control.c @@ -289,10 +289,11 @@ gpm_control_suspend (GpmControl *control, GError **error) } g_object_unref(proxy); } +#if !UP_CHECK_VERSION(0, 99, 0) else { ret = up_client_suspend_sync (control->priv->client, NULL, error); } - +#endif egg_debug ("emitting resume"); g_signal_emit (control, signals [RESUME], 0, GPM_CONTROL_ACTION_SUSPEND); @@ -399,10 +400,11 @@ gpm_control_hibernate (GpmControl *control, GError **error) ret = TRUE; } } +#if !UP_CHECK_VERSION(0, 99, 0) else { ret = up_client_hibernate_sync (control->priv->client, NULL, error); } - +#endif egg_debug ("emitting resume"); g_signal_emit (control, signals [RESUME], 0, GPM_CONTROL_ACTION_HIBERNATE); diff --git a/src/gpm-engine.c b/src/gpm-engine.c index 96a043e..e6c6bf2 100644 --- a/src/gpm-engine.c +++ b/src/gpm-engine.c @@ -768,12 +768,14 @@ gpm_engine_coldplug_idle_cb (GpmEngine *engine) guint i; GPtrArray *array = NULL; UpDevice *device; +#if !UP_CHECK_VERSION(0, 99, 0) gboolean ret; GError *error = NULL; +#endif g_return_val_if_fail (engine != NULL, FALSE); g_return_val_if_fail (GPM_IS_ENGINE (engine), FALSE); - +#if !UP_CHECK_VERSION(0, 99, 0) /* get devices from UPower */ ret = up_client_enumerate_devices_sync (engine->priv->client, NULL, &error); if (!ret) { @@ -781,7 +783,7 @@ gpm_engine_coldplug_idle_cb (GpmEngine *engine) g_error_free (error); goto out; } - +#endif /* connected mobile phones */ gpm_phone_coldplug (engine->priv->phone); @@ -793,7 +795,9 @@ gpm_engine_coldplug_idle_cb (GpmEngine *engine) device = g_ptr_array_index (array, i); gpm_engine_device_add (engine, device); } +#if !UP_CHECK_VERSION(0, 99, 0) out: +#endif if (array != NULL) g_ptr_array_unref (array); /* never repeat */ @@ -816,6 +820,22 @@ gpm_engine_device_added_cb (UpClient *client, UpDevice *device, GpmEngine *engin * gpm_engine_device_removed_cb: **/ static void +#if UP_CHECK_VERSION(0, 99, 0) +gpm_engine_device_removed_cb (UpClient *client, const char *object_path, GpmEngine *engine) +{ + guint i; + + for (i = 0; i < engine->priv->array->len; i++) { + UpDevice *device = g_ptr_array_index (engine->priv->array, i); + + if (g_strcmp0 (object_path, up_device_get_object_path (device)) == 0) { + g_ptr_array_remove_index (engine->priv->array, i); + break; + } + } + gpm_engine_recalculate_state (engine); +} +#else gpm_engine_device_removed_cb (UpClient *client, UpDevice *device, GpmEngine *engine) { gboolean ret; @@ -824,12 +844,18 @@ gpm_engine_device_removed_cb (UpClient *client, UpDevice *device, GpmEngine *eng return; gpm_engine_recalculate_state (engine); } - +#endif /** * gpm_engine_device_changed_cb: **/ static void +#if UP_CHECK_VERSION(0, 99, 0) +gpm_engine_device_changed_cb (UpClient *client, GParamSpec *pspec, GpmEngine *engine) +{ + gpm_engine_recalculate_state (engine); +} +#else gpm_engine_device_changed_cb (UpClient *client, UpDevice *device, GpmEngine *engine) { UpDeviceKind kind; @@ -891,6 +917,7 @@ gpm_engine_device_changed_cb (UpClient *client, UpDevice *device, GpmEngine *eng gpm_engine_recalculate_state (engine); } +#endif /** * gpm_engine_get_devices: @@ -1003,7 +1030,10 @@ phone_device_refresh_cb (GpmPhone *phone, guint idx, GpmEngine *engine) static void gpm_engine_init (GpmEngine *engine) { - +#if UP_CHECK_VERSION(0, 99, 0) + GPtrArray *array = NULL; + guint i; +#endif engine->priv = GPM_ENGINE_GET_PRIVATE (engine); engine->priv->array = g_ptr_array_new_with_free_func (g_object_unref); @@ -1012,8 +1042,13 @@ gpm_engine_init (GpmEngine *engine) G_CALLBACK (gpm_engine_device_added_cb), engine); g_signal_connect (engine->priv->client, "device-removed", G_CALLBACK (gpm_engine_device_removed_cb), engine); +#if UP_CHECK_VERSION(0, 99, 0) + g_signal_connect (engine->priv->client, "notify", + G_CALLBACK (gpm_engine_device_changed_cb), engine); +#else g_signal_connect (engine->priv->client, "device-changed", G_CALLBACK (gpm_engine_device_changed_cb), engine); +#endif engine->priv->settings = g_settings_new (GPM_SETTINGS_SCHEMA); g_signal_connect (engine->priv->settings, "changed", @@ -1027,6 +1062,18 @@ gpm_engine_init (GpmEngine *engine) g_signal_connect (engine->priv->phone, "device-refresh", G_CALLBACK (phone_device_refresh_cb), engine); +#if UP_CHECK_VERSION(0, 99, 0) + /* coldplug */ + array = up_client_get_devices(engine->priv->client); + if (array) { + for (i = 0; i < array->len; i++) { + UpDevice *device = g_ptr_array_index (array, i); + gpm_engine_device_added_cb(engine->priv->client, device, engine); + } + g_ptr_array_free (array, TRUE); + } +#endif + /* create a fake virtual composite battery */ engine->priv->battery_composite = up_device_new (); g_object_set (engine->priv->battery_composite, diff --git a/src/gpm-kbd-backlight.c b/src/gpm-kbd-backlight.c index a439e94..3a0f6e6 100644 --- a/src/gpm-kbd-backlight.c +++ b/src/gpm-kbd-backlight.c @@ -486,6 +486,9 @@ gpm_kbd_backlight_control_resume_cb (GpmControl *control, **/ static void gpm_kbd_backlight_client_changed_cb (UpClient *client, +#if UP_CHECK_VERSION(0, 99, 0) + GParamSpec *pspec, +#endif GpmKbdBacklight *backlight) { gpm_kbd_backlight_evaluate_power_source_and_set (backlight); @@ -755,8 +758,13 @@ gpm_kbd_backlight_init (GpmKbdBacklight *backlight) /* Use upower for ac changed signal */ backlight->priv->client = up_client_new (); +#if UP_CHECK_VERSION(0, 99, 0) + g_signal_connect (backlight->priv->client, "notify", + G_CALLBACK (gpm_kbd_backlight_client_changed_cb), backlight); +#else g_signal_connect (backlight->priv->client, "changed", G_CALLBACK (gpm_kbd_backlight_client_changed_cb), backlight); +#endif backlight->priv->settings = g_settings_new (GPM_SETTINGS_SCHEMA); //g_signal_connect (backlight->priv->settings, "changed", G_CALLBACK (gpm_settings_key_changed_cb), backlight); diff --git a/src/gpm-manager.c b/src/gpm-manager.c index c4d0530..df84cac 100644 --- a/src/gpm-manager.c +++ b/src/gpm-manager.c @@ -971,7 +971,11 @@ gpm_manager_get_spindown_timeout (GpmManager *manager) * gpm_manager_client_changed_cb: **/ static void +#if UP_CHECK_VERSION(0, 99, 0) +gpm_manager_client_changed_cb (UpClient *client, GParamSpec *pspec, GpmManager *manager) +#else gpm_manager_client_changed_cb (UpClient *client, GpmManager *manager) +#endif { gboolean event_when_closed; gint timeout; @@ -1853,8 +1857,13 @@ gpm_manager_init (GpmManager *manager) g_signal_connect (manager->priv->settings, "changed", G_CALLBACK (gpm_manager_settings_changed_cb), manager); manager->priv->client = up_client_new (); +#if UP_CHECK_VERSION(0, 99, 0) + g_signal_connect (manager->priv->client, "notify", + G_CALLBACK (gpm_manager_client_changed_cb), manager); +#else g_signal_connect (manager->priv->client, "changed", G_CALLBACK (gpm_manager_client_changed_cb), manager); +#endif /* use libmatenotify */ notify_init (GPM_NAME); diff --git a/src/gpm-prefs-core.c b/src/gpm-prefs-core.c index 7a2662d..6abb792 100644 --- a/src/gpm-prefs-core.c +++ b/src/gpm-prefs-core.c @@ -811,7 +811,9 @@ gpm_prefs_init (GpmPrefs *prefs) UpDevice *device; UpDeviceKind kind; GpmBrightness *brightness; +#if !UP_CHECK_VERSION(0, 99, 0) gboolean ret; +#endif guint i; GDBusProxy *proxy; @@ -897,9 +899,11 @@ gpm_prefs_init (GpmPrefs *prefs) else { /* are we allowed to shutdown? */ egg_console_kit_can_stop (prefs->priv->console, &prefs->priv->can_shutdown, NULL); +#if !UP_CHECK_VERSION(0, 99, 0) /* get values from UpClient */ prefs->priv->can_suspend = up_client_get_can_suspend (prefs->priv->client); prefs->priv->can_hibernate = up_client_get_can_hibernate (prefs->priv->client); +#endif } if (LOGIND_RUNNING()) { @@ -953,14 +957,14 @@ gpm_prefs_init (GpmPrefs *prefs) brightness = gpm_brightness_new (); prefs->priv->has_lcd = gpm_brightness_has_hw (brightness); g_object_unref (brightness); - +#if !UP_CHECK_VERSION(0, 99, 0) /* get device list */ ret = up_client_enumerate_devices_sync (prefs->priv->client, NULL, &error); if (!ret) { egg_warning ("failed to get device list: %s", error->message); g_error_free (error); } - +#endif devices = up_client_get_devices (prefs->priv->client); for (i=0; i<devices->len; i++) { device = g_ptr_array_index (devices, i); diff --git a/src/gpm-statistics.c b/src/gpm-statistics.c index 98b5632..13489dc 100644 --- a/src/gpm-statistics.c +++ b/src/gpm-statistics.c @@ -1236,6 +1236,12 @@ gpm_stats_device_added_cb (UpClient *client, UpDevice *device, gpointer user_dat * gpm_stats_device_changed_cb: **/ static void +#if UP_CHECK_VERSION(0, 99, 0) +gpm_stats_device_changed_cb (UpClient *client, GParamSpec *pspec, gpointer user_data) +{ + gpm_stats_button_update_ui(); +} +#else gpm_stats_device_changed_cb (UpClient *client, UpDevice *device, gpointer user_data) { const gchar *object_path; @@ -1246,6 +1252,7 @@ gpm_stats_device_changed_cb (UpClient *client, UpDevice *device, gpointer user_d if (g_strcmp0 (current_device, object_path) == 0) gpm_stats_update_info_data (device); } +#endif /** * gpm_stats_device_removed_cb: @@ -1794,11 +1801,12 @@ main (int argc, char *argv[]) wakeups = up_wakeups_new (); g_signal_connect (wakeups, "data-changed", G_CALLBACK (gpm_stats_data_changed_cb), NULL); - +#if !UP_CHECK_VERSION(0, 99, 0) /* coldplug */ ret = up_client_enumerate_devices_sync (client, NULL, NULL); if (!ret) goto out; +#endif devices = up_client_get_devices (client); /* add devices in visually pleasing order */ @@ -1814,7 +1822,11 @@ main (int argc, char *argv[]) /* connect now the coldplug is done */ g_signal_connect (client, "device-added", G_CALLBACK (gpm_stats_device_added_cb), NULL); g_signal_connect (client, "device-removed", G_CALLBACK (gpm_stats_device_removed_cb), NULL); +#if UP_CHECK_VERSION(0, 99, 0) + g_signal_connect (client, "notify", G_CALLBACK (gpm_stats_device_changed_cb), NULL); +#else g_signal_connect (client, "device-changed", G_CALLBACK (gpm_stats_device_changed_cb), NULL); +#endif /* set current device */ if (devices->len > 0) { @@ -1854,8 +1866,9 @@ main (int argc, char *argv[]) gtk_widget_show (widget); gtk_main (); - +#if !UP_CHECK_VERSION(0, 99, 0) out: +#endif g_object_unref (settings); g_object_unref (client); g_object_unref (wakeups); -- 1.9.1 ++++++ mate-power-manager-remove-battery-recall-logic.patch ++++++ >From 220a4e0a64aca0579f50e6e57d4eca848b3ac57f Mon Sep 17 00:00:00 2001 From: Stefan Seyfried <seife+dev(a)b1-systems.com> Date: Wed, 9 Apr 2014 14:58:29 +0200 Subject: [PATCH] remove "battery recall" logic the database is outdated several years now and the whole interface is removed from current UPower release anyway, so let's get rid of it in m-p-m, too --- data/org.mate.power-manager.gschema.xml.in | 5 -- src/gpm-common.h | 1 - src/gpm-engine.c | 47 ------------- src/gpm-engine.h | 4 -- src/gpm-manager.c | 108 ----------------------------- 5 files changed, 165 deletions(-) diff --git a/data/org.mate.power-manager.gschema.xml.in b/data/org.mate.power-manager.gschema.xml.in index adecce0..ca009b5 100644 --- a/data/org.mate.power-manager.gschema.xml.in +++ b/data/org.mate.power-manager.gschema.xml.in @@ -211,11 +211,6 @@ <_summary>Seconds of inactivity to spin down when on battery</_summary> <_description>The number of seconds of inactivity to spin down the disks when on battery power.</_description> </key> - <key name="notify-perhaps-recall" type="b"> - <default>true</default> - <_summary>If we should show the recalled battery warning for a broken battery</_summary> - <_description>If we should show the recalled battery warning for a broken battery. Set this to false only if you know your battery is okay.</_description> - </key> <key name="notify-low-capacity" type="b"> <default>true</default> <_summary>If we should show the low capacity warning for a broken battery</_summary> diff --git a/src/gpm-common.h b/src/gpm-common.h index ef20f88..303bdd1 100644 --- a/src/gpm-common.h +++ b/src/gpm-common.h @@ -98,7 +98,6 @@ G_BEGIN_DECLS #define GPM_SETTINGS_SPINDOWN_TIMEOUT_BATT "spindown-timeout-battery" /* notify */ -#define GPM_SETTINGS_NOTIFY_PERHAPS_RECALL "notify-perhaps-recall" #define GPM_SETTINGS_NOTIFY_LOW_CAPACITY "notify-low-capacity" #define GPM_SETTINGS_NOTIFY_DISCHARGING "notify-discharging" #define GPM_SETTINGS_NOTIFY_FULLY_CHARGED "notify-fully-charged" diff --git a/src/gpm-engine.c b/src/gpm-engine.c index 0f9d0c1..96a043e 100644 --- a/src/gpm-engine.c +++ b/src/gpm-engine.c @@ -72,7 +72,6 @@ enum { CHARGE_ACTION, DISCHARGING, LOW_CAPACITY, - PERHAPS_RECALL, LAST_SIGNAL }; @@ -761,42 +760,6 @@ gpm_engine_device_add (GpmEngine *engine, UpDevice *device) } /** - * gpm_engine_check_recall: - **/ -static gboolean -gpm_engine_check_recall (GpmEngine *engine, UpDevice *device) -{ - UpDeviceKind kind; - gboolean recall_notice = FALSE; - gchar *recall_vendor = NULL; - gchar *recall_url = NULL; - - /* get device properties */ - g_object_get (device, - "kind", &kind, - "recall-notice", &recall_notice, - "recall-vendor", &recall_vendor, - "recall-url", &recall_url, - NULL); - - /* not battery */ - if (kind != UP_DEVICE_KIND_BATTERY) - goto out; - - /* no recall data */ - if (!recall_notice) - goto out; - - /* emit signal for manager */ - egg_debug ("** EMIT: perhaps-recall"); - g_signal_emit (engine, signals [PERHAPS_RECALL], 0, device, recall_vendor, recall_url); -out: - g_free (recall_vendor); - g_free (recall_url); - return recall_notice; -} - -/** * gpm_engine_coldplug_idle_cb: **/ static gboolean @@ -829,7 +792,6 @@ gpm_engine_coldplug_idle_cb (GpmEngine *engine) for (i=0;i<array->len;i++) { device = g_ptr_array_index (array, i); gpm_engine_device_add (engine, device); - gpm_engine_check_recall (engine, device); } out: if (array != NULL) @@ -846,7 +808,6 @@ gpm_engine_device_added_cb (UpClient *client, UpDevice *device, GpmEngine *engin { /* add to list */ g_ptr_array_add (engine->priv->array, g_object_ref (device)); - gpm_engine_check_recall (engine, device); gpm_engine_recalculate_state (engine); } @@ -1134,14 +1095,6 @@ gpm_engine_class_init (GpmEngineClass *klass) G_STRUCT_OFFSET (GpmEngineClass, low_capacity), NULL, NULL, g_cclosure_marshal_VOID__POINTER, G_TYPE_NONE, 1, G_TYPE_POINTER); - signals [PERHAPS_RECALL] = - g_signal_new ("perhaps-recall", - G_TYPE_FROM_CLASS (object_class), - G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (GpmEngineClass, perhaps_recall), - NULL, NULL, gpm_marshal_VOID__POINTER_STRING_STRING, - G_TYPE_NONE, - 3, G_TYPE_POINTER, G_TYPE_STRING, G_TYPE_STRING); signals [FULLY_CHARGED] = g_signal_new ("fully-charged", G_TYPE_FROM_CLASS (object_class), diff --git a/src/gpm-engine.h b/src/gpm-engine.h index be1ccd6..43f8956 100644 --- a/src/gpm-engine.h +++ b/src/gpm-engine.h @@ -49,10 +49,6 @@ typedef struct gchar *icon); void (* summary_changed) (GpmEngine *engine, gchar *status); - void (* perhaps_recall) (GpmEngine *engine, - UpDevice *device, - const gchar *oem_vendor, - const gchar *website); void (* low_capacity) (GpmEngine *engine, UpDevice *device); void (* charge_low) (GpmEngine *engine, diff --git a/src/gpm-manager.c b/src/gpm-manager.c index 6ca9dea..c4d0530 100644 --- a/src/gpm-manager.c +++ b/src/gpm-manager.c @@ -68,7 +68,6 @@ static void gpm_manager_finalize (GObject *object); #define GPM_MANAGER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GPM_TYPE_MANAGER, GpmManagerPrivate)) -#define GPM_MANAGER_RECALL_DELAY 30 /* seconds */ #define GPM_MANAGER_NOTIFY_TIMEOUT_NEVER 0 /* ms */ #define GPM_MANAGER_NOTIFY_TIMEOUT_SHORT 10 * 1000 /* ms */ #define GPM_MANAGER_NOTIFY_TIMEOUT_LONG 30 * 1000 /* ms */ @@ -1092,111 +1091,6 @@ gpm_manager_settings_changed_cb (GSettings *settings, const gchar *key, GpmManag } /** - * gpm_manager_perhaps_recall_response_cb: - */ -static void -gpm_manager_perhaps_recall_response_cb (GtkDialog *dialog, gint response_id, GpmManager *manager) -{ - GdkScreen *screen; - GtkWidget *dialog_error; - GError *error = NULL; - gboolean ret; - const gchar *website; - - /* don't show this again */ - if (response_id == GTK_RESPONSE_CANCEL) { - g_settings_set_boolean (manager->priv->settings, GPM_SETTINGS_NOTIFY_PERHAPS_RECALL, FALSE); - goto out; - } - - /* visit recall website */ - if (response_id == GTK_RESPONSE_OK) { - screen = gdk_screen_get_default(); - website = (const gchar *) g_object_get_data (G_OBJECT (manager), "recall-oem-website"); - ret = gtk_show_uri (screen, website, gtk_get_current_event_time (), &error); - if (!ret) { - dialog_error = gtk_message_dialog_new (NULL, GTK_DIALOG_MODAL, GTK_MESSAGE_INFO, GTK_BUTTONS_OK, - "Failed to show url %s", error->message); - gtk_dialog_run (GTK_DIALOG (dialog_error)); - g_error_free (error); - } - goto out; - } -out: - gtk_widget_destroy (GTK_WIDGET (dialog)); - return; -} - -/** - * gpm_manager_perhaps_recall_delay_cb: - */ -static gboolean -gpm_manager_perhaps_recall_delay_cb (GpmManager *manager) -{ - const gchar *oem_vendor; - gchar *title = NULL; - gchar *message = NULL; - GtkWidget *dialog; - - oem_vendor = (const gchar *) g_object_get_data (G_OBJECT (manager), "recall-oem-vendor"); - - /* TRANSLATORS: the battery may be recalled by it's vendor */ - title = g_strdup_printf ("%s: %s", GPM_NAME, _("Battery may be recalled")); - message = g_strdup_printf (_("A battery in your computer may have been " - "recalled by %s and you may be at risk.\n\n" - "For more information visit the battery recall website."), oem_vendor); - dialog = gtk_message_dialog_new_with_markup (NULL, GTK_DIALOG_DESTROY_WITH_PARENT, - GTK_MESSAGE_INFO, GTK_BUTTONS_CLOSE, - "<span size='larger'><b>%s</b></span>", title); - - gtk_message_dialog_format_secondary_markup (GTK_MESSAGE_DIALOG (dialog), "%s", message); - - /* TRANSLATORS: button text, visit the manufacturers recall website */ - gtk_dialog_add_button (GTK_DIALOG (dialog), _("Visit recall website"), GTK_RESPONSE_OK); - - /* TRANSLATORS: button text, do not show this bubble again */ - gtk_dialog_add_button (GTK_DIALOG (dialog), _("Do not show me this again"), GTK_RESPONSE_CANCEL); - - /* wait async for response */ - gtk_widget_show (dialog); - g_signal_connect (dialog, "response", G_CALLBACK (gpm_manager_perhaps_recall_response_cb), manager); - - g_free (title); - g_free (message); - - /* never repeat */ - return FALSE; -} - -/** - * gpm_manager_engine_perhaps_recall_cb: - */ -static void -gpm_manager_engine_perhaps_recall_cb (GpmEngine *engine, UpDevice *device, gchar *oem_vendor, gchar *website, GpmManager *manager) -{ - gboolean ret; - - /* don't show when running under GDM */ - if (g_getenv ("RUNNING_UNDER_GDM") != NULL) { - egg_debug ("running under gdm, so no notification"); - return; - } - - /* already shown, and dismissed */ - ret = g_settings_get_boolean (manager->priv->settings, GPM_SETTINGS_NOTIFY_PERHAPS_RECALL); - if (!ret) { - egg_debug ("Gsettings prevents notification: %s", GPM_SETTINGS_NOTIFY_PERHAPS_RECALL); - return; - } - - g_object_set_data_full (G_OBJECT (manager), "recall-oem-vendor", (gpointer) g_strdup (oem_vendor), (GDestroyNotify) g_free); - g_object_set_data_full (G_OBJECT (manager), "recall-oem-website", (gpointer) g_strdup (website), (GDestroyNotify) g_free); - - /* delay by a few seconds so the panel can load */ - g_timeout_add_seconds (GPM_MANAGER_RECALL_DELAY, (GSourceFunc) gpm_manager_perhaps_recall_delay_cb, manager); -} - -/** * gpm_manager_engine_icon_changed_cb: */ static void @@ -2023,8 +1917,6 @@ gpm_manager_init (GpmManager *manager) gpm_manager_sync_policy_sleep (manager); manager->priv->engine = gpm_engine_new (); - g_signal_connect (manager->priv->engine, "perhaps-recall", - G_CALLBACK (gpm_manager_engine_perhaps_recall_cb), manager); g_signal_connect (manager->priv->engine, "low-capacity", G_CALLBACK (gpm_manager_engine_low_capacity_cb), manager); g_signal_connect (manager->priv->engine, "icon-changed", -- 1.9.1 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit lxdm for openSUSE:Factory
by root＠hilbert.suse.de 26 Apr '14

26 Apr '14

Hello community, here is the log from the commit of package lxdm for openSUSE:Factory checked in at 2014-04-26 10:06:11 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/lxdm (Old) and /work/SRC/openSUSE:Factory/.lxdm.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "lxdm" Changes: -------- --- /work/SRC/openSUSE:Factory/lxdm/lxdm.changes 2013-01-12 14:52:20.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.lxdm.new/lxdm.changes 2014-04-26 10:06:12.000000000 +0200 @@ -1,0 +2,12 @@ +Fri Apr 18 18:02:24 UTC 2014 - trcs(a)gmx.com + +- added lxdm-0.4.1-fix-gtk2-keyboard-list-empty.patch +- added lxdm-0.4.1-fix-small-bug-in-theme.patch + * "prompt" color in Industrial theme gtkrc file is honored +- modified lxdm-0.4.1-background-12.1.patch + * 1920x1080 is 16:9, the most common aspect ratio for monitors +- removed checks and patches for discontinued versions + * lxdm-0.4.0-background.patch + * cleaned spec file + +------------------------------------------------------------------- Old: ---- lxdm-0.4.0-background.patch New: ---- lxdm-0.4.1-fix-gtk2-keyboard-list-empty.patch lxdm-0.4.1-fix-small-bug-in-theme.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lxdm.spec ++++++ --- /var/tmp/diff_new_pack.qK8j4Z/_old 2014-04-26 10:06:13.000000000 +0200 +++ /var/tmp/diff_new_pack.qK8j4Z/_new 2014-04-26 10:06:13.000000000 +0200 @@ -32,19 +32,20 @@ Source4: config-users.png Source5: lxdm Source6: sysconfig.lxdm -Patch0: %{name}-0.4.0-background.patch # PATCH-FEATURE-OPENSUSE lxdm-0.4.0-use-sysconfig.patch andrea(a)opensuse.org # this patch allow lxdm to read system settings from /etc/sysconfig Patch1: %{name}-0.4.0-use-sysconfig.patch Patch2: %{name}-0.4.0-gnome-start.patch # PATCH-FIX-OPENSUSE lxdm-0.4.0-common.patch werner(a)novell.com # this patch fix bnc#586555 lxdm now use common scripts in /etc/X11/xdm -Patch4: %{name}-0.4.0-common.patch -Patch5: %{name}-0.4.0-fix-null-pointer-dereference.patch +Patch3: %{name}-0.4.0-common.patch +Patch4: %{name}-0.4.0-fix-null-pointer-dereference.patch # Patch needed to use current new default wallpaper location # bnc#732671 -Patch6: %{name}-0.4.1-background-12.1.patch -Patch7: %{name}-bnc-741454-d4e41ec.patch +Patch5: %{name}-0.4.1-background-12.1.patch +Patch6: %{name}-bnc-741454-d4e41ec.patch +Patch7: %{name}-0.4.1-fix-gtk2-keyboard-list-empty.patch +Patch8: %{name}-0.4.1-fix-small-bug-in-theme.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: ConsoleKit-devel BuildRequires: autoconf @@ -63,9 +64,7 @@ Requires: desktop-data-openSUSE Requires: pam PreReq: %fillup_prereq -%if 0%{?suse_version} >= 1210 Recommends: gnome-control-center-user-faces -%endif Provides: lxdm-conf = %version Obsoletes: lxdm-conf < %version @@ -76,17 +75,14 @@ %prep %setup -q -%if 0%{?suse_version} <= 1140 -%patch0 -p1 -%endif %patch1 -p1 %patch2 -p1 +%patch3 -p1 %patch4 -p1 %patch5 -p1 -%if 0%{?suse_version} >= 1210 %patch6 -p1 %patch7 -p1 -%endif +%patch8 -p1 %__cp %{SOURCE1} . ++++++ lxdm-0.4.1-background-12.1.patch ++++++ --- /var/tmp/diff_new_pack.qK8j4Z/_old 2014-04-26 10:06:13.000000000 +0200 +++ /var/tmp/diff_new_pack.qK8j4Z/_new 2014-04-26 10:06:13.000000000 +0200 @@ -5,7 +5,7 @@ ## background of the greeter -bg=/usr/share/backgrounds/default.png -+bg=/usr/share/wallpapers/openSUSEdefault/contents/images/1600x1200.jpg ++bg=/usr/share/wallpapers/openSUSEdefault/contents/images/1920x1080.jpg ## if show bottom pane bottom_pane=1 ++++++ lxdm-0.4.1-fix-gtk2-keyboard-list-empty.patch ++++++ From: 4e4f5ca87fb03c2e5b937f381673c51fd00bcb54 2012-10-22 From: dgod <dgod.osa(a)gmail.com> Subject: [PATCH] fix gtk2 keyboard list empty diff -uNr lxdm-0.4.1-old/data/themes/Industrial/greeter.ui lxdm-0.4.1-new/data/themes/Industrial/greeter.ui --- lxdm-0.4.1-old/data/themes/Industrial/greeter.ui 2011-07-29 15:42:33.000000000 +0200 +++ lxdm-0.4.1-new/data/themes/Industrial/greeter.ui 2012-10-22 11:15:02.000000000 +0200 @@ -201,7 +201,9 @@ </packing> </child> <child> - <object class="GtkComboBoxEntry" id="keyboard"/> + <object class="GtkComboBoxEntry" id="keyboard"> + <property name="text_column">0</property> + </object> <packing> <property name="expand">False</property> <property name="position">3</property> diff -uNr lxdm-0.4.1-old/data/lxdm.glade lxdm-0.4.1-new/data/lxdm.glade --- lxdm-0.4.1-old/data/lxdm.glade 2011-07-29 15:42:33.000000000 +0200 +++ lxdm-0.4.1-new/data/lxdm.glade 2012-10-22 11:15:02.000000000 +0200 @@ -125,7 +125,9 @@ </packing> </child> <child> - <object class="GtkComboBoxEntry" id="keyboard"/> + <object class="GtkComboBoxEntry" id="keyboard"> + <property name="text_column">0</property> + </object> <packing> <property name="expand">False</property> <property name="position">3</property> ++++++ lxdm-0.4.1-fix-small-bug-in-theme.patch ++++++ From: 8bdf42d903408ed6111b95a2992f3b9d471cfab6 2012-05-29 From: dgod <dgod.osa(a)gmail.com> Subject: [PATCH] fix small bug in theme diff -uNr lxdm-0.4.1-old/data/themes/Industrial/greeter-gtk3.ui lxdm-0.4.1-new/data/themes/Industrial/greeter-gtk3.ui --- lxdm-0.4.1-old/data/themes/Industrial/greeter-gtk3.ui 2011-07-29 15:42:33.000000000 +0200 +++ lxdm-0.4.1-new/data/themes/Industrial/greeter-gtk3.ui 2014-04-18 19:41:03.548173619 +0200 @@ -1,7 +1,5 @@ <?xml version="1.0"?> <interface> -  -  <object class="GtkWindow" id="lxdm"> <property name="decorated">False</property> <child> diff -uNr lxdm-0.4.1-old/data/themes/Industrial/gtkrc lxdm-0.4.1-new/data/themes/Industrial/gtkrc --- lxdm-0.4.1-old/data/themes/Industrial/gtkrc 2011-07-29 15:42:33.000000000 +0200 +++ lxdm-0.4.1-new/data/themes/Industrial/gtkrc 2014-04-18 19:40:46.627466119 +0200 @@ -45,6 +45,6 @@ widget "lxdm" style "back" widget "lxdm.*.time" style "time" -widget "lxdm.*.prompt" style "prompt" +widget "*.prompt" style "prompt" widget "lxdm.*.bottom_pane" style "bottom" widget_class "GtkWindow.*.GtkEventBox.*.<GtkLabel>" style "bottom" -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libmms for openSUSE:Factory
by root＠hilbert.suse.de 26 Apr '14

26 Apr '14

Hello community, here is the log from the commit of package libmms for openSUSE:Factory checked in at 2014-04-26 10:05:59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libmms (Old) and /work/SRC/openSUSE:Factory/.libmms.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libmms" Changes: -------- --- /work/SRC/openSUSE:Factory/libmms/libmms.changes 2013-03-26 14:12:07.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libmms.new/libmms.changes 2014-04-26 10:06:00.000000000 +0200 @@ -1,0 +2,11 @@ +Wed Apr 23 19:20:23 CEST 2014 - sbrabec(a)suse.cz + +- Update to version 0.6.4: + * Fix a possible heap memory overrun (bnc#874723, CVE-2014-2892). + * Some changes for more recent automake versions. + * Remove glib dependency. + * Fix several issues that prevented seeking from working. + * Remove dependency on iconv. + * Fix connecting to certain mms streams. + +------------------------------------------------------------------- Old: ---- libmms-0.6.2.tar.bz2 New: ---- libmms-0.6.4.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libmms.spec ++++++ --- /var/tmp/diff_new_pack.b2qbZa/_old 2014-04-26 10:06:01.000000000 +0200 +++ /var/tmp/diff_new_pack.b2qbZa/_new 2014-04-26 10:06:01.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package libmms # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,7 +19,7 @@ %define soname 0 Name: libmms -Version: 0.6.2 +Version: 0.6.4 Release: 0 # NOTE: there are files from the xine project with GPL headers in the source, # but these were re-licensed to LGPLv2+ with the explicit permission of all @@ -31,7 +31,7 @@ License: LGPL-2.1+ Group: System/Libraries Url: http://www.sf.net/projects/%{name} -Source0: %{name}-%{version}.tar.bz2 +Source0: %{name}-%{version}.tar.gz Source1: libmms-relicensing-1.txt Source2: libmms-relicensing-2.txt Source3: baselibs.conf -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libkpeople for openSUSE:Factory
by root＠hilbert.suse.de 26 Apr '14

26 Apr '14

Hello community, here is the log from the commit of package libkpeople for openSUSE:Factory checked in at 2014-04-26 10:05:50 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libkpeople (Old) and /work/SRC/openSUSE:Factory/.libkpeople.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libkpeople" Changes: -------- --- /work/SRC/openSUSE:Factory/libkpeople/libkpeople.changes 2014-02-21 20:54:18.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libkpeople.new/libkpeople.changes 2014-04-26 10:05:52.000000000 +0200 @@ -1,0 +2,6 @@ +Sat Apr 26 00:21:20 UTC 2014 - hrvoje.senjan(a)gmail.com + +- Update to 0.2.2 + * New bugfix release, no changelog provided + +------------------------------------------------------------------- Old: ---- libkpeople-0.2.1.tar.bz2 New: ---- libkpeople-0.2.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libkpeople.spec ++++++ --- /var/tmp/diff_new_pack.fa0XFu/_old 2014-04-26 10:05:52.000000000 +0200 +++ /var/tmp/diff_new_pack.fa0XFu/_new 2014-04-26 10:05:52.000000000 +0200 @@ -19,13 +19,13 @@ %define soversion 3 Name: libkpeople -Version: 0.2.1 +Version: 0.2.2 Release: 0 Summary: Provides access to all contacts and the people who hold them License: LGPL-2.1+ Group: Development/Libraries/Other Url: https://projects.kde.org/projects/playground/network/libkpeople -Source0: http://download.kde.org/unstable/%{name}/%{version}/%{name}-%{version}.tar.… +Source0: http://download.kde.org/unstable/%{name}/%{version}/src/%{name}-%{version}.… BuildRequires: libkde4-devel >= 4.10.1 BuildRequires: libkdepimlibs4-devel BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ libkpeople-0.2.1.tar.bz2 -> libkpeople-0.2.2.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkpeople-0.2.1/CMakeLists.txt new/libkpeople-0.2.2/CMakeLists.txt --- old/libkpeople-0.2.1/CMakeLists.txt 2014-02-20 17:06:50.000000000 +0100 +++ new/libkpeople-0.2.2/CMakeLists.txt 2014-04-26 01:58:25.000000000 +0200 @@ -12,7 +12,7 @@ set(KPEOPLE_VERSION_MAJOR 0) set(KPEOPLE_VERSION_MINOR 2) -set(KPEOPLE_VERSION_PATCH 1) +set(KPEOPLE_VERSION_PATCH 2) set(KPEOPLE_VERSION "${KPEOPLE_VERSION_MAJOR}.${KPEOPLE_VERSION_MINOR}.${KPEOPLE_VERSION_PATCH}") set(KPEOPLE_SOVERSION 3) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkpeople-0.2.1/po/CMakeLists.txt new/libkpeople-0.2.2/po/CMakeLists.txt --- old/libkpeople-0.2.1/po/CMakeLists.txt 2014-02-20 17:06:50.000000000 +0100 +++ new/libkpeople-0.2.2/po/CMakeLists.txt 2014-04-26 01:58:25.000000000 +0200 @@ -2,13 +2,15 @@ add_subdirectory( cs ) add_subdirectory( da ) add_subdirectory( de ) -add_subdirectory( el ) +add_subdirectory( fi ) add_subdirectory( fr ) add_subdirectory( hu ) add_subdirectory( lt ) add_subdirectory( nl ) +add_subdirectory( pl ) add_subdirectory( pt ) add_subdirectory( pt_BR ) +add_subdirectory( ro ) add_subdirectory( ru ) add_subdirectory( sk ) add_subdirectory( sl ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkpeople-0.2.1/po/da/libkpeople.po new/libkpeople-0.2.2/po/da/libkpeople.po --- old/libkpeople-0.2.1/po/da/libkpeople.po 2014-02-20 17:05:56.000000000 +0100 +++ new/libkpeople-0.2.2/po/da/libkpeople.po 2014-04-26 01:57:50.000000000 +0200 @@ -1,13 +1,13 @@ # Copyright (C) YEAR This_file_is_part_of_KDE # This file is distributed under the same license as the PACKAGE package. # -# Martin Schlander <mschlander(a)opensuse.org>, 2013. +# Martin Schlander <mschlander(a)opensuse.org>, 2013, 2014. msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" "POT-Creation-Date: 2014-02-18 01:50+0000\n" -"PO-Revision-Date: 2013-09-23 19:40+0200\n" +"PO-Revision-Date: 2014-02-23 14:40+0100\n" "Last-Translator: Martin Schlander <mschlander(a)opensuse.org>\n" "Language-Team: Danish <kde-i18n-doc(a)kde.org>\n" "Language: da\n" @@ -32,7 +32,7 @@ #. i18n: ectx: property (text), widget (QLabel, avatarPixmapLabel) #: widgets/person-details-presentation.ui:43 msgid "Avatar" -msgstr "" +msgstr "Avatar" #: widgets/plugins/emaildetailswidget.cpp:51 msgid "Email" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkpeople-0.2.1/po/el/CMakeLists.txt new/libkpeople-0.2.2/po/el/CMakeLists.txt --- old/libkpeople-0.2.1/po/el/CMakeLists.txt 2014-02-20 17:05:57.000000000 +0100 +++ new/libkpeople-0.2.2/po/el/CMakeLists.txt 1970-01-01 01:00:00.000000000 +0100 @@ -1,2 +0,0 @@ -file(GLOB _po_files *.po) -GETTEXT_PROCESS_PO_FILES( el ALL INSTALL_DESTINATION ${LOCALE_INSTALL_DIR} ${_po_files} ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkpeople-0.2.1/po/el/libkpeople.po new/libkpeople-0.2.2/po/el/libkpeople.po --- old/libkpeople-0.2.1/po/el/libkpeople.po 2014-02-20 17:05:57.000000000 +0100 +++ new/libkpeople-0.2.2/po/el/libkpeople.po 1970-01-01 01:00:00.000000000 +0100 @@ -1,51 +0,0 @@ -# Copyright (C) YEAR This_file_is_part_of_KDE -# This file is distributed under the same license as the PACKAGE package. -# -# Antonis Geralis <gaantonio(a)civil.auth.gr>, 2014. -msgid "" -msgstr "" -"Project-Id-Version: \n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2014-02-18 01:50+0000\n" -"PO-Revision-Date: 2014-02-04 21:37+0200\n" -"Last-Translator: Antonis Geralis <gaantonio(a)civil.auth.gr>\n" -"Language-Team: Greek <kde-i18n-doc(a)kde.org>\n" -"Language: el\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Lokalize 1.5\n" - -#: examples/contactlistqml.cpp:29 -msgid "SweetPeople - KPeople Example" -msgstr "SweetPeople - Παράδειγμα KPeople" - -#: widgets/mergedialog.cpp:65 -msgid "Duplicates Manager" -msgstr "Διαχειριστής διπλότυπων" - -#: widgets/mergedialog.cpp:74 -msgid "Select contacts to be merged" -msgstr "Επιλέξτε επαφές για συγχώνευση" - -#. i18n: ectx: property (text), widget (QLabel, avatarPixmapLabel) -#: widgets/person-details-presentation.ui:43 -msgid "Avatar" -msgstr "" - -#: widgets/plugins/emaildetailswidget.cpp:51 -msgid "Email" -msgstr "Email" - -#: widgets/plugins/mergecontactswidget.cpp:51 -msgid "Show Merge Suggestions..." -msgstr "Εμφάνιση προτάσεων για συγχώνευση..." - -#: widgets/plugins/mergecontactswidget.cpp:89 -msgid "Merge with Selected Contacts" -msgstr "Συγχώνευση με επιλεγμένες επαφές" - -#: widgets/plugins/phonedetailswidget.cpp:40 -msgid "Phone" -msgstr "Τηλέφωνο" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkpeople-0.2.1/po/fi/CMakeLists.txt new/libkpeople-0.2.2/po/fi/CMakeLists.txt --- old/libkpeople-0.2.1/po/fi/CMakeLists.txt 1970-01-01 01:00:00.000000000 +0100 +++ new/libkpeople-0.2.2/po/fi/CMakeLists.txt 2014-04-26 01:57:53.000000000 +0200 @@ -0,0 +1,2 @@ +file(GLOB _po_files *.po) +GETTEXT_PROCESS_PO_FILES( fi ALL INSTALL_DESTINATION ${LOCALE_INSTALL_DIR} ${_po_files} ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkpeople-0.2.1/po/fi/libkpeople.po new/libkpeople-0.2.2/po/fi/libkpeople.po --- old/libkpeople-0.2.1/po/fi/libkpeople.po 1970-01-01 01:00:00.000000000 +0100 +++ new/libkpeople-0.2.2/po/fi/libkpeople.po 2014-04-26 01:57:53.000000000 +0200 @@ -0,0 +1,51 @@ +# Copyright (C) YEAR This_file_is_part_of_KDE +# This file is distributed under the same license as the PACKAGE package. +# Lasse Liehu <lasse.liehu(a)gmail.com>, 2014. +# +msgid "" +msgstr "" +"Project-Id-Version: \n" +"Report-Msgid-Bugs-To: http://bugs.kde.org\n" +"POT-Creation-Date: 2014-02-18 01:50+0000\n" +"PO-Revision-Date: 2014-02-17 17:02+0200\n" +"Last-Translator: Lasse Liehu <lasse.liehu(a)gmail.com>\n" +"Language-Team: Finnish <lokalisointi(a)lists.coss.fi>\n" +"Language: fi\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"X-Generator: Lokalize 1.5\n" + +#: examples/contactlistqml.cpp:29 +msgid "SweetPeople - KPeople Example" +msgstr "SweetPeople – KPeople-esimerkki" + +#: widgets/mergedialog.cpp:65 +msgid "Duplicates Manager" +msgstr "Kaksoiskappaleiden hallinta" + +#: widgets/mergedialog.cpp:74 +msgid "Select contacts to be merged" +msgstr "Valitse yhdistettävät yhteystiedot" + +#. i18n: ectx: property (text), widget (QLabel, avatarPixmapLabel) +#: widgets/person-details-presentation.ui:43 +msgid "Avatar" +msgstr "Avatar" + +#: widgets/plugins/emaildetailswidget.cpp:51 +msgid "Email" +msgstr "Sähköposti" + +#: widgets/plugins/mergecontactswidget.cpp:51 +msgid "Show Merge Suggestions..." +msgstr "Näytä yhdistämisehdotukset…" + +#: widgets/plugins/mergecontactswidget.cpp:89 +msgid "Merge with Selected Contacts" +msgstr "Yhdistä valitut yhteystiedot" + +#: widgets/plugins/phonedetailswidget.cpp:40 +msgid "Phone" +msgstr "Puhelin" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkpeople-0.2.1/po/fr/libkpeople.po new/libkpeople-0.2.2/po/fr/libkpeople.po --- old/libkpeople-0.2.1/po/fr/libkpeople.po 2014-02-20 17:06:06.000000000 +0100 +++ new/libkpeople-0.2.2/po/fr/libkpeople.po 2014-04-26 01:57:54.000000000 +0200 @@ -1,13 +1,13 @@ # Copyright (C) YEAR This_file_is_part_of_KDE # This file is distributed under the same license as the PACKAGE package. -# Sebastien Renard <renard(a)kde.org>, 2013. +# Sebastien Renard <renard(a)kde.org>, 2013, 2014. # msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" "POT-Creation-Date: 2014-02-18 01:50+0000\n" -"PO-Revision-Date: 2013-12-01 14:55+0100\n" +"PO-Revision-Date: 2014-03-16 18:45+0100\n" "Last-Translator: Sebastien Renard <renard(a)kde.org>\n" "Language-Team: French <kde-francophone(a)kde.org>\n" "Language: fr\n" @@ -35,7 +35,7 @@ #. i18n: ectx: property (text), widget (QLabel, avatarPixmapLabel) #: widgets/person-details-presentation.ui:43 msgid "Avatar" -msgstr "" +msgstr "Avatar" #: widgets/plugins/emaildetailswidget.cpp:51 msgid "Email" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkpeople-0.2.1/po/pl/CMakeLists.txt new/libkpeople-0.2.2/po/pl/CMakeLists.txt --- old/libkpeople-0.2.1/po/pl/CMakeLists.txt 1970-01-01 01:00:00.000000000 +0100 +++ new/libkpeople-0.2.2/po/pl/CMakeLists.txt 2014-04-26 01:58:11.000000000 +0200 @@ -0,0 +1,2 @@ +file(GLOB _po_files *.po) +GETTEXT_PROCESS_PO_FILES( pl ALL INSTALL_DESTINATION ${LOCALE_INSTALL_DIR} ${_po_files} ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkpeople-0.2.1/po/pl/libkpeople.po new/libkpeople-0.2.2/po/pl/libkpeople.po --- old/libkpeople-0.2.1/po/pl/libkpeople.po 1970-01-01 01:00:00.000000000 +0100 +++ new/libkpeople-0.2.2/po/pl/libkpeople.po 2014-04-26 01:58:11.000000000 +0200 @@ -0,0 +1,52 @@ +# Copyright (C) YEAR This_file_is_part_of_KDE +# This file is distributed under the same license as the PACKAGE package. +# +# Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com>, 2014. +msgid "" +msgstr "" +"Project-Id-Version: \n" +"Report-Msgid-Bugs-To: http://bugs.kde.org\n" +"POT-Creation-Date: 2014-02-18 01:50+0000\n" +"PO-Revision-Date: 2014-03-22 15:03+0100\n" +"Last-Translator: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com>\n" +"Language-Team: Polish <kde-i18n-doc(a)kde.org>\n" +"Language: pl\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 " +"|| n%100>=20) ? 1 : 2);\n" +"X-Generator: Lokalize 1.5\n" + +#: examples/contactlistqml.cpp:29 +msgid "SweetPeople - KPeople Example" +msgstr "SweetPeople - Przykład KPeople" + +#: widgets/mergedialog.cpp:65 +msgid "Duplicates Manager" +msgstr "Zarządca powieleń" + +#: widgets/mergedialog.cpp:74 +msgid "Select contacts to be merged" +msgstr "Wybierz kontakty do scalenia" + +#. i18n: ectx: property (text), widget (QLabel, avatarPixmapLabel) +#: widgets/person-details-presentation.ui:43 +msgid "Avatar" +msgstr "Awatar" + +#: widgets/plugins/emaildetailswidget.cpp:51 +msgid "Email" +msgstr "E-mail" + +#: widgets/plugins/mergecontactswidget.cpp:51 +msgid "Show Merge Suggestions..." +msgstr "Pokaż sugestie scalania..." + +#: widgets/plugins/mergecontactswidget.cpp:89 +msgid "Merge with Selected Contacts" +msgstr "Scal z wybranymi kontaktami" + +#: widgets/plugins/phonedetailswidget.cpp:40 +msgid "Phone" +msgstr "Telefon" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkpeople-0.2.1/po/ro/CMakeLists.txt new/libkpeople-0.2.2/po/ro/CMakeLists.txt --- old/libkpeople-0.2.1/po/ro/CMakeLists.txt 1970-01-01 01:00:00.000000000 +0100 +++ new/libkpeople-0.2.2/po/ro/CMakeLists.txt 2014-04-26 01:58:13.000000000 +0200 @@ -0,0 +1,2 @@ +file(GLOB _po_files *.po) +GETTEXT_PROCESS_PO_FILES( ro ALL INSTALL_DESTINATION ${LOCALE_INSTALL_DIR} ${_po_files} ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkpeople-0.2.1/po/ro/libkpeople.po new/libkpeople-0.2.2/po/ro/libkpeople.po --- old/libkpeople-0.2.1/po/ro/libkpeople.po 1970-01-01 01:00:00.000000000 +0100 +++ new/libkpeople-0.2.2/po/ro/libkpeople.po 2014-04-26 01:58:13.000000000 +0200 @@ -0,0 +1,52 @@ +# Copyright (C) YEAR This_file_is_part_of_KDE +# This file is distributed under the same license as the PACKAGE package. +# +# Sergiu Bivol <sergiu(a)ase.md>, 2014. +msgid "" +msgstr "" +"Project-Id-Version: \n" +"Report-Msgid-Bugs-To: http://bugs.kde.org\n" +"POT-Creation-Date: 2014-02-18 01:50+0000\n" +"PO-Revision-Date: 2014-03-25 16:18+0200\n" +"Last-Translator: Sergiu Bivol <sergiu(a)ase.md>\n" +"Language-Team: Romanian <kde-i18n-ro(a)kde.org>\n" +"Language: ro\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < " +"20)) ? 1 : 2;\n" +"X-Generator: Lokalize 1.5\n" + +#: examples/contactlistqml.cpp:29 +msgid "SweetPeople - KPeople Example" +msgstr "" + +#: widgets/mergedialog.cpp:65 +msgid "Duplicates Manager" +msgstr "Gestionar de duplicate" + +#: widgets/mergedialog.cpp:74 +msgid "Select contacts to be merged" +msgstr "Alegeți contactele de îmbinat" + +#. i18n: ectx: property (text), widget (QLabel, avatarPixmapLabel) +#: widgets/person-details-presentation.ui:43 +msgid "Avatar" +msgstr "Avatar" + +#: widgets/plugins/emaildetailswidget.cpp:51 +msgid "Email" +msgstr "Email" + +#: widgets/plugins/mergecontactswidget.cpp:51 +msgid "Show Merge Suggestions..." +msgstr "Arată sugestii de îmbinare..." + +#: widgets/plugins/mergecontactswidget.cpp:89 +msgid "Merge with Selected Contacts" +msgstr "Îmbină cu contactele alese" + +#: widgets/plugins/phonedetailswidget.cpp:40 +msgid "Phone" +msgstr "Telefon" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkpeople-0.2.1/po/sl/libkpeople.po new/libkpeople-0.2.2/po/sl/libkpeople.po --- old/libkpeople-0.2.1/po/sl/libkpeople.po 2014-02-20 17:06:39.000000000 +0100 +++ new/libkpeople-0.2.2/po/sl/libkpeople.po 2014-04-26 01:58:16.000000000 +0200 @@ -1,13 +1,13 @@ # Copyright (C) YEAR This_file_is_part_of_KDE # This file is distributed under the same license as the PACKAGE package. # -# Andrej Mernik <andrejm(a)ubuntu.si>, 2013. +# Andrej Mernik <andrejm(a)ubuntu.si>, 2013, 2014. msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" "POT-Creation-Date: 2014-02-18 01:50+0000\n" -"PO-Revision-Date: 2013-12-02 22:15+0100\n" +"PO-Revision-Date: 2014-02-21 10:13+0100\n" "Last-Translator: Andrej Mernik <andrejm(a)ubuntu.si>\n" "Language-Team: Slovenian <lugos-slo(a)lugos.si>\n" "Language: sl\n" @@ -33,7 +33,7 @@ #. i18n: ectx: property (text), widget (QLabel, avatarPixmapLabel) #: widgets/person-details-presentation.ui:43 msgid "Avatar" -msgstr "" +msgstr "Podoba" #: widgets/plugins/emaildetailswidget.cpp:51 msgid "Email" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkpeople-0.2.1/src/global.h new/libkpeople-0.2.2/src/global.h --- old/libkpeople-0.2.1/src/global.h 2014-02-20 17:05:46.000000000 +0100 +++ new/libkpeople-0.2.2/src/global.h 2014-04-26 01:57:41.000000000 +0200 @@ -34,11 +34,12 @@ namespace KPeople { /** - * Merge all ids (person IDs and contactIds into a single person) - * returns the ID that will be created. + * Merge all ids into a single person. + * Ids can be a mix of person Ids and contact IDs. + * * @arg ids a list of all identifiers to be merged * - * @return the identifier of the new person + * @return the identifier of the new person or an empty string upon failure */ KPEOPLE_EXPORT QString mergeContacts(const QStringList &ids); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkpeople-0.2.1/src/personmanager.cpp new/libkpeople-0.2.2/src/personmanager.cpp --- old/libkpeople-0.2.1/src/personmanager.cpp 2014-02-20 17:05:46.000000000 +0100 +++ new/libkpeople-0.2.2/src/personmanager.cpp 2014-04-26 01:57:41.000000000 +0200 @@ -136,6 +136,10 @@ QStringList metacontacts; QStringList contacts; + bool rc = true; + + QList<QDBusMessage> pendingMessages; + // separate the passed ids to metacontacts and simple contacts Q_FOREACH (const QString &id, ids) { if (id.startsWith(QLatin1String("kpeople://"))) { @@ -182,32 +186,38 @@ updateQuery.prepare("UPDATE persons SET personID = ? WHERE contactID = ?"); updateQuery.bindValue(0, personIdString.mid(strlen("kpeople://"))); updateQuery.bindValue(1, id); - updateQuery.exec(); + if (!updateQuery.exec()) { + rc = false; + } QDBusMessage message = QDBusMessage::createSignal(QLatin1String("/KPeople"), QLatin1String("org.kde.KPeople"), QLatin1String("ContactRemovedFromPerson")); message.setArguments(QVariantList() << id); - QDBusConnection::sessionBus().send(message); + pendingMessages << message; message = QDBusMessage::createSignal(QLatin1String("/KPeople"), QLatin1String("org.kde.KPeople"), QLatin1String("ContactAddedToPerson")); message.setArguments(QVariantList() << id << personIdString); - QDBusConnection::sessionBus().send(message); + } } // process passed contacts if (contacts.size() > 0) { + + Q_FOREACH (const QString &id, contacts) { QSqlQuery insertQuery(m_db); insertQuery.prepare("INSERT INTO persons VALUES (?, ?)"); insertQuery.bindValue(0, id); insertQuery.bindValue(1, personIdString.mid(strlen("kpeople://"))); //strip kpeople:// - insertQuery.exec(); + if (!insertQuery.exec()) { + rc = false; + } //FUTURE OPTIMIZATION - this would be best as one signal, but arguments become complex QDBusMessage message = QDBusMessage::createSignal(QLatin1String("/KPeople"), @@ -215,8 +225,19 @@ QLatin1String("ContactAddedToPerson")); message.setArguments(QVariantList() << id << personIdString); + pendingMessages << message; + } + } + + //if success send all messages to other clients + //otherwise roll back our database changes and return an empty string + if (rc) { + Q_FOREACH(const QDBusMessage &message, pendingMessages) { QDBusConnection::sessionBus().send(message); } + } else { + t.cancel(); + personIdString.clear(); } return personIdString; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkpeople-0.2.1/src/personmanager_p.h new/libkpeople-0.2.2/src/personmanager_p.h --- old/libkpeople-0.2.1/src/personmanager_p.h 2014-02-20 17:05:46.000000000 +0100 +++ new/libkpeople-0.2.2/src/personmanager_p.h 2014-04-26 01:57:41.000000000 +0200 @@ -74,10 +74,11 @@ public Q_SLOTS: //merge all ids (person IDs and contactIds into a single person) //returns the ID that will be created + //users should KPeople::mergeContacts from global.h QString mergeContacts(const QStringList &ids); //unmerge a contact. Either remove a contact from a given person or remove a person - // + //users should KPeople::unmergeContact from global.h bool unmergeContact(const QString &id); Q_SIGNALS: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkpeople-0.2.1/src/personsmodel.cpp new/libkpeople-0.2.2/src/personsmodel.cpp --- old/libkpeople-0.2.1/src/personsmodel.cpp 2014-02-20 17:05:46.000000000 +0100 +++ new/libkpeople-0.2.2/src/personsmodel.cpp 2014-04-26 01:57:41.000000000 +0200 @@ -9,7 +9,6 @@ #include <KStandardDirs> #include <KDebug> -#include <QDebug> #include <QPixmap> #include <QTimer> @@ -20,9 +19,10 @@ QHash<QString /*contactId*/, QString /*PersonId*/> contactToPersons; //hash of person objects indexed by ID - QHash<QString /*Person ID*/, MetaContact> metacontacts; + QHash<QString /*Person ID*/, QPersistentModelIndex /*Row*/> personIndex; + //a list so we have an order in the model - QStringList personIds; + QList<MetaContact> metacontacts; QString genericAvatarImagePath; QList<AllContactsMonitorPtr> m_sourceMonitors; @@ -43,10 +43,15 @@ d->initialFetchesDoneCount = 0; Q_FOREACH (BasePersonsDataSource* dataSource, PersonPluginManager::dataSourcePlugins()) { const AllContactsMonitorPtr monitor = dataSource->allContactsMonitor(); - connect(monitor.data(), SIGNAL(initialFetchComplete()), - this, SLOT(onMonitorInitialFetchComplete())); + if (monitor.data()->isInitialFetchComplete()) { + QTimer::singleShot(0, this, SLOT(onMonitorInitialFetchComplete())); + } else { + connect(monitor.data(), SIGNAL(initialFetchComplete()), + this, SLOT(onMonitorInitialFetchComplete())); + } d->m_sourceMonitors << monitor; } + onContactsFetched(); connect(PersonManager::instance(), SIGNAL(contactAddedToPerson(QString,QString)), SLOT(onAddContactToPerson(QString,QString))); connect(PersonManager::instance(), SIGNAL(contactRemovedFromPerson(QString)), SLOT(onRemoveContactsFromPerson(QString))); @@ -63,6 +68,7 @@ QVariant PersonsModel::data(const QModelIndex &index, int role) const { + Q_D(const PersonsModel); //optimization - if we don't cover this role, ignore it @@ -78,13 +84,12 @@ if (role == ContactsVCardRole) { return QVariant::fromValue<KABC::AddresseeList>(KABC::AddresseeList()); } - const QString &personId = d->personIds[index.parent().row()]; - const MetaContact &mc = d->metacontacts[personId]; + const MetaContact &mc = d->metacontacts.at(index.parent().row()); - return dataForAddressee(personId, mc.contacts().at(index.row()), role); + return dataForAddressee(mc.id(), mc.contacts().at(index.row()), role); } else { - const QString &personId = d->personIds[index.row()]; - return dataForAddressee(personId, d->metacontacts[personId].personAddressee(), role); + const MetaContact &mc = d->metacontacts.at(index.row()); + return dataForAddressee(mc.id(), mc.personAddressee(), role); } } @@ -108,7 +113,7 @@ case PersonVCardRole: return QVariant::fromValue<KABC::Addressee>(person); case ContactsVCardRole: - return QVariant::fromValue<KABC::AddresseeList>(d->metacontacts[personId].contacts()); + return QVariant::fromValue<KABC::AddresseeList>(d->metacontacts[d->personIndex[personId].row()].contacts()); case GroupsRole: return person.categories(); } @@ -127,11 +132,11 @@ Q_D(const PersonsModel); if (!parent.isValid()) { - return d->personIds.size(); + return d->metacontacts.size(); } if (parent.isValid() && !parent.parent().isValid()) { - return d->metacontacts[d->personIds.at(parent.row())].contacts().count(); + return d->metacontacts.at(parent.row()).contacts().count(); } return 0; @@ -166,8 +171,6 @@ d->initialFetchesDoneCount++; Q_ASSERT(d->initialFetchesDoneCount <= d->m_sourceMonitors.count()); if (d->initialFetchesDoneCount == d->m_sourceMonitors.count()) { - - onContactsFetched(); Q_EMIT modelInitialized(); } } @@ -175,10 +178,10 @@ void PersonsModel::onContactsFetched() { Q_D(PersonsModel); + KABC::Addressee::Map addresseeMap; //fetch all already loaded contacts from plugins - KABC::AddresseeList contactList; Q_FOREACH (const AllContactsMonitorPtr &contactWatcher, d->m_sourceMonitors) { addresseeMap.unite(contactWatcher->contacts()); } @@ -218,8 +221,9 @@ const QString &personId = personIdForContact(contactId); - if (d->personIds.contains(personId)) { - MetaContact &mc = d->metacontacts[personId]; + if (d->personIndex.contains(personId)) { + int personRow = d->personIndex[personId].row(); + MetaContact &mc = d->metacontacts[personRow]; //if the MC object already contains this object, we want to update the row, not do an insert if (mc.contactIds().contains(contactId)) { @@ -227,7 +231,7 @@ onContactChanged(contactId, contact); } else { int newContactPos = mc.contacts().size(); - beginInsertRows(index(d->personIds.indexOf(personId)), newContactPos, newContactPos); + beginInsertRows(index(personRow), newContactPos, newContactPos); mc.insertContact(contactId, contact); endInsertRows(); personChanged(personId); @@ -244,11 +248,12 @@ Q_D(PersonsModel); const QString &personId = personIdForContact(contactId); - int row = d->metacontacts[personId].updateContact(contactId, contact); + int personRow = d->personIndex[personId].row(); + int contactRow = d->metacontacts[personRow].updateContact(contactId, contact); - const QModelIndex contactIndex = index(row, + const QModelIndex contactIndex = index(contactRow, 0, - index(d->personIds.indexOf(personId))); + index(personRow)); Q_EMIT dataChanged(contactIndex, contactIndex); @@ -261,10 +266,12 @@ const QString &personId = personIdForContact(contactId); - MetaContact &mc = d->metacontacts[personId]; - int contactPosition = d->metacontacts[personId].contactIds().indexOf(contactId); - beginRemoveRows(index(d->personIds.indexOf(personId), 0), contactPosition, contactPosition); - d->metacontacts[personId].removeContact(contactId); + int personRow = d->personIndex[personId].row(); + + MetaContact &mc = d->metacontacts[personRow]; + int contactPosition = mc.contactIds().indexOf(contactId); + beginRemoveRows(index(personRow, 0), contactPosition, contactPosition); + mc.removeContact(contactId); endRemoveRows(); //if MC object is now invalid remove the person from the list @@ -279,26 +286,38 @@ Q_D(PersonsModel); const QString oldPersonId = personIdForContact(contactId); + d->contactToPersons.insert(contactId, newPersonId); + int oldPersonRow = d->personIndex[oldPersonId].row(); + + if (oldPersonRow < 0) { + return; + } + + MetaContact &oldMc = d->metacontacts[oldPersonRow]; + //get contact already in the model, remove it from the previous contact - const KABC::Addressee &contact = d->metacontacts[oldPersonId].contact(contactId); - int contactPosition = d->metacontacts[oldPersonId].contacts().indexOf(contact); - beginRemoveRows(index(d->personIds.indexOf(oldPersonId), 0), contactPosition, contactPosition); - d->metacontacts[oldPersonId].removeContact(contactId); + int contactPosition = oldMc.contactIds().indexOf(contactId); + const KABC::Addressee contact = oldMc.contacts().at(contactPosition); + + beginRemoveRows(index(oldPersonRow), contactPosition, contactPosition); + oldMc.removeContact(contactId); endRemoveRows(); - if (!d->metacontacts[oldPersonId].isValid()) { + if (!oldMc.isValid()) { removePerson(oldPersonId); } else { personChanged(oldPersonId); } //if the new person is already in the model, add the contact to it - if (d->personIds.contains(newPersonId)) { - int newContactPos = d->metacontacts[newPersonId].contacts().size(); - beginInsertRows(index(d->personIds.indexOf(newPersonId), 0), newContactPos, newContactPos); - d->metacontacts[newPersonId].insertContact(contactId, contact); + if (d->personIndex.contains(newPersonId)) { + int newPersonRow = d->personIndex[newPersonId].row(); + MetaContact &newMc = d->metacontacts[newPersonRow]; + int newContactPos = newMc.contacts().size(); + beginInsertRows(index(newPersonRow), newContactPos, newContactPos); + newMc.insertContact(contactId, contact); endInsertRows(); personChanged(newPersonId); } else { //if the person is not in the model, create a new person and insert it @@ -314,12 +333,15 @@ Q_D(PersonsModel); const QString personId = personIdForContact(contactId); - const KABC::Addressee &contact = d->metacontacts[personId].contact(contactId); - d->metacontacts[personId].removeContact(contactId); + int personRow = d->personIndex[personId].row(); + MetaContact &mc = d->metacontacts[personRow]; + + const KABC::Addressee &contact = mc.contact(contactId); + mc.removeContact(contactId); d->contactToPersons.remove(contactId); //if we don't want the person object anymore - if (!d->metacontacts[personId].isValid()) { + if (!mc.isValid()) { removePerson(personId); } else { personChanged(personId); @@ -336,9 +358,10 @@ const QString &id = mc.id(); - beginInsertRows(QModelIndex(), d->personIds.size(), d->personIds.size()); - d->metacontacts[id] = mc; - d->personIds << id; + int row = d->metacontacts.size(); + beginInsertRows(QModelIndex(), row, row); + d->metacontacts.append(mc); + d->personIndex[id] = index(row); endInsertRows(); } @@ -346,21 +369,22 @@ { Q_D(PersonsModel); - int row = d->personIds.indexOf(id); - if (row < 0) { //item not found + QPersistentModelIndex index = d->personIndex.value(id); + if (!index.isValid()) { //item not found return; } - beginRemoveRows(QModelIndex(), row, row); - d->metacontacts.remove(id); - d->personIds.removeOne(id); + beginRemoveRows(QModelIndex(), index.row(), index.row()); + d->personIndex.remove(id); + d->metacontacts.removeAt(index.row()); endRemoveRows(); } void PersonsModel::personChanged(const QString &personId) { Q_D(const PersonsModel); - int row = d->personIds.indexOf(personId); + + int row = d->personIndex[personId].row(); if (row >= 0) { const QModelIndex personIndex = index(row); dataChanged(personIndex, personIndex); @@ -370,6 +394,7 @@ QString PersonsModel::personIdForContact(const QString &contactId) const { Q_D(const PersonsModel); + //TODO optimize with constFind() if (d->contactToPersons.contains(contactId)) { return d->contactToPersons[contactId]; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkpeople-0.2.1/src/plugins/akonadi/akonadidatasource.cpp new/libkpeople-0.2.2/src/plugins/akonadi/akonadidatasource.cpp --- old/libkpeople-0.2.1/src/plugins/akonadi/akonadidatasource.cpp 2014-02-20 17:05:46.000000000 +0100 +++ new/libkpeople-0.2.2/src/plugins/akonadi/akonadidatasource.cpp 2014-04-26 01:57:41.000000000 +0200 @@ -27,6 +27,7 @@ #include <Akonadi/Collection> #include <Akonadi/CollectionFetchJob> #include <Akonadi/CollectionFetchScope> +#include <Akonadi/ServerManager> #include <KABC/Addressee> @@ -50,6 +51,7 @@ void onItemAdded(const Akonadi::Item &item); void onItemChanged(const Akonadi::Item &item); void onItemRemoved(const Akonadi::Item &item); + void onServerStateChanged(Akonadi::ServerManager::State); private: Akonadi::Monitor *m_monitor; KABC::Addressee::Map m_contacts; @@ -60,6 +62,9 @@ m_monitor(new Akonadi::Monitor(this)), m_activeFetchJobsCount(0) { + connect(Akonadi::ServerManager::self(), SIGNAL(stateChanged(Akonadi::ServerManager::State)), SLOT(onServerStateChanged(Akonadi::ServerManager::State))); + onServerStateChanged(Akonadi::ServerManager::state()); + connect(m_monitor, SIGNAL(itemAdded(Akonadi::Item,Akonadi::Collection)), SLOT(onItemAdded(Akonadi::Item))); connect(m_monitor, SIGNAL(itemChanged(Akonadi::Item,QSet<QByteArray>)), SLOT(onItemChanged(Akonadi::Item))); connect(m_monitor, SIGNAL(itemRemoved(Akonadi::Item)), SLOT(onItemRemoved(Akonadi::Item))); @@ -131,7 +136,7 @@ onItemAdded(item); } - if (--m_activeFetchJobsCount == 0) { + if (--m_activeFetchJobsCount == 0 && !isInitialFetchComplete()) { emitInitialFetchComplete(); } } @@ -153,11 +158,21 @@ ++m_activeFetchJobsCount; } } - if (m_activeFetchJobsCount == 0) { + if (m_activeFetchJobsCount == 0 && !isInitialFetchComplete()) { emitInitialFetchComplete(); + } } +void AkonadiAllContacts::onServerStateChanged(ServerManager::State state) +{ + //if we're broken tell kpeople we've loaded so kpeople doesn't block + if(state == Akonadi::ServerManager::Broken && !isInitialFetchComplete()) { + emitInitialFetchComplete(); + qWarning() << "Akonadi failed to load, some metacontact features may not be available"; + qWarning() << "For more information please load akonadi_console" ; + } +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkpeople-0.2.1/src/widgets/persondetailsdialog.cpp new/libkpeople-0.2.2/src/widgets/persondetailsdialog.cpp --- old/libkpeople-0.2.1/src/widgets/persondetailsdialog.cpp 2014-02-20 17:05:46.000000000 +0100 +++ new/libkpeople-0.2.2/src/widgets/persondetailsdialog.cpp 2014-04-26 01:57:41.000000000 +0200 @@ -61,6 +61,8 @@ { Q_D(PersonDetailsDialog); d->view->setPerson(person); + + setWindowTitle(person->person().formattedName()); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkpeople-0.2.1/src/widgets/persondetailsview.cpp new/libkpeople-0.2.2/src/widgets/persondetailsview.cpp --- old/libkpeople-0.2.1/src/widgets/persondetailsview.cpp 2014-02-20 17:05:46.000000000 +0100 +++ new/libkpeople-0.2.2/src/widgets/persondetailsview.cpp 2014-04-26 01:57:41.000000000 +0200 @@ -88,7 +88,7 @@ { Q_UNUSED(contacts) //don't handle emails here - KABC::Field just lists one which is rubbish. Instead use a custom plugin that lists everything - if (m_field->category() == KABC::Field::Email) { + if (m_field->category() & KABC::Field::Email) { return 0; } -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libHX for openSUSE:Factory
by root＠hilbert.suse.de 26 Apr '14

26 Apr '14

Hello community, here is the log from the commit of package libHX for openSUSE:Factory checked in at 2014-04-26 10:05:43 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libHX (Old) and /work/SRC/openSUSE:Factory/.libHX.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libHX" Changes: -------- --- /work/SRC/openSUSE:Factory/libHX/libHX.changes 2014-02-25 07:33:18.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libHX.new/libHX.changes 2014-04-26 10:05:45.000000000 +0200 @@ -1,0 +2,6 @@ +Fri Apr 18 16:29:13 UTC 2014 - jengelh(a)inai.de + +- Update to new upstream release 3.20 +* Build fixes for the Solaris platform + +------------------------------------------------------------------- Old: ---- libHX-3.19.tar.xz libHX-3.19.tar.xz.asc New: ---- libHX-3.20.tar.asc libHX-3.20.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libHX.spec ++++++ --- /var/tmp/diff_new_pack.kfL5xk/_old 2014-04-26 10:05:45.000000000 +0200 +++ /var/tmp/diff_new_pack.kfL5xk/_new 2014-04-26 10:05:45.000000000 +0200 @@ -21,21 +21,18 @@ Summary: Useful collection of routines for C and C++ programming License: LGPL-2.1 or LGPL-3.0 Group: Development/Libraries/C and C++ -Version: 3.19 +Version: 3.20 Release: 0 Url: http://libhx.sf.net/ Source: http://downloads.sf.net/libhx/libHX-%version.tar.xz -Source2: http://downloads.sf.net/libhx/libHX-%version.tar.xz.asc +Source2: http://downloads.sf.net/libhx/libHX-%version.tar.asc Source3: baselibs.conf Source4: %name.keyring BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: gcc-c++ BuildRequires: pkgconfig BuildRequires: xz -%if 0%{?suse_version} >= 1230 -BuildRequires: gpg-offline -%endif %description libHX is a C library (with some C++ bindings available) that provides @@ -72,7 +69,6 @@ file parsing, type checking casts and more. %prep -%{?gpg_verify: %gpg_verify %{S:2}} %if 0%{?__xz:1} %setup -q %else ++++++ libHX-3.19.tar.xz -> libHX-3.20.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libHX-3.19/configure new/libHX-3.20/configure --- old/libHX-3.19/configure 2014-02-21 19:39:42.000000000 +0100 +++ new/libHX-3.20/configure 2014-04-18 18:28:15.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for libHX 3.19. +# Generated by GNU Autoconf 2.69 for libHX 3.20. # # # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. @@ -587,8 +587,8 @@ # Identity of this package. PACKAGE_NAME='libHX' PACKAGE_TARNAME='libhx' -PACKAGE_VERSION='3.19' -PACKAGE_STRING='libHX 3.19' +PACKAGE_VERSION='3.20' +PACKAGE_STRING='libHX 3.20' PACKAGE_BUGREPORT='' PACKAGE_URL='' @@ -646,6 +646,8 @@ libdl_LIBS HAVE_DLFCN_H_FALSE HAVE_DLFCN_H_TRUE +WITH_GNU_LD_FALSE +WITH_GNU_LD_TRUE pkgconfigdir MINGW32_FALSE MINGW32_TRUE @@ -1337,7 +1339,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures libHX 3.19 to adapt to many kinds of systems. +\`configure' configures libHX 3.20 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1407,7 +1409,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of libHX 3.19:";; + short | recursive ) echo "Configuration of libHX 3.20:";; esac cat <<\_ACEOF @@ -1517,7 +1519,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -libHX configure 3.19 +libHX configure 3.20 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2243,7 +2245,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by libHX $as_me 3.19, which was +It was created by libHX $as_me 3.20, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -3109,7 +3111,7 @@ # Define the identity of the package. PACKAGE='libhx' - VERSION='3.19' + VERSION='3.20' cat >>confdefs.h <<_ACEOF @@ -15884,6 +15886,15 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu + if test "$with_gnu_ld" = yes; then + WITH_GNU_LD_TRUE= + WITH_GNU_LD_FALSE='#' +else + WITH_GNU_LD_TRUE='#' + WITH_GNU_LD_FALSE= +fi + + LIBS_system="$LIBS" for ac_header in dlfcn.h do : @@ -16685,6 +16696,10 @@ as_fn_error $? "conditional \"MINGW32\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi +if test -z "${WITH_GNU_LD_TRUE}" && test -z "${WITH_GNU_LD_FALSE}"; then + as_fn_error $? "conditional \"WITH_GNU_LD\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi if test -z "${HAVE_DLFCN_H_TRUE}" && test -z "${HAVE_DLFCN_H_FALSE}"; then as_fn_error $? "conditional \"HAVE_DLFCN_H\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 @@ -17094,7 +17109,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by libHX $as_me 3.19, which was +This file was extended by libHX $as_me 3.20, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -17160,7 +17175,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -libHX config.status 3.19 +libHX config.status 3.20 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libHX-3.19/configure.ac new/libHX-3.20/configure.ac --- old/libHX-3.19/configure.ac 2014-02-21 19:39:10.000000000 +0100 +++ new/libHX-3.20/configure.ac 2014-04-18 18:27:55.000000000 +0200 @@ -1,4 +1,4 @@ -AC_INIT([libHX], [3.19]) +AC_INIT([libHX], [3.20]) AC_CONFIG_AUX_DIR([build-aux]) AC_CONFIG_HEADERS([config.h]) AC_CONFIG_MACRO_DIR([m4]) @@ -41,6 +41,8 @@ AC_SUBST([pkgconfigdir]) CHECK_GCC_FVISIBILITY +AM_CONDITIONAL([WITH_GNU_LD], [test "$with_gnu_ld" = yes]) + LIBS_system="$LIBS" AC_CHECK_HEADERS([dlfcn.h]) AM_CONDITIONAL([HAVE_DLFCN_H], [test "$ac_cv_header_dlfcn_h" = "yes"]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libHX-3.19/doc/changelog.txt new/libHX-3.20/doc/changelog.txt --- old/libHX-3.19/doc/changelog.txt 2014-02-21 19:39:10.000000000 +0100 +++ new/libHX-3.20/doc/changelog.txt 2014-04-18 18:27:55.000000000 +0200 @@ -4,6 +4,12 @@ ==== +v3.20 (2014-04-18) +================== +Enhancements: +- resolve some link errors when built with Solaris ld + + v3.19 (2014-02-21) ================== Enhancements: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libHX-3.19/doc/libHX_Documentation.lyx new/libHX-3.20/doc/libHX_Documentation.lyx --- old/libHX-3.19/doc/libHX_Documentation.lyx 2014-02-21 19:39:10.000000000 +0100 +++ new/libHX-3.20/doc/libHX_Documentation.lyx 2014-04-18 18:27:55.000000000 +0200 @@ -74,7 +74,7 @@ \begin_body \begin_layout Title -libHX 3.19 +libHX 3.20 \begin_inset Newline newline \end_inset @@ -11014,7 +11014,7 @@ \series bold char * \series default -HX_basename_safe( +HX_basename_exact( \series bold const char * \series default @@ -11025,7 +11025,7 @@ \begin_layout Plain Layout \family typewriter -HX_basename_safe +HX_basename_exact \end_layout \end_inset Files old/libHX-3.19/doc/libHX_Documentation.pdf and new/libHX-3.20/doc/libHX_Documentation.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libHX-3.19/src/Makefile.am new/libHX-3.20/src/Makefile.am --- old/libHX-3.19/src/Makefile.am 2014-02-21 19:39:10.000000000 +0100 +++ new/libHX-3.20/src/Makefile.am 2014-04-18 18:27:55.000000000 +0200 @@ -13,8 +13,10 @@ mc.c misc.c opt.c \ rand.c string.c time.c libHX_la_LIBADD = ${libdl_LIBS} ${libpthread_LIBS} ${librt_LIBS} -libHX_la_LDFLAGS = -no-undefined -version-info 31:0:3 \ - -Wl,--version-script=${srcdir}/libHX.map +libHX_la_LDFLAGS = -no-undefined -version-info 31:0:3 +if WITH_GNU_LD +libHX_la_LDFLAGS += -Wl,--version-script=${srcdir}/libHX.map +endif libHX_la_DEPENDENCIES = libHX.map if MINGW32 @@ -26,8 +28,10 @@ libHX_rtcheck_la_SOURCES = rtcheck.c libHX_rtcheck_la_LIBADD = ${libdl_LIBS} -libHX_rtcheck_la_LDFLAGS = -no-undefined -avoid-version -module \ - -Wl,--version-script=${srcdir}/libHX.map +libHX_rtcheck_la_LDFLAGS = -no-undefined -avoid-version -module +if WITH_GNU_LD +libHX_rtcheck_la_LDFLAGS += -Wl,--version-script=${srcdir}/libHX.map +endif EXTRA_DIST = internal.h map_int.h libHX.map diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libHX-3.19/src/Makefile.in new/libHX-3.20/src/Makefile.in --- old/libHX-3.19/src/Makefile.in 2014-02-21 19:39:43.000000000 +0100 +++ new/libHX-3.20/src/Makefile.in 2014-04-18 18:28:16.000000000 +0200 @@ -81,8 +81,10 @@ build_triplet = @build@ host_triplet = @host@ @HAVE_DLFCN_H_TRUE@am__append_1 = libHX_rtcheck.la -@MINGW32_TRUE@am__append_2 = ux-file.c ux-mmap.c -@B_PROC_TRUE@am__append_3 = proc.c +@WITH_GNU_LD_TRUE@am__append_2 = -Wl,--version-script=${srcdir}/libHX.map +@MINGW32_TRUE@am__append_3 = ux-file.c ux-mmap.c +@B_PROC_TRUE@am__append_4 = proc.c +@WITH_GNU_LD_TRUE@am__append_5 = -Wl,--version-script=${srcdir}/libHX.map check_PROGRAMS = tc-compile$(EXEEXT) tc-cast$(EXEEXT) \ tc-deque$(EXEEXT) tc-dir$(EXEEXT) tc-format$(EXEEXT) \ tc-link$(EXEEXT) tc-list$(EXEEXT) tc-list2$(EXEEXT) \ @@ -92,12 +94,12 @@ tc-strchr2$(EXEEXT) tc-string$(EXEEXT) tc-strquote$(EXEEXT) \ tc-time$(EXEEXT) $(am__EXEEXT_1) TESTS = tc-strchr2$(EXEEXT) tc-strquote$(EXEEXT) $(am__EXEEXT_2) -@HAVE_CXX_TRUE@am__append_4 = tx-compile tx-cast tx-deque tx-dir tx-list tx-list2 \ +@HAVE_CXX_TRUE@am__append_6 = tx-compile tx-cast tx-deque tx-dir tx-list tx-list2 \ @HAVE_CXX_TRUE@ tx-misc tx-netio \ @HAVE_CXX_TRUE@ tx-option tx-proc tx-rand tx-strchr2 tx-string \ @HAVE_CXX_TRUE@ tx-strquote tx-time -@HAVE_CXX_TRUE@am__append_5 = tx-strchr2 tx-strquote +@HAVE_CXX_TRUE@am__append_7 = tx-strchr2 tx-strquote subdir = src DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ $(top_srcdir)/build-aux/depcomp \ @@ -720,17 +722,14 @@ AM_CXXFLAGS = ${regular_CXXFLAGS} lib_LTLIBRARIES = libHX.la $(am__append_1) libHX_la_SOURCES = deque.c dl.c format.c io.c map.c mc.c misc.c opt.c \ - rand.c string.c time.c $(am__append_2) $(am__append_3) + rand.c string.c time.c $(am__append_3) $(am__append_4) libHX_la_LIBADD = ${libdl_LIBS} ${libpthread_LIBS} ${librt_LIBS} -libHX_la_LDFLAGS = -no-undefined -version-info 31:0:3 \ - -Wl,--version-script=${srcdir}/libHX.map - +libHX_la_LDFLAGS = -no-undefined -version-info 31:0:3 $(am__append_2) libHX_la_DEPENDENCIES = libHX.map libHX_rtcheck_la_SOURCES = rtcheck.c libHX_rtcheck_la_LIBADD = ${libdl_LIBS} libHX_rtcheck_la_LDFLAGS = -no-undefined -avoid-version -module \ - -Wl,--version-script=${srcdir}/libHX.map - + $(am__append_5) EXTRA_DIST = internal.h map_int.h libHX.map tc_cast_CFLAGS = ${AM_CFLAGS} -std=gnu99 tc_cast_LDADD = libHX.la -lm diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libHX-3.19/src/io.c new/libHX-3.20/src/io.c --- old/libHX-3.19/src/io.c 2014-02-21 19:39:10.000000000 +0100 +++ new/libHX-3.20/src/io.c 2014-04-18 18:27:55.000000000 +0200 @@ -99,7 +99,16 @@ size -= sizeof(d->dentry) - offsetof(struct dirent, d_name); size += name_max + 1; } else { +#ifdef NAME_MAX size += NAME_MAX; /* "best effort" :-/ */ +#elif defined(MAXNAMELEN) + size += MAXNAMELEN; +#else + fprintf(stderr, "libHX-warning: Cannot determine buffer size for readdir\n"); + closedir(tmp_dh); + errno = EINVAL; + return NULL; +#endif } if ((d = malloc(size)) == NULL) { closedir(tmp_dh); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libHX-3.19/src/libHX.map new/libHX-3.20/src/libHX.map --- old/libHX-3.19/src/libHX.map 2014-02-21 19:39:10.000000000 +0100 +++ new/libHX-3.20/src/libHX.map 2014-04-18 18:27:55.000000000 +0200 @@ -33,7 +33,6 @@ HX_strsep; HX_strupper; HX_zvecfree; - HX_zveclen; HXdeque_del; HXdeque_find; HXdeque_free; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libHX-3.19/src/string.c new/libHX-3.20/src/string.c --- old/libHX-3.19/src/string.c 2014-02-21 19:39:10.000000000 +0100 +++ new/libHX-3.20/src/string.c 2014-04-18 18:27:55.000000000 +0200 @@ -48,9 +48,15 @@ EXPORT_SYMBOL char *HX_basename(const char *s) { const char *p; + /* ignore trailing slashes */ for (p = s + strlen(s) - 1; p >= s && *p == '/'; --p) ; if (p < s) + /* + * String contained only slashes - this must be the root + * directory. Since we have the opportunity, rather than + * returning "////", just give the cleaned-up "/". + */ return const_cast1(char *, s + strlen(s) - 1); if ((p = HX_strbchr(s, p, '/')) != NULL) return const_cast1(char *, p + 1); @@ -65,9 +71,11 @@ if (*s == '\0') return HX_strdup("."); + /* ignore trailing slashes */ for (end = s + strlen(s) - 1; end >= s && *end == '/'; --end) ; if (end < s) + /* string consisted of only slashes */ return HX_strdup("/"); start = HX_strbchr(s, end, '/'); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libHX-3.19/src/tc-string.c new/libHX-3.20/src/tc-string.c --- old/libHX-3.19/src/tc-string.c 2014-02-21 19:39:10.000000000 +0100 +++ new/libHX-3.20/src/tc-string.c 2014-04-18 18:27:55.000000000 +0200 @@ -46,31 +46,22 @@ static void t_path(void) { static const char *const paths[] = { - ".", "..", "/", "//", "/.", "/./", "/./.", + ".", "..", "/", "//", "/.", "/./", "/.//", "/./.", "/mnt", "//mnt", "/mnt/", "//mnt/", "//mnt//", "//mnt//root", "/mnt/.", "/mnt/./", "mnt", "mnt/", "mnt/root", "mnt/root/", "mnt//root", NULL }; const char *const *iter; - char *item; - printf("# dirname\n"); + printf("#\tname\tbn\tbne\tdn\n"); for (iter = paths; *iter != NULL; ++iter) { - item = HX_dirname(*iter); - printf("\t%s -> %s\n", *iter, item); - free(item); + char *bn = HX_basename(*iter); + char *bne = HX_basename_exact(*iter); + char *dn = HX_dirname(*iter); + printf("\t%s\t%s\t%s\t%s\n", *iter, bn, bne, dn); + free(bne); + free(dn); } - - printf("# basename_exact\n"); - for (iter = paths; *iter != NULL; ++iter) { - item = HX_basename_exact(*iter); - printf("\t%s -> %s\n", *iter, item); - free(item); - } - - printf("# basename_fast\n"); - for (iter = paths; *iter != NULL; ++iter) - printf("\t%s -> %s\n", *iter, HX_basename(*iter)); } static void t_strcpy(void) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libdbi for openSUSE:Factory
by root＠hilbert.suse.de 26 Apr '14

26 Apr '14

Hello community, here is the log from the commit of package libdbi for openSUSE:Factory checked in at 2014-04-26 10:05:37 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libdbi (Old) and /work/SRC/openSUSE:Factory/.libdbi.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libdbi" Changes: -------- --- /work/SRC/openSUSE:Factory/libdbi/libdbi.changes 2013-09-09 19:43:58.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libdbi.new/libdbi.changes 2014-04-26 10:05:39.000000000 +0200 @@ -1,0 +2,6 @@ +Thu Apr 17 14:55:28 UTC 2014 - jengelh(a)inai.de + +- Update to git snapshot 0.9.0+git23 +* api: offer DATETIME fields also as a "struct tm" + +------------------------------------------------------------------- Old: ---- libdbi-0.9.0.tar.gz New: ---- libdbi-0.9.0.g23.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libdbi.spec ++++++ --- /var/tmp/diff_new_pack.vcZ7VR/_old 2014-04-26 10:05:39.000000000 +0200 +++ /var/tmp/diff_new_pack.vcZ7VR/_new 2014-04-26 10:05:39.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package libdbi # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,18 +17,33 @@ Name: libdbi -%define lname libdbi1 -Version: 0.9.0 +%define lname libdbi3 +Version: 0.9.0.g23 +#Snapshot: libdbi-0.9.0-23-gef3e376 Release: 0 Summary: Database Independent Abstraction Layer for C License: LGPL-2.1+ Group: Development/Libraries/C and C++ -Url: http://libdbi.sf.net/ +URL: http://libdbi.sf.net/ -Source: http://downloads.sf.net/libdbi/%name-%version.tar.gz +#Source: http://downloads.sf.net/libdbi/%name-%version.tar.gz +Source: %name-%version.tar.xz Source2: baselibs.conf -BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildRoot: %_tmppath/%name-%version-build +BuildRequires: autoconf +BuildRequires: automake +BuildRequires: libtool BuildRequires: pkgconfig +BuildRequires: xz +%define build_doc 1 +%if %build_doc +# Only needed when doc is not already prebuilt +BuildRequires: docbook-dsssl-stylesheets +BuildRequires: openjade +BuildRequires: texlive-collection-fontsrecommended +BuildRequires: texlive-jadetex +BuildRequires: texlive-pdftex-bin +%endif %description libdbi implements a database-independent abstraction layer in C, @@ -36,11 +51,11 @@ code, programmers can leverage the power of multiple databases and multiple simultaneous database connections by using this framework. -%package -n %{lname} +%package -n %lname Summary: Database Independent Abstraction Layer for C Group: System/Libraries -%description -n %{lname} +%description -n %lname libdbi implements a database-independent abstraction layer in C, similar to the DBI/DBD layer in Perl. Writing one generic set of code, programmers can leverage the power of multiple databases and @@ -49,39 +64,38 @@ %package devel Summary: Development files for libdbi (Database Independent Abstraction Layer for C) Group: Development/Libraries/C and C++ -Requires: %{lname} = %{version} +Requires: %lname = %version %description devel The libdbi-devel package contains the header files and documentation needed to develop applications with libdbi. %prep -%setup -q -sed -i s,\-O20,\-O3,g configure +%setup -qn %name %build -%configure --disable-docs --disable-static +autoreconf -fi +sed -i s,\-O20,\-O3,g configure +%configure --disable-static --docdir="%_docdir/%name" make %{?_smp_mflags} %install -make DESTDIR=$RPM_BUILD_ROOT install -rm %buildroot/%{_libdir}/libdbi.la -rm README.win32 +make install DESTDIR="%buildroot" +rm README.win32 "%buildroot/%_libdir/libdbi.la" + +%post -n %lname -p /sbin/ldconfig +%postun -n %lname -p /sbin/ldconfig -%files -n %{lname} +%files -n %lname %defattr(-,root,root) %doc AUTHORS ChangeLog COPYING README* -%{_libdir}/libdbi.so.* +%_libdir/libdbi.so.3* %files devel %defattr(-,root,root) -%doc TODO doc/programmers-guide.pdf doc/programmers-guide/ doc/driver-guide.pdf doc/driver-guide/ %_includedir/dbi/ -%{_libdir}/libdbi.so +%_libdir/libdbi.so %_libdir/pkgconfig/dbi.pc - -%post -n %{lname} -p /sbin/ldconfig - -%postun -n %{lname} -p /sbin/ldconfig +%_docdir/%name/ %changelog ++++++ baselibs.conf ++++++ --- /var/tmp/diff_new_pack.vcZ7VR/_old 2014-04-26 10:05:39.000000000 +0200 +++ /var/tmp/diff_new_pack.vcZ7VR/_new 2014-04-26 10:05:39.000000000 +0200 @@ -1,4 +1,4 @@ -libdbi1 +libdbi3 libdbi-devel requires -libdbi-<targettype> - requires "libdbi1-<targettype> = <version>" + requires "libdbi3-<targettype> = <version>" -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0