Hello community, here is the log from the commit of package kdebase3 checked in at Thu Nov 23 17:02:15 CET 2006. -------- --- KDE/kdebase3/kdebase3.changes 2006-11-22 04:51:48.000000000 +0100 +++ /mounts/work_src_done/STABLE/kdebase3/kdebase3.changes 2006-11-23 16:43:49.000000000 +0100 @@ -1,0 +2,6 @@ +Thu Nov 23 16:43:03 CET 2006 - dmueller@suse.de + +- fix kickoff sloppy region also in alternative layout +- use system language (#223445) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdebase3.spec ++++++ --- /var/tmp/diff_new_pack.jw5FSC/_old 2006-11-23 17:01:06.000000000 +0100 +++ /var/tmp/diff_new_pack.jw5FSC/_new 2006-11-23 17:01:06.000000000 +0100 @@ -52,7 +52,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build Url: http://www.kde.org/ Version: 3.5.5 -Release: 64 +Release: 65 %define kde_version 3.5.5 Source0: kdebase-%{kde_version}.tar.bz2 Source3: startkde.suse.sh @@ -379,7 +379,7 @@ Summary: Set and list fileshares Group: System/Management Version: 2.0 -Release: 193 +Release: 194 %description -n fileshareset This package contains the the fileshareset utility to allow users to @@ -1515,6 +1515,9 @@ %endif %changelog -n kdebase3 +* Thu Nov 23 2006 - dmueller@suse.de +- fix kickoff sloppy region also in alternative layout +- use system language (#223445) * Wed Nov 22 2006 - ltinkl@suse.cz - implement two requested DCOp functions for [#215262] - Suspend to disk with attached usb storage not working ++++++ kdm-sysconfig-values.diff ++++++ --- /var/tmp/diff_new_pack.jw5FSC/_old 2006-11-23 17:01:09.000000000 +0100 +++ /var/tmp/diff_new_pack.jw5FSC/_new 2006-11-23 17:01:09.000000000 +0100 @@ -1,8 +1,6 @@ -Index: kdm/config.def -=================================================================== --- kdm/config.def.orig +++ kdm/config.def -@@ -792,6 +792,21 @@ Description: +@@ -792,6 +792,21 @@ <emphasis>Do not</emphasis> change it, you may interfere with future upgrades and this could result in &kdm; failing to run. @@ -24,7 +22,7 @@ Key: PAMService If: defined(USE_PAM) Type: string -@@ -874,10 +889,10 @@ Description: +@@ -874,10 +889,10 @@ Key: PidFile Type: string @@ -38,7 +36,7 @@ Comment: Where &kdm; should store its PID (do not store if empty). Description: -@@ -901,10 +916,10 @@ Description: +@@ -901,10 +916,10 @@ Key: AuthDir Type: path # differs from XDM @@ -52,7 +50,7 @@ Comment: Where to store authorization files. Description: -@@ -930,7 +945,7 @@ Description: +@@ -930,7 +945,7 @@ Key: ExportList Type: list @@ -61,7 +59,7 @@ User: core Instance: #"LD_LIBRARY_PATH,ANOTHER_IMPORTANT_VAR" Merge: xdm(P_List) -@@ -1063,9 +1078,10 @@ Description: +@@ -1063,9 +1078,10 @@ Key: Enable Type: bool @@ -73,7 +71,7 @@ Comment: & Description: Whether &kdm; should listen to incoming &XDMCP; requests. -@@ -1102,11 +1118,10 @@ Description: +@@ -1102,11 +1118,10 @@ Key: Xaccess Type: string # differs from xdm @@ -88,7 +86,7 @@ Comment: &XDMCP; access control file in the usual XDM-Xaccess format. Description: -@@ -1164,13 +1179,11 @@ Description: +@@ -1164,13 +1179,11 @@ Key: Willing Type: string @@ -104,7 +102,7 @@ Comment: The program which is invoked to dynamically generate replies to &XDMCP; DirectQuery or BroadcastQuery requests. -@@ -1244,7 +1257,7 @@ Type: enum +@@ -1244,7 +1257,7 @@ None/BO_NONE: no boot manager Grub/BO_GRUB: Grub boot manager Lilo/BO_LILO: Lilo boot manager (Linux on i386 & x86-64 only) @@ -113,7 +111,7 @@ User: core User: greeter Instance: #Grub -@@ -1347,6 +1360,7 @@ Default: DEF_SERVER_CMD +@@ -1347,6 +1360,7 @@ DDefault: - User: core Instance: :*/DEF_SERVER_CMD @@ -121,7 +119,7 @@ Comment: The command line to start the &X-Server;, without display number and VT spec. This string is subject to word splitting. -@@ -1355,7 +1369,7 @@ Description: +@@ -1355,7 +1369,7 @@ This string is subject to word splitting. </para><para> The default is something reasonable for the system on which &kdm; was built, @@ -130,7 +128,7 @@ Key: ServerArgsLocal Type: string -@@ -1549,11 +1563,10 @@ Description: +@@ -1549,11 +1563,10 @@ Key: Resources # XXX strictly speaking this is supposed to be a string list, i think. Type: string @@ -144,7 +142,7 @@ Comment: Specify a file with X-resources for the greeter, chooser and background. The KDE frontend does not use this file, so you do not need it unless you -@@ -1581,12 +1594,11 @@ Description: +@@ -1581,12 +1594,11 @@ Key: Setup Type: string @@ -159,7 +157,7 @@ Comment: A program to run before the greeter is shown. Can be used to start an xconsole or an alternative background generator. Subject to word splitting. -@@ -1602,12 +1614,11 @@ Description: +@@ -1602,12 +1614,11 @@ Key: Startup Type: string @@ -174,7 +172,7 @@ Comment: A program to run before a user session starts. Subject to word splitting. Description: -@@ -1620,12 +1631,11 @@ Description: +@@ -1620,12 +1631,11 @@ Key: Reset Type: string @@ -189,7 +187,7 @@ Comment: A program to run after a user session exits. Subject to word splitting. Description: -@@ -1638,12 +1648,12 @@ Description: +@@ -1638,12 +1648,12 @@ Key: Session Type: string @@ -204,7 +202,7 @@ Comment: The program which is run as the user which logs in. It is supposed to interpret the session argument (see SessionsDirs) and start an appropriate -@@ -1746,10 +1756,11 @@ Description: +@@ -1746,10 +1756,11 @@ Key: AllowRootLogin Type: bool @@ -218,7 +216,7 @@ Merge: xdm Comment: Allow root logins? -@@ -1764,6 +1775,7 @@ User: core +@@ -1764,6 +1775,7 @@ # sensible? Instance: */false Instance: :*/true @@ -235,7 +233,7 @@ User: core User: greeter Instance: */Root -@@ -1779,8 +1791,9 @@ Default: All +@@ -1779,8 +1791,9 @@ User: core User: greeter Instance: */Root @@ -247,7 +245,7 @@ Comment: & Description: Who is allowed to shut down the system. This applies both to the -@@ -1866,6 +1879,7 @@ Type: bool +@@ -1866,6 +1879,7 @@ Default: false User: dep Instance: #:0/true @@ -255,7 +253,7 @@ Comment: & Description: Enable automatic login. <emphasis>Use with extreme care!</emphasis> -@@ -1899,7 +1913,7 @@ Default: "" +@@ -1899,7 +1913,7 @@ PostProc: PautoLoginX User: core(autoUser) User: greeter @@ -264,7 +262,7 @@ Merge: xdm:autoUser(P_autoUser) Comment: & Description: -@@ -1930,10 +1944,10 @@ Description: +@@ -1930,10 +1944,10 @@ Key: SessionsDirs Type: list @@ -277,7 +275,7 @@ Comment: The directories containing session type definitions in .desktop format. Description: -@@ -2008,7 +2022,8 @@ Type: enum +@@ -2008,7 +2022,8 @@ Clock/LOGO_CLOCK: a neat analog clock Default: Clock User: greeter @@ -287,7 +285,7 @@ Comment: What should be shown in the greeter's logo are: Description: -@@ -2223,7 +2238,7 @@ Description: +@@ -2223,7 +2238,7 @@ Key: HiddenUsers Type: list @@ -296,7 +294,7 @@ User: greeter-c(noUsers) Instance: #*/"root" # depends on {Min,Max}ShowUID -@@ -2363,13 +2378,14 @@ Type: enum +@@ -2363,13 +2378,14 @@ Default: OneStar User: greeter Instance: #*/NoEcho @@ -312,7 +310,7 @@ User: greeter Instance: #*/! Comment: -@@ -2507,6 +2523,7 @@ Type: bool +@@ -2507,6 +2523,7 @@ Default: false User: greeter Instance: :0/true @@ -320,7 +318,7 @@ Comment: Enable &kdm;'s built-in xconsole. Note that this can be enabled for only one display at a time. -@@ -2595,9 +2612,10 @@ Description: +@@ -2595,9 +2612,10 @@ Key: Preloader Type: string @@ -333,7 +331,7 @@ Comment: & Description: A program to run while the greeter is visible. It is supposed to preload -@@ -2606,7 +2624,7 @@ Description: +@@ -2606,7 +2624,7 @@ Key: UseTheme Type: bool @@ -342,7 +340,7 @@ User: greeter Instance: #*/true Comment: & -@@ -2615,9 +2633,10 @@ Description: +@@ -2615,9 +2633,10 @@ Key: Theme Type: string @@ -355,11 +353,9 @@ Comment: & Description: The theme to use for the greeter. Can point to either a directory or an XML -Index: kdm/kfrontend/read_sysconfig.sh -=================================================================== --- /dev/null +++ kdm/kfrontend/read_sysconfig.sh -@@ -0,0 +1,145 @@ +@@ -0,0 +1,147 @@ +#!/bin/bash +# +# Copyright (c) 2006 SUSE Linux Products GmbH Nuernberg, Germany. @@ -442,6 +438,8 @@ + echo "UseTheme=false" + echo "UseBackground=true" +fi ++# kdm has en_US as default instead of simply reading LC_LANG :( ++echo "Language=" + +echo "[Xdmcp]" +if [ "$DISPLAYMANAGER_REMOTE_ACCESS" = "yes" ]; then @@ -505,11 +503,9 @@ + +) > ${kdmdir}/kdmrc.sysconfig + -Index: kdm/kfrontend/kdm_config.c -=================================================================== --- kdm/kfrontend/kdm_config.c.orig +++ kdm/kfrontend/kdm_config.c -@@ -386,7 +386,7 @@ static const char *kdmrc = KDMCONF "/kdm +@@ -386,7 +386,7 @@ static Section *rootsec; static void @@ -518,7 +514,7 @@ { const char *nstr, *dstr, *cstr, *dhost, *dnum, *dclass; char *s, *e, *st, *en, *ek, *sl, *pt; -@@ -396,14 +396,9 @@ ReadConf() +@@ -396,14 +396,9 @@ int nlen, dlen, clen, dhostl, dnuml, dclassl; int i, line, sectmoan, restl; File file; @@ -535,7 +531,7 @@ return; for (s = file.buf, line = 0, cursec = 0, sectmoan = 1; s < file.eof; s++) { -@@ -429,7 +424,7 @@ ReadConf() +@@ -429,7 +424,7 @@ e--; if (*e != ']') { cursec = 0; @@ -544,7 +540,7 @@ continue; } nstr = sl + 1; -@@ -439,7 +434,7 @@ ReadConf() +@@ -439,7 +434,7 @@ !memcmp( nstr, cursec->name, nlen )) { LogInfo( "Multiple occurrences of section [%.*s] in %s. " @@ -553,7 +549,7 @@ goto secfnd; } if (nstr[0] == 'X' && nstr[1] == '-') { -@@ -495,7 +490,7 @@ ReadConf() +@@ -495,7 +490,7 @@ illsec: cursec = 0; LogError( "Unrecognized section name [%.*s] at %s:%d\n", @@ -562,7 +558,7 @@ continue; newsec: if (!(cursec = Malloc( sizeof(*cursec) ))) -@@ -523,7 +518,7 @@ ReadConf() +@@ -523,7 +518,7 @@ if (!cursec) { if (sectmoan) { sectmoan = 0; @@ -571,7 +567,7 @@ } goto sktoeol; } -@@ -531,13 +526,13 @@ ReadConf() +@@ -531,13 +526,13 @@ for (; (s < file.eof) && (*s != '\n'); s++) if (*s == '=') goto haveeq; @@ -587,7 +583,7 @@ goto sktoeol; } if (!isspace( *ek )) -@@ -551,7 +546,7 @@ ReadConf() +@@ -551,7 +546,7 @@ if (*s == '\\') { s++; if (s >= file.eof || *s == '\n') { @@ -596,7 +592,7 @@ break; } switch (*s) { -@@ -580,29 +575,42 @@ ReadConf() +@@ -580,29 +575,42 @@ goto keyok; } LogError( "Unrecognized key '%.*s' in section [%.*s] at %s:%d\n", @@ -644,11 +640,9 @@ static Entry * FindGEnt( int id ) { -Index: kdm/kfrontend/genkdmconf.c -=================================================================== --- kdm/kfrontend/genkdmconf.c.orig +++ kdm/kfrontend/genkdmconf.c -@@ -66,6 +66,7 @@ Foundation, Inc., 51 Franklin Street, Fi +@@ -66,6 +66,7 @@ #define stringify(x) __stringify(x) #define RCVERSTR stringify(RCVERMAJOR) "." stringify(RCVERMINOR) @@ -656,7 +650,7 @@ static int old_scripts, no_old_scripts, old_confs, no_old, no_backup, no_in_notice, use_destdir, mixed_scripts; -@@ -73,7 +74,7 @@ static const char *newdir = KDMCONF, *fa +@@ -73,7 +74,7 @@ *oldxdm, *oldkde; static int oldver; @@ -665,7 +659,7 @@ typedef struct StrList { struct StrList *next; -@@ -462,6 +463,7 @@ wrconf( FILE *f ) +@@ -462,6 +463,7 @@ const char *cmt; putfqval( "General", "ConfigVersion", RCVERSTR ); @@ -673,7 +667,7 @@ for (cs = config; cs; cs = cs->next) { fprintf( f, "%s[%s]\n", cs->comment ? cs->comment : "\n", cs->name ); -@@ -1363,6 +1365,26 @@ upd_consolettys( Entry *ce, Section *cs +@@ -1363,6 +1365,26 @@ } #endif @@ -700,7 +694,7 @@ #ifdef XDMCP static void cp_keyfile( Entry *ce, Section *cs ATTR_UNUSED ) -@@ -2228,7 +2250,7 @@ static int +@@ -2228,7 +2250,7 @@ mergeKdmRcNewer( const char *path ) { char *p; @@ -709,7 +703,7 @@ RSection *rootsect, *cs; REntry *ce; int i, j; -@@ -2291,8 +2313,12 @@ mergeKdmRcNewer( const char *path ) +@@ -2291,8 +2313,12 @@ } #ifdef XDMCP @@ -723,11 +717,9 @@ if (!*(cp = getfqval( "General", "ConfigVersion", "" ))) { /* < 3.1 */ mod_usebg = 1; if (is22conf( path )) { -Index: kdm/kfrontend/Makefile.am -=================================================================== --- kdm/kfrontend/Makefile.am.orig +++ kdm/kfrontend/Makefile.am -@@ -64,3 +64,7 @@ kdm_greet_COMPILE_FIRST = ../config.ci +@@ -64,3 +64,7 @@ kdm_config_COMPILE_FIRST = ../config.ci genkdmconf_COMPILE_FIRST = ../config.ci @@ -735,11 +727,9 @@ +appsdir = $(kde_datadir)/kdm +apps_SCRIPTS = read_sysconfig.sh + -Index: kdm/kfrontend/kdm_config.c -=================================================================== --- kdm/kfrontend/kdm_config.c.orig +++ kdm/kfrontend/kdm_config.c -@@ -433,7 +433,7 @@ ReadConfFile(const char *rcfile) +@@ -433,7 +433,7 @@ if (nlen == cursec->nlen && !memcmp( nstr, cursec->name, nlen )) { ++++++ kickoff.diff ++++++ --- /var/tmp/diff_new_pack.jw5FSC/_old 2006-11-23 17:01:10.000000000 +0100 +++ /var/tmp/diff_new_pack.jw5FSC/_new 2006-11-23 17:01:10.000000000 +0100 @@ -2740,7 +2740,7 @@ +} --- kicker/ui/k_new_mnu.cpp +++ kicker/ui/k_new_mnu.cpp -@@ -0,0 +1,3692 @@ +@@ -0,0 +1,3701 @@ +/***************************************************************** + + Copyright (c) 1996-2000 the kicker authors. See file AUTHORS. @@ -3255,7 +3255,7 @@ + + if (m_sloppyRegion.contains(p)) { + if (!m_sloppyTimer.isActive() || m_sloppySource != raiseRect) -+ m_sloppyTimer.start(style().styleHint(QStyle::SH_PopupMenu_SubMenuPopupDelay)/2); ++ m_sloppyTimer.start(style().styleHint(QStyle::SH_PopupMenu_SubMenuPopupDelay)); + m_sloppyWidget = raiseWidget; + m_sloppySource = raiseRect; + return false; @@ -3352,7 +3352,7 @@ + + if (e->type() == QEvent::Enter && receiver == m_stacker) + { -+ QRect r(m_stacker->mapToGlobal(QPoint(-8,-64)), m_stacker->size()); ++ QRect r(m_stacker->mapToGlobal(QPoint(-8,-32)), m_stacker->size()); + r.setSize(r.size()+QSize(16,128)); + + m_sloppyRegion = QRegion(r); @@ -3363,13 +3363,22 @@ + { + QPointArray points(4); + -+ points.setPoint(0, m_stacker->mapToGlobal(m_stacker->rect().bottomLeft())); -+ points.setPoint(1, m_stacker->mapToGlobal(m_stacker->rect().bottomRight())); ++ if (m_orientation == BottomUp) ++ { ++ points.setPoint(0, m_stacker->mapToGlobal(m_stacker->rect().bottomLeft())); ++ points.setPoint(1, m_stacker->mapToGlobal(m_stacker->rect().bottomRight())); ++ } ++ else ++ { ++ points.setPoint(0, m_stacker->mapToGlobal(m_stacker->rect().topLeft())); ++ points.setPoint(1, m_stacker->mapToGlobal(m_stacker->rect().topRight())); ++ } + + // hmm, eventually this should be mouse position + 10px, not + // just worst case. but worst case seems to work fine enough. + QPoint edge(raiseRect.topLeft()); -+ edge.setY(edge.y()+raiseRect.height()); ++ if (m_orientation == BottomUp) ++ edge.setY(edge.y()+raiseRect.height()); + edge.setX(edge.x()+raiseRect.center().x()); + + points.setPoint(2, edge+QPoint(-16,0)); @@ -7566,7 +7575,7 @@ + </property> + <property name="sizeHint"> + <size> -+ <width>104</width> ++ <width>10</width> + <height>20</height> + </size> + </property> ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org