Hello community, here is the log from the commit of package qinternet for openSUSE:Factory checked in at Fri Aug 21 18:54:22 CEST 2009. -------- --- KDE/qinternet/qinternet.changes 2009-04-29 16:42:52.000000000 +0200 +++ qinternet/qinternet.changes 2009-08-18 16:07:56.000000000 +0200 @@ -1,0 +2,5 @@ +Tue Aug 18 14:06:38 UTC 2009 - lnussel@suse.de + +- fix system tray icon display of addon icons (demand, multilink) + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- qinternet-0.75_git200904291639.tar.bz2 New: ---- qinternet-0.75_git200908181557.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qinternet.spec ++++++ --- /var/tmp/diff_new_pack.JMsKKl/_old 2009-08-21 18:53:12.000000000 +0200 +++ /var/tmp/diff_new_pack.JMsKKl/_new 2009-08-21 18:53:12.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package qinternet (Version 0.75_git200904291639) +# spec file for package qinternet (Version 0.75_git200908181557) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -24,7 +24,7 @@ Group: Productivity/Networking/PPP Summary: Internet Connection Tool Requires: smpppd -Version: 0.75_git200904291639 +Version: 0.75_git200908181557 Release: 1 Source0: qinternet-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ qinternet-0.75_git200904291639.tar.bz2 -> qinternet-0.75_git200908181557.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qinternet-0.75_git200904291639/configure new/qinternet-0.75_git200908181557/configure --- old/qinternet-0.75_git200904291639/configure 2009-04-29 16:40:13.000000000 +0200 +++ new/qinternet-0.75_git200908181557/configure 2009-08-18 16:05:58.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.63 for qinternet 0.75_git200904291639. +# Generated by GNU Autoconf 2.63 for qinternet 0.75_git200908181557. # # Report bugs to http://en.opensuse.org/Qinternet. # @@ -596,8 +596,8 @@ # Identity of this package. PACKAGE_NAME='qinternet' PACKAGE_TARNAME='qinternet' -PACKAGE_VERSION='0.75_git200904291639' -PACKAGE_STRING='qinternet 0.75_git200904291639' +PACKAGE_VERSION='0.75_git200908181557' +PACKAGE_STRING='qinternet 0.75_git200908181557' PACKAGE_BUGREPORT='http://en.opensuse.org/Qinternet' ac_unique_file="src/kinternet.cpp" @@ -1275,7 +1275,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 qinternet 0.75_git200904291639 to adapt to many kinds of systems. +\`configure' configures qinternet 0.75_git200908181557 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1345,7 +1345,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of qinternet 0.75_git200904291639:";; + short | recursive ) echo "Configuration of qinternet 0.75_git200908181557:";; esac cat <<\_ACEOF @@ -1437,7 +1437,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -qinternet configure 0.75_git200904291639 +qinternet configure 0.75_git200908181557 generated by GNU Autoconf 2.63 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1451,7 +1451,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by qinternet $as_me 0.75_git200904291639, which was +It was created by qinternet $as_me 0.75_git200908181557, which was generated by GNU Autoconf 2.63. Invocation command line was $ $0 $@ @@ -2255,7 +2255,7 @@ # Define the identity of the package. PACKAGE='qinternet' - VERSION='0.75_git200904291639' + VERSION='0.75_git200908181557' cat >>confdefs.h <<_ACEOF @@ -5238,7 +5238,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by qinternet $as_me 0.75_git200904291639, which was +This file was extended by qinternet $as_me 0.75_git200908181557, which was generated by GNU Autoconf 2.63. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -5301,7 +5301,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_version="\\ -qinternet config.status 0.75_git200904291639 +qinternet config.status 0.75_git200908181557 configured by $0, generated by GNU Autoconf 2.63, with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qinternet-0.75_git200904291639/src/datarateview.cpp new/qinternet-0.75_git200908181557/src/datarateview.cpp --- old/qinternet-0.75_git200904291639/src/datarateview.cpp 2008-04-25 14:56:13.000000000 +0200 +++ new/qinternet-0.75_git200908181557/src/datarateview.cpp 2009-08-18 15:57:15.000000000 +0200 @@ -292,7 +292,7 @@ void Data::shrink_history (unsigned int max_length) { - while (rates.count () > max_length) + while (static_cast<uint>( rates.count () ) > max_length) rates.pop_front (); } @@ -369,7 +369,7 @@ p.eraseRect (0, 0, w, h); Data::bytes_t max_rate = 5000; - for (unsigned int i = 0; i < data->rates.count (); i++) { + for (int i = 0; i < data->rates.count (); i++) { Data::bytes_t t = f (what, i); if (max_rate < t) max_rate = t; } @@ -388,7 +388,7 @@ } double c = (double)(h - 11) / (double)(max_rate); - for (unsigned int i = 0; i < data->rates.count (); i++) { + for (int i = 0; i < data->rates.count (); i++) { int r = (int) (f (what, i) * c); p.drawLine (i, h - 1, i, h - r); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qinternet-0.75_git200904291639/src/kinternet.cpp new/qinternet-0.75_git200908181557/src/kinternet.cpp --- old/qinternet-0.75_git200904291639/src/kinternet.cpp 2009-04-29 09:33:02.000000000 +0200 +++ new/qinternet-0.75_git200908181557/src/kinternet.cpp 2009-08-18 15:57:15.000000000 +0200 @@ -737,12 +737,14 @@ if (!demand) { slot_start (); } else { - if (action_flags & 0x02) - if (server->get_smpppd_version () >= 100) + if (action_flags & 0x02) { + if (server->get_smpppd_version () >= 100) { server->write_line ("dialin %s", (const char*) qap (myInterfaces.active->filename)); + } else server->write_line ("dialin"); + } } } @@ -767,12 +769,14 @@ if (!demand) { slot_stop (); } else { - if (action_flags & 0x04) - if (server->get_smpppd_version () >= 100) + if (action_flags & 0x04) { + if (server->get_smpppd_version () >= 100) { server->write_line ("hangup %s", (const char*) qap (myInterfaces.active->filename)); + } else server->write_line ("hangup"); + } } } @@ -788,12 +792,14 @@ if (!myInterfaces.active) return; - if (action_flags & 0x08) - if (server->get_smpppd_version () >= 100) + if (action_flags & 0x08) { + if (server->get_smpppd_version () >= 100) { server->write_line ("stop %s", (const char*) qap (myInterfaces.active->filename)); + } else server->write_line ("stop"); + } } @@ -895,11 +901,10 @@ update_icon (); } + void KInternet::select_icon() { - show_addons = false; - if (!autoserver) { fprintf(stderr, "no autoserver"); return; @@ -919,6 +924,7 @@ current_color.setRgb (125, 125, 125); show_addons = false; break; + case AutoServer::FAILURE: current_icon = error_icon; current_color.setRgb (125, 125, 125); @@ -954,26 +960,31 @@ case DISCONNECTED: current_icon = disconnected_icon; current_color.setRgb (0, 195, 0); + show_addons = true; break; case LURKING: current_icon = lurking_icon; current_color.setRgb (0, 195, 0); + show_addons = true; break; case NOLINK: current_icon = nolink_icon; current_color.setRgb (0, 195, 0); + show_addons = true; break; case CONNECTING: current_icon = connecting_icon; current_color.setRgb (225, 0, 0); + show_addons = true; break; case DISCONNECTING: current_icon = disconnecting_icon; current_color.setRgb (225, 0, 0); + show_addons = true; break; case CONNECTED: @@ -982,6 +993,7 @@ else current_icon = connected_icon; current_color.setRgb (225, 0, 0); + show_addons = true; break; } break; @@ -990,14 +1002,26 @@ } } + void KInternet::update_icon() { select_icon(); if(trayicon && current_icon) { - QIcon icon(*current_icon); - trayicon->setIcon(icon); + if (show_addons) { + QPixmap pixmap (*current_icon); + QPainter painter (&pixmap); + if (demand && demand_icon) + painter.drawPixmap (QPoint (0,0), *demand_icon); + if (num_links > 1 && multilink_icon) + painter.drawPixmap (QPoint (0,0), *multilink_icon); + trayicon->setIcon( QIcon(pixmap) ); + } + else { + QIcon icon (*current_icon); + trayicon->setIcon (icon); + } } if(isVisible()) { @@ -1005,6 +1029,7 @@ } } + void KInternet::paintEvent (QPaintEvent* pevent) { @@ -1071,6 +1096,7 @@ handleClick(event->button(), event->globalPos()); } + void KInternet::handleClick(Qt::MouseButton button, const QPoint& pos) { @@ -1285,11 +1311,13 @@ #endif } + void KInternet::slot_observe_wdialog(){ wirelessdlg_displayed = false; } + void KInternet::new_autoserver_status (AutoServer::status_t s) { @@ -2052,6 +2080,7 @@ } } + void KInternet::tray_activated ( QSystemTrayIcon::ActivationReason reason) { @@ -2076,6 +2105,7 @@ } } + void KInternet::slot_servererror(QString msg) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qinternet-0.75_git200904291639/src/parse.cpp new/qinternet-0.75_git200908181557/src/parse.cpp --- old/qinternet-0.75_git200904291639/src/parse.cpp 2008-04-25 14:56:13.000000000 +0200 +++ new/qinternet-0.75_git200908181557/src/parse.cpp 2009-08-18 15:57:15.000000000 +0200 @@ -66,7 +66,7 @@ if ((*p)->isNull() || (!(*p)->isLetter() && **p != '_')) return false; - while (!(*p)->isNull() && ((*p)->isLetterOrNumber() || **p == '_') || **p == '-') + while (!(*p)->isNull() && ((*p)->isLetterOrNumber() || (**p == '_') || (**p == '-'))) *key += *(*p)++; return true; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qinternet-0.75_git200904291639/src/server.cpp new/qinternet-0.75_git200908181557/src/server.cpp --- old/qinternet-0.75_git200904291639/src/server.cpp 2008-09-10 15:40:54.000000000 +0200 +++ new/qinternet-0.75_git200908181557/src/server.cpp 2009-08-18 15:57:15.000000000 +0200 @@ -355,7 +355,7 @@ if(get_debug_level() > 3) { QStringList tmp2 = QStringList::split (" ", tmp); - uint msg_len = tmp2[tmp2.size () - 1].toInt (); + int msg_len = tmp2[tmp2.size () - 1].toInt (); if (buffer.size () - 2 != msg_len) { fprintf (stderr, "warning: malformed block\n"); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qinternet-0.75_git200904291639/src/utils.cpp new/qinternet-0.75_git200908181557/src/utils.cpp --- old/qinternet-0.75_git200904291639/src/utils.cpp 2008-04-25 14:56:13.000000000 +0200 +++ new/qinternet-0.75_git200908181557/src/utils.cpp 2009-08-18 15:57:15.000000000 +0200 @@ -62,7 +62,7 @@ QString ret = in; - for (uint i = 0; i < ret.length (); i++) + for (int i = 0; i < ret.length (); i++) if (ret[i] == '\t') { const uint n = tabsize - (i % tabsize); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org