openSUSE Commits December 2008

commit@lists.opensuse.org

1 participants
817 discussions

by root＠Hilbert.suse.de

Hello community, here is the log from the commit of package NetworkManager-kde checked in at Mon Dec 1 12:11:27 CET 2008. -------- --- KDE/NetworkManager-kde/NetworkManager-kde.changes 2008-11-11 16:12:43.000000000 +0100 +++ /mounts/work_src_done/STABLE/NetworkManager-kde/NetworkManager-kde.changes 2008-11-30 12:14:37.133774000 +0100 @@ -1,0 +2,5 @@ +Sun Nov 30 12:14:23 CET 2008 - coolo(a)suse.de + +- do not autostart on kde4 either without NETWORKMANAGER=yes + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ NetworkManager-kde.spec ++++++ --- /var/tmp/diff_new_pack.Dq3302/_old 2008-12-01 12:10:37.000000000 +0100 +++ /var/tmp/diff_new_pack.Dq3302/_new 2008-12-01 12:10:37.000000000 +0100 @@ -28,7 +28,7 @@ Group: System/GUI/KDE AutoReqProv: on Version: 0.7r848570 -Release: 21 +Release: 22 Summary: KNetworkManager application for use with NetworkManager BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: NetworkManager >= 0.7 @@ -135,6 +135,8 @@ # fix this mess... mkdir -p $RPM_BUILD_ROOT/opt/kde3/share/autostart/ install -m 755 -D %{SOURCE1} $RPM_BUILD_ROOT/opt/kde3/env/knetworkmanager.default.sh +mkdir -p $RPM_BUILD_ROOT/usr/share/kde4/env +ln -s /opt/kde3/env/knetworkmanager.default.sh $RPM_BUILD_ROOT/usr/share/kde4/env/knetworkmanager.default.sh install %{appname}/src/%{appname}.desktop $RPM_BUILD_ROOT/opt/kde3/share/autostart/%{appname}-autostart.desktop echo "OnlyShowIn=KDE;" >> $RPM_BUILD_ROOT/opt/kde3/share/autostart/%{appname}-autostart.desktop %suse_update_desktop_file -r %appname Utility TrayIcon System Applet @@ -166,6 +168,7 @@ /opt/kde3/share/autostart/%{appname}-autostart.desktop /opt/kde3/share/icons/*/??x??/ /opt/kde3/env +/usr/share/kde4 /opt/kde3/share/servicetypes/%{appname}_plugin.desktop /opt/kde3/share/servicetypes/%{appname}_vpnplugin.desktop @@ -185,6 +188,8 @@ /opt/kde3/share/services/%{appname}_vpnc.desktop %changelog +* Sun Nov 30 2008 coolo(a)suse.de +- do not autostart on kde4 either without NETWORKMANAGER=yes * Tue Nov 11 2008 hschaa(a)suse.de - Fix empty identity setting (bnc#443742) * Thu Nov 06 2008 hschaa(a)suse.de ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

13 years, 7 months

commit mailman

by root＠Hilbert.suse.de

Hello community, here is the log from the commit of package mailman checked in at Mon Dec 1 12:10:27 CET 2008. -------- --- mailman/mailman.changes 2008-11-17 17:22:17.000000000 +0100 +++ /mounts/work_src_done/STABLE/mailman/mailman.changes 2008-11-30 17:39:04.730903000 +0100 @@ -1,0 +2,8 @@ +Sun Nov 30 17:28:50 CET 2008 - rommel(a)suse.de + +- the previous 'fix' of removing Mailman's own version of email was a bit crude + and broke Mailman in several places (bug #448530) + I replaced it with the upstream fix to 'configure' by Barry Warshaw + (see http://bazaar.launchpad.net/~barry/mailman/py26/changes) + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- mailman-python-26-email-fixes.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mailman.spec ++++++ --- /var/tmp/diff_new_pack.k32713/_old 2008-12-01 12:09:55.000000000 +0100 +++ /var/tmp/diff_new_pack.k32713/_new 2008-12-01 12:09:55.000000000 +0100 @@ -31,7 +31,7 @@ PreReq: permissions Summary: The GNU Mailing List Manager Version: 2.1.11 -Release: 7 +Release: 8 Source: %{name}-%{version}.tgz Source1: README.SuSE Source2: mailman-2.1-manpages.tgz @@ -67,6 +67,7 @@ Patch20: mailman-SuSE2.patch %endif Patch21: mailman-python-26-deprecation-md5-sha.diff +Patch22: mailman-python-26-email-fixes.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %define m_uid 72 %define m_gid 67 @@ -108,6 +109,7 @@ %patch20 %endif %patch21 +%patch22 cp -av %{S:1} . # ---------------------------------------------------------------------------- @@ -163,11 +165,6 @@ install -d $RPM_BUILD_ROOT%{_mandir}/man8/ tar xz -C $RPM_BUILD_ROOT%{_mandir}/man8/ -f %SOURCE2 install -m 644 %{S:11} $RPM_BUILD_ROOT/etc/logrotate.d/mailman -PYTHONVER=$(python -V 2>&1 | awk '{ print $2; }') -PYTHONMAJOR=${PYTHONVER%%.*} -PYTHONMINOR=${PYTHONVER#*.} -PYTHONMINOR=${PYTHONMINOR%%.*} -if [ "$PYTHONMAJOR" -gt 1 -a "$PYTHONMINOR" -gt 5 ]; then rm -rf $RPM_BUILD_ROOT/usr/lib/mailman/pythonlib/email*; fi %if %DISTRIBUTABLE %else cp %SOURCE12 $RPM_BUILD_ROOT/usr/lib/mailman/icons/ @@ -261,6 +258,11 @@ # ---------------------------------------------------------------------------- %changelog +* Sun Nov 30 2008 rommel(a)suse.de +- the previous 'fix' of removing Mailman's own version of email was a bit crude + and broke Mailman in several places (bug #448530) + I replaced it with the upstream fix to 'configure' by Barry Warshaw + (see http://bazaar.launchpad.net/~barry/mailman/py26/changes) * Wed Nov 12 2008 rommel(a)suse.de - added fix to work around md5/sha deprecation warning when hashlib is available (mailman-python-26-deprecation-md5-sha.diff) ++++++ mailman-python-26-email-fixes.diff ++++++ ++++ 7277 lines (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

13 years, 7 months

commit gsynaptics

by root＠Hilbert.suse.de

Hello community, here is the log from the commit of package gsynaptics checked in at Mon Dec 1 12:08:48 CET 2008. -------- --- GNOME/gsynaptics/gsynaptics.changes 2008-11-03 03:51:59.000000000 +0100 +++ /mounts/work_src_done/STABLE/gsynaptics/gsynaptics.changes 2008-11-29 18:35:34.000000000 +0100 @@ -1,0 +2,15 @@ +Sat Nov 29 17:34:21 CET 2008 - vuntz(a)novell.com + +- Add gsynaptics-CoastingSpeedThreshold.patch: use the right name + for the CoastingSpeed option. Taken from Gentoo. +- Add gsynaptics-decimal-separator.patch: make sure we always use . + as decimal separator. Taken from Debian. +- Add gsynaptics-support-partial-config.patch: fix the code to + actually work when some gconf keys are not defined. It was + possible to totally break the touchpad because of this. Taken + from Debian, fix bnc#402864. +- Remove gsynaptics-patch-missing-null.patch and update + gsynaptics-icon.patch because of this removal: we don't need both + patches. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- gsynaptics-patch-missing-null.patch New: ---- gsynaptics-CoastingSpeedThreshold.patch gsynaptics-decimal-separator.patch gsynaptics-support-partial-config.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gsynaptics.spec ++++++ --- /var/tmp/diff_new_pack.v28406/_old 2008-12-01 12:07:47.000000000 +0100 +++ /var/tmp/diff_new_pack.v28406/_new 2008-12-01 12:07:47.000000000 +0100 @@ -31,15 +31,19 @@ Group: System/GUI/GNOME AutoReqProv: on Version: 0.9.14 -Release: 68 +Release: 69 Summary: A Graphical Front-End for TouchPad Configuration Url: http://sourceforge.jp/projects/gsynaptics/ Source: %{name}-%{version}.tar.bz2 Source1: preferences-system-touchpad.tar.bz2 -# PATCH-FIX-UPSTREAM gsynaptics-patch-missing-null.patch snorp(a)novell.com bnc388236 -- submitted to http://sourceforge.jp/tracker/index.php?func=detail&aid=12568&group_id=1720… -Patch0: gsynaptics-patch-missing-null.patch +# PATCH-FIX-UPSTREAM gsynaptics-CoastingSpeedThreshold.patch vuntz(a)novell.com -- Taken from gentoo. http://bugs.gentoo.org/202501 +Patch0: gsynaptics-CoastingSpeedThreshold.patch # PATCH-FIX-UPSTREAM gsynaptics-icon.patch vuntz(a)novell.com -- http://sourceforge.jp/tracker/index.php?func=detail&aid=12499&group_id=1720… Patch1: gsynaptics-icon.patch +# PATCH-FIX-UPSTREAM gsynaptics-support-partial-config.patch vuntz(a)novell.com -- Taken from Debian, https://sourceforge.jp/tracker/index.php?func=detail&aid=12545&group_id=172… +Patch2: gsynaptics-support-partial-config.patch +# PATCH-FIX-UPSTREAM gsynaptics-decimal-separator.patch vuntz(a)novell.com -- Taken from Debian, https://sourceforge.jp/tracker/index.php?func=detail&aid=12544&group_id=172… +Patch3: gsynaptics-decimal-separator.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: x11-input-synaptics >= 0.14.4 Requires: %{name}-lang = %{version} @@ -60,6 +64,8 @@ %setup -a 1 %patch0 -p0 %patch1 -p1 +%patch2 -p1 +%patch3 -p1 %build autoreconf -f -i @@ -96,6 +102,18 @@ %files lang -f %{name}.lang %changelog +* Sat Nov 29 2008 vuntz(a)novell.com +- Add gsynaptics-CoastingSpeedThreshold.patch: use the right name + for the CoastingSpeed option. Taken from Gentoo. +- Add gsynaptics-decimal-separator.patch: make sure we always use . + as decimal separator. Taken from Debian. +- Add gsynaptics-support-partial-config.patch: fix the code to + actually work when some gconf keys are not defined. It was + possible to totally break the touchpad because of this. Taken + from Debian, fix bnc#402864. +- Remove gsynaptics-patch-missing-null.patch and update + gsynaptics-icon.patch because of this removal: we don't need both + patches. * Mon Nov 03 2008 vuntz(a)novell.com - Add gsynaptics-icon.patch and preferences-system-touchpad.tar.bz2 to install valid icons for the application. Fix bnc#405250. ++++++ gsynaptics-CoastingSpeedThreshold.patch ++++++ --- src/gsynaptics.c.orig 2008-01-04 14:45:16.721550130 +0100 +++ src/gsynaptics.c 2008-01-04 14:45:47.666549605 +0100 @@ -821,7 +821,7 @@ if (priv->synclient) { gchar *command; - command = g_strdup_printf ("synclient CoastingSpeedThreshold=%f", + command = g_strdup_printf ("synclient CoastingSpeed=%f", thresh); g_spawn_command_line_async (command, NULL); g_free (command); ++++++ gsynaptics-decimal-separator.patch ++++++ Fix format strings to always use . as decimal separator, see https://sourceforge.jp/tracker/index.php?func=detail&aid=12498&group_id=172… Forwarded to https://sourceforge.jp/tracker/index.php?func=detail&aid=12544&group_id=172… diff -urNad gsynaptics-0.9.14~/src/gsynaptics.c gsynaptics-0.9.14/src/gsynaptics.c --- gsynaptics-0.9.14~/src/gsynaptics.c 2008-02-28 23:21:17.000000000 +0100 +++ gsynaptics-0.9.14/src/gsynaptics.c 2008-05-17 08:36:54.000000000 +0200 @@ -713,8 +713,9 @@ if (priv->synclient) { gchar *command; - command = g_strdup_printf ("synclient AccelFactor=%f", - (gdouble)value / 1000); + char strval[G_ASCII_DTOSTR_BUF_SIZE]; + g_ascii_dtostr(strval, sizeof(strval), (gdouble)value / 1000); + command = g_strdup_printf ("synclient AccelFactor=%s", strval); g_spawn_command_line_async (command, NULL); g_free (command); } @@ -734,8 +735,9 @@ if (priv->synclient) { gchar *command; - command = g_strdup_printf ("synclient MaxSpeed=%f", - (gdouble)value / 1000); + char strval[G_ASCII_DTOSTR_BUF_SIZE]; + g_ascii_dtostr(strval, sizeof(strval), (gdouble)value / 1000); + command = g_strdup_printf ("synclient MaxSpeed=%s", strval); g_spawn_command_line_async (command, NULL); g_free (command); } @@ -755,8 +757,9 @@ if (priv->synclient) { gchar *command; - command = g_strdup_printf ("synclient MinSpeed=%f", - (gdouble)value / 1000); + char strval[G_ASCII_DTOSTR_BUF_SIZE]; + g_ascii_dtostr(strval, sizeof(strval), (gdouble)value / 1000); + command = g_strdup_printf ("synclient MinSpeed=%s", strval); g_spawn_command_line_async (command, NULL); g_free (command); } @@ -822,8 +825,10 @@ if (priv->synclient) { gchar *command; - command = g_strdup_printf ("synclient CoastingSpeed=%f", - thresh); + char strval[G_ASCII_DTOSTR_BUF_SIZE]; + g_ascii_dtostr(strval, sizeof(strval), thresh); + command = g_strdup_printf ("synclient CoastingSpeed=%s", + strval); g_spawn_command_line_async (command, NULL); g_free (command); } @@ -843,8 +848,9 @@ if (priv->synclient) { gchar *command; - command = g_strdup_printf ("synclient CircScrollDelta=%f", - (gdouble)delta / 1000); + char strval[G_ASCII_DTOSTR_BUF_SIZE]; + g_ascii_dtostr(strval, sizeof(strval), (gdouble)delta / 1000); + command = g_strdup_printf ("synclient CircScrollDelta=%s", strval); g_spawn_command_line_async (command, NULL); g_free (command); } ++++++ gsynaptics-icon.patch ++++++ --- /var/tmp/diff_new_pack.v28406/_old 2008-12-01 12:07:47.000000000 +0100 +++ /var/tmp/diff_new_pack.v28406/_new 2008-12-01 12:07:47.000000000 +0100 @@ -58,7 +58,7 @@ gtk_window_set_default_size (GTK_WINDOW (widget), 400, -1); -- path = g_build_filename (DATADIR "/pixmaps", "touchpad.png", NULL); +- path = g_build_filename (DATADIR "/pixmaps", "touchpad.png"); - if (path) - { - icon_pixbuf = gdk_pixbuf_new_from_file (path, NULL); ++++++ gsynaptics-support-partial-config.patch ++++++ Do not set to 0 when some keys are not defined. Debian bug #480744. Forwarded to https://sourceforge.jp/tracker/index.php?func=detail&aid=12545&group_id=172… diff -urNad gsynaptics-0.9.14~/src/init.c gsynaptics-0.9.14/src/init.c --- gsynaptics-0.9.14~/src/init.c 2008-02-28 23:27:41.000000000 +0100 +++ gsynaptics-0.9.14/src/init.c 2008-05-17 09:14:12.000000000 +0200 @@ -36,63 +36,148 @@ { gboolean b_value; gint i_value; + GConfValue *gval = NULL; if (!gconf_client_dir_exists (gconf, DIRNAME, NULL)) return; /* touchpad on/off */ - b_value = gconf_client_get_bool (gconf, OFF_KEY, NULL); - g_synaptics_set_enabled (synaptics, b_value ? 1 : 0); + gval = gconf_client_get (gconf, OFF_KEY, NULL); + if (gval != NULL) { + if (gval->type == GCONF_VALUE_BOOL) { + b_value = gconf_value_get_bool(gval); + g_synaptics_set_enabled (synaptics, b_value ? 1 : 0); + } + gconf_value_free(gval); + } /* vertical scroll delta */ - i_value = gconf_client_get_int (gconf, VERTSCROLLDELTA_KEY, NULL); - g_synaptics_set_vertical_scroll_delta (synaptics, i_value); + gval = gconf_client_get (gconf, VERTSCROLLDELTA_KEY, NULL); + if (gval != NULL) { + if (gval->type == GCONF_VALUE_INT) { + i_value = gconf_value_get_int(gval); + g_synaptics_set_vertical_scroll_delta (synaptics, i_value); + } + gconf_value_free(gval); + } /* horizontal scroll delta */ - i_value = gconf_client_get_int (gconf, HORIZSCROLLDELTA_KEY, NULL); - g_synaptics_set_horizontal_scroll_delta (synaptics, i_value); + gval = gconf_client_get (gconf, HORIZSCROLLDELTA_KEY, NULL); + if (gval != NULL) { + if (gval->type == GCONF_VALUE_INT) { + i_value = gconf_value_get_int(gval); + g_synaptics_set_horizontal_scroll_delta (synaptics, i_value); + } + gconf_value_free(gval); + } /* circular scroll */ - i_value = gconf_client_get_int (gconf, CIRCSCROLLDELTA_KEY, NULL); - b_value = gconf_client_get_bool (gconf, CIRCULARSCROLLING_KEY, NULL); - g_synaptics_set_circular_scroll_delta (synaptics, i_value); - g_synaptics_set_circular_scroll_enabled (synaptics, b_value); + gval = gconf_client_get (gconf, CIRCSCROLLDELTA_KEY, NULL); + if (gval != NULL) { + if (gval->type == GCONF_VALUE_INT) { + i_value = gconf_value_get_int(gval); + g_synaptics_set_circular_scroll_delta (synaptics, i_value); + } + gconf_value_free(gval); + } + gval = gconf_client_get (gconf, CIRCULARSCROLLING_KEY, NULL); + if (gval != NULL) { + if (gval->type == GCONF_VALUE_BOOL) { + b_value = gconf_value_get_bool(gval); + g_synaptics_set_circular_scroll_enabled (synaptics, b_value); + } + gconf_value_free(gval); + } /* the trigger of circular scrolling */ - i_value = gconf_client_get_int (gconf, CIRCSCROLLTRIGGER_KEY, NULL); - g_synaptics_set_circular_scroll_trigger (synaptics, i_value); + gval = gconf_client_get (gconf, CIRCSCROLLTRIGGER_KEY, NULL); + if (gval != NULL) { + if (gval->type == GCONF_VALUE_INT) { + i_value = gconf_value_get_int(gval); + g_synaptics_set_circular_scroll_trigger (synaptics, i_value); + } + gconf_value_free(gval); + } /* tapping time */ - i_value = gconf_client_get_int (gconf, MAXTAPTIME_KEY, NULL); - g_synaptics_set_tap_time (synaptics, i_value); + gval = gconf_client_get (gconf, MAXTAPTIME_KEY, NULL); + if (gval != NULL) { + if (gval->type == GCONF_VALUE_INT) { + i_value = gconf_value_get_int(gval); + g_synaptics_set_tap_time (synaptics, i_value); + } + gconf_value_free(gval); + } /* fast taps */ - b_value = gconf_client_get_bool (gconf, FASTTAPS_KEY, NULL); - g_synaptics_set_fast_taps (synaptics, b_value); + gval = gconf_client_get (gconf, FASTTAPS_KEY, NULL); + if (gval != NULL) { + if (gval->type == GCONF_VALUE_BOOL) { + b_value = gconf_value_get_bool(gval); + g_synaptics_set_fast_taps (synaptics, b_value); + } + gconf_value_free(gval); + } /* sensitivity */ - i_value = gconf_client_get_int (gconf, SENSITIVITY_KEY, NULL); - g_synaptics_set_sensitivity (synaptics, i_value); + gval = gconf_client_get (gconf, SENSITIVITY_KEY, NULL); + if (gval != NULL) { + if (gval->type == GCONF_VALUE_INT) { + i_value = gconf_value_get_int(gval); + g_synaptics_set_sensitivity (synaptics, i_value); + } + gconf_value_free(gval); + } /* coasting */ - b_value = gconf_client_get_bool (gconf, COASTENABLE_KEY, NULL); - g_synaptics_set_coasting_enabled (synaptics, b_value); + gval = gconf_client_get (gconf, COASTENABLE_KEY, NULL); + if (gval != NULL) { + if (gval->type == GCONF_VALUE_BOOL) { + b_value = gconf_value_get_bool(gval); + g_synaptics_set_coasting_enabled (synaptics, b_value); + } + gconf_value_free(gval); + } /* edge motion */ - b_value = gconf_client_get_bool (gconf, EDGEMOTIONUSEALWAYS_KEY, NULL); - g_synaptics_set_edge_motion_enabled (synaptics, b_value); + gval = gconf_client_get (gconf, EDGEMOTIONUSEALWAYS_KEY, NULL); + if (gval != NULL) { + if (gval->type == GCONF_VALUE_BOOL) { + b_value = gconf_value_get_bool(gval); + g_synaptics_set_edge_motion_enabled (synaptics, b_value); + } + gconf_value_free(gval); + } /* min speed */ - i_value = gconf_client_get_int (gconf, MINSPEED_KEY, NULL); - g_synaptics_set_min_speed (synaptics, i_value); + gval = gconf_client_get (gconf, MINSPEED_KEY, NULL); + if (gval != NULL) { + if (gval->type == GCONF_VALUE_INT) { + i_value = gconf_value_get_int(gval); + g_synaptics_set_min_speed (synaptics, i_value); + } + gconf_value_free(gval); + } /* max speed */ - i_value = gconf_client_get_int (gconf, MAXSPEED_KEY, NULL); - g_synaptics_set_max_speed (synaptics, i_value); + gval = gconf_client_get (gconf, MAXSPEED_KEY, NULL); + if (gval != NULL) { + if (gval->type == GCONF_VALUE_INT) { + i_value = gconf_value_get_int(gval); + g_synaptics_set_max_speed (synaptics, i_value); + } + gconf_value_free(gval); + } /* accel factor */ - i_value = gconf_client_get_int (gconf, ACCELFACTOR_KEY, NULL); - g_synaptics_set_accel_factor (synaptics, i_value); + gval = gconf_client_get (gconf, ACCELFACTOR_KEY, NULL); + if (gval != NULL) { + if (gval->type == GCONF_VALUE_INT) { + i_value = gconf_value_get_int(gval); + g_synaptics_set_accel_factor (synaptics, i_value); + } + gconf_value_free(gval); + } } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

13 years, 7 months

commit grub

by root＠Hilbert.suse.de

Hello community, here is the log from the commit of package grub checked in at Mon Dec 1 12:08:33 CET 2008. -------- --- arch/i386/grub/grub.changes 2008-11-20 17:57:58.000000000 +0100 +++ /mounts/work_src_done/STABLE/grub/grub.changes 2008-12-01 11:39:07.000000000 +0100 @@ -1,0 +2,7 @@ +Mon Dec 1 11:36:39 CET 2008 - duwe(a)suse.de + +- the string handling fix revealed other problems; + some device names won't fit into 16 chars. + Increase the size consistently, and fix bnc#450091 + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ grub.spec ++++++ --- /var/tmp/diff_new_pack.n27786/_old 2008-12-01 12:07:34.000000000 +0100 +++ /var/tmp/diff_new_pack.n27786/_new 2008-12-01 12:07:34.000000000 +0100 @@ -26,7 +26,7 @@ License: GPL v2 or later Group: System/Boot Version: 0.97 -Release: 155 +Release: 156 Source0: %{name}-%{version}.tar.gz Source1: installgrub Source2: grubonce @@ -230,6 +230,10 @@ exit 0 %changelog +* Mon Dec 01 2008 duwe(a)suse.de +- the string handling fix revealed other problems; + some device names won't fit into 16 chars. + Increase the size consistently, and fix bnc#450091 * Thu Nov 20 2008 duwe(a)suse.de - fix serious bug in "setup" command string handling * Thu Nov 06 2008 duwe(a)suse.de ++++++ string-ops-fix ++++++ --- /var/tmp/diff_new_pack.n27786/_old 2008-12-01 12:07:35.000000000 +0100 +++ /var/tmp/diff_new_pack.n27786/_new 2008-12-01 12:07:35.000000000 +0100 @@ -5,7 +5,7 @@ char real_config_filename[64]; char cmd_arg[256]; - char device[16]; -+#define DEVNAMLEN 16 ++#define DEVNAMLEN 256 + char device[DEVNAMLEN]; char *buffer = (char *) RAW_ADDR (0x100000); int is_force_lba = 0; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

13 years, 7 months

commit gfxboot

by root＠Hilbert.suse.de

Hello community, here is the log from the commit of package gfxboot checked in at Mon Dec 1 12:07:25 CET 2008. -------- --- arch/i386/gfxboot/gfxboot.changes 2008-11-20 18:25:48.000000000 +0100 +++ /mounts/work_src_done/STABLE/gfxboot/gfxboot.changes 2008-12-01 10:11:18.000000000 +0100 @@ -1,0 +2,5 @@ +Mon Dec 1 10:10:39 CET 2008 - snwint(a)suse.de + +- new texts for speech support (bnc #391313) + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- gfxboot-4.1.16.tar.bz2 New: ---- gfxboot-4.1.17.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gfxboot.spec ++++++ --- /var/tmp/diff_new_pack.P26009/_old 2008-12-01 12:06:50.000000000 +0100 +++ /var/tmp/diff_new_pack.P26009/_new 2008-12-01 12:06:50.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package gfxboot (Version 4.1.16) +# spec file for package gfxboot (Version 4.1.17) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -27,10 +27,10 @@ Requires: coreutils cpio mktemp perl master-boot-code dosfstools mtools perl-HTML-Parser AutoReqProv: on Summary: Graphical Boot Logo for GRUB, LILO and SYSLINUX -Version: 4.1.16 +Version: 4.1.17 Release: 1 BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source: gfxboot-4.1.16.tar.bz2 +Source: gfxboot-4.1.17.tar.bz2 Source1: openSUSE.tar.bz2 Source2: SLED.tar.bz2 Source3: SLES.tar.bz2 @@ -190,6 +190,8 @@ %ghost /boot/message %changelog +* Mon Dec 01 2008 snwint(a)suse.de +- new texts for speech support (bnc #391313) * Thu Nov 20 2008 snwint(a)suse.de - translations, again (bnc #445350) * Thu Nov 20 2008 snwint(a)suse.de ++++++ gfxboot-4.1.16.tar.bz2 -> gfxboot-4.1.17.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/gfxboot-4.1.16/Changelog new/gfxboot-4.1.17/Changelog --- old/gfxboot-4.1.16/Changelog 2008-11-20 17:47:01.000000000 +0100 +++ new/gfxboot-4.1.17/Changelog 2008-12-01 10:09:40.000000000 +0100 @@ -1,3 +1,6 @@ +1/12/2008: v4.1.17 + - new texts for speech support (bnc #391313) + 20/11/2008: v4.1.16 - translations, again (bnc #445350) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/gfxboot-4.1.16/VERSION new/gfxboot-4.1.17/VERSION --- old/gfxboot-4.1.16/VERSION 2008-11-20 17:46:31.000000000 +0100 +++ new/gfxboot-4.1.17/VERSION 2008-12-01 10:08:58.000000000 +0100 @@ -1 +1 @@ -4.1.16 +4.1.17 ++++++ openSUSE.tar.bz2 ++++++ Files old/themes/openSUSE/talk/en.tlk and new/themes/openSUSE/talk/en.tlk differ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/themes/openSUSE/talk/talk.po new/themes/openSUSE/talk/talk.po --- old/themes/openSUSE/talk/talk.po 2008-11-07 11:52:53.000000000 +0100 +++ new/themes/openSUSE/talk/talk.po 2008-12-01 10:02:02.000000000 +0100 @@ -36,6 +36,15 @@ msgid "Live-System-KDE" msgstr "" +msgid "openSUSE Live (GNOME)" +msgstr "" + +msgid "openSUSE Live (KDE)" +msgstr "" + +msgid "Failsafe Settings" +msgstr "" + # panel texts ++++++ SLED.tar.bz2 ++++++ ++++++ SLES.tar.bz2 ++++++ ++++++ upstream.tar.bz2 ++++++ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

13 years, 7 months

commit gdm

by root＠Hilbert.suse.de

Hello community, here is the log from the commit of package gdm checked in at Mon Dec 1 12:07:11 CET 2008. -------- --- GNOME/gdm/gdm.changes 2008-11-21 10:19:57.000000000 +0100 +++ /mounts/work_src_done/STABLE/gdm/gdm.changes 2008-12-01 06:46:19.000000000 +0100 @@ -1,0 +2,18 @@ +Sun Nov 30 22:55:57 CST 2008 - hpj(a)novell.com + +- Update gdm-sysconfig-settings.patch to translate the name of the + configured system keymap into something libxklavier can + understand (bnc#446958). + +------------------------------------------------------------------- +Sun Nov 30 18:05:54 CST 2008 - hpj(a)novell.com + +- Update gdm-domain-logon.patch to make domain prefix logon work + when entering user names manually (bnc#450146). + +------------------------------------------------------------------- +Sat Nov 29 19:44:16 CST 2008 - hpj(a)novell.com + +- Add gdm-save-panel-space-on-low-resolutions.patch (bnc#449815). + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- gdm-save-panel-space-on-low-resolutions.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gdm.spec ++++++ --- /var/tmp/diff_new_pack.z22607/_old 2008-12-01 12:05:11.000000000 +0100 +++ /var/tmp/diff_new_pack.z22607/_new 2008-12-01 12:05:11.000000000 +0100 @@ -57,7 +57,7 @@ License: GPL v2 or later Group: System/GUI/GNOME Version: 2.24.0 -Release: 12 +Release: 13 Summary: The GNOME 2.x Display Manager Source: %{name}-%{version}.tar.bz2 Source1: gdm.pamd @@ -95,6 +95,8 @@ Patch17: gdm-fix-pam-auditing.patch # PATCH-FIX-UPSTREAM gdm-always-reflect-keyboard-layout.patch bnc438159 bgo561771 hpj(a)novell.com -- Make keyboard selector not neglect to apply the selected keyboard in some situations. Patch18: gdm-always-reflect-keyboard-layout.patch +# PATCH-FIX-OPENSUSE gdm-save-panel-space-on-low-resolutions.patch bnc449815 hpj(a)novell.com -- Hide clock and/or selector labels on low resolutions. +Patch19: gdm-save-panel-space-on-low-resolutions.patch Patch28: gdm-X_SERVER.patch # PATCH-SUSE: enable SELinux Patch60: gdm-selinux.patch @@ -175,6 +177,7 @@ %patch16 -p1 %patch17 -p0 %patch18 -p1 +%patch19 -p1 %patch28 %patch60 @@ -283,6 +286,15 @@ %files lang -f %{name}.lang %changelog +* Sun Nov 30 2008 hpj(a)novell.com +- Update gdm-sysconfig-settings.patch to translate the name of the + configured system keymap into something libxklavier can + understand (bnc#446958). +* Sun Nov 30 2008 hpj(a)novell.com +- Update gdm-domain-logon.patch to make domain prefix logon work + when entering user names manually (bnc#450146). +* Sat Nov 29 2008 hpj(a)novell.com +- Add gdm-save-panel-space-on-low-resolutions.patch (bnc#449815). * Fri Nov 21 2008 hpj(a)novell.com - Add gdm-always-reflect-keyboard-layout.patch (bnc#438159). * Thu Nov 20 2008 hpj(a)novell.com ++++++ gdm-domain-logon.patch ++++++ --- /var/tmp/diff_new_pack.z22607/_old 2008-12-01 12:05:12.000000000 +0100 +++ /var/tmp/diff_new_pack.z22607/_new 2008-12-01 12:05:12.000000000 +0100 @@ -1665,7 +1665,7 @@ + +#endif /* __GDM_DOMAIN_PROVIDER_H */ diff --git a/gui/simple-greeter/gdm-greeter-panel.c b/gui/simple-greeter/gdm-greeter-panel.c -index 50478c5..e557ba9 100644 +index 50478c5..825f0c5 100644 --- a/gui/simple-greeter/gdm-greeter-panel.c +++ b/gui/simple-greeter/gdm-greeter-panel.c @@ -40,6 +40,7 @@ @@ -1756,7 +1756,7 @@ } void -@@ -651,6 +690,7 @@ gdm_greeter_panel_hide_user_options (GdmGreeterPanel *panel) +@@ -651,18 +690,26 @@ gdm_greeter_panel_hide_user_options (GdmGreeterPanel *panel) gtk_widget_hide (panel->priv->session_option_widget); gtk_widget_hide (panel->priv->language_option_widget); gtk_widget_hide (panel->priv->layout_option_widget); @@ -1764,7 +1764,26 @@ g_debug ("GdmGreeterPanel: activating default layout"); gdm_layout_activate (NULL); -@@ -730,3 +770,20 @@ gdm_greeter_panel_set_default_session_name (GdmGreeterPanel *panel, + } + + void ++gdm_greeter_panel_set_domain_enabled (GdmGreeterPanel *panel, gboolean enabled) ++{ ++ gtk_widget_set_sensitive (panel->priv->domain_option_widget, enabled); ++} ++ ++void + gdm_greeter_panel_reset (GdmGreeterPanel *panel) + { + gdm_greeter_panel_set_default_language_name (panel, NULL); + gdm_greeter_panel_set_default_layout_name (panel, NULL); + gdm_greeter_panel_set_default_session_name (panel, NULL); + gdm_greeter_panel_hide_user_options (panel); ++ gdm_greeter_panel_set_domain_enabled (panel, TRUE); + } + + void +@@ -730,3 +777,20 @@ gdm_greeter_panel_set_default_session_name (GdmGreeterPanel *panel, gdm_option_widget_set_default_item (GDM_OPTION_WIDGET (panel->priv->session_option_widget), session_name); } @@ -1786,7 +1805,7 @@ + domain_name); +} diff --git a/gui/simple-greeter/gdm-greeter-panel.h b/gui/simple-greeter/gdm-greeter-panel.h -index 07cca3f..5d2e2b2 100644 +index 07cca3f..6079569 100644 --- a/gui/simple-greeter/gdm-greeter-panel.h +++ b/gui/simple-greeter/gdm-greeter-panel.h @@ -53,6 +53,9 @@ typedef struct @@ -1799,7 +1818,15 @@ } GdmGreeterPanelClass; GType gdm_greeter_panel_get_type (void); -@@ -70,6 +73,8 @@ void gdm_greeter_panel_set_default_layout_name (GdmGree +@@ -64,12 +67,16 @@ void gdm_greeter_panel_show_user_options (GdmGree + void gdm_greeter_panel_hide_user_options (GdmGreeterPanel *panel); + void gdm_greeter_panel_reset (GdmGreeterPanel *panel); + ++void gdm_greeter_panel_set_domain_enabled (GdmGreeterPanel *panel, gboolean enabled); ++ + void gdm_greeter_panel_set_default_language_name (GdmGreeterPanel *panel, + const char *language_name); + void gdm_greeter_panel_set_default_layout_name (GdmGreeterPanel *panel, const char *layout_name); void gdm_greeter_panel_set_default_session_name (GdmGreeterPanel *panel, const char *session_name); @@ -1809,7 +1836,7 @@ #endif /* __GDM_GREETER_PANEL_H */ diff --git a/gui/simple-greeter/gdm-greeter-session.c b/gui/simple-greeter/gdm-greeter-session.c -index 83375b2..50c0e33 100644 +index 83375b2..fe85746 100644 --- a/gui/simple-greeter/gdm-greeter-session.c +++ b/gui/simple-greeter/gdm-greeter-session.c @@ -38,6 +38,8 @@ @@ -1821,17 +1848,19 @@ #include "gdm-profile.h" #define GDM_GREETER_SESSION_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GDM_TYPE_GREETER_SESSION, GdmGreeterSessionPrivate)) -@@ -48,6 +50,9 @@ struct GdmGreeterSessionPrivate +@@ -48,6 +50,11 @@ struct GdmGreeterSessionPrivate GtkWidget *login_window; GtkWidget *panel; + + char *user; + char *domain; ++ ++ gint n_info_queries; }; enum { -@@ -62,6 +67,33 @@ G_DEFINE_TYPE (GdmGreeterSession, gdm_greeter_session, G_TYPE_OBJECT) +@@ -62,6 +69,33 @@ G_DEFINE_TYPE (GdmGreeterSession, gdm_greeter_session, G_TYPE_OBJECT) static gpointer session_object = NULL; @@ -1865,7 +1894,28 @@ static void on_info (GdmGreeterClient *client, const char *text, -@@ -198,8 +230,14 @@ on_begin_verification_for_user (GdmGreeterLoginWindow *login_window, +@@ -99,6 +133,10 @@ on_reset (GdmGreeterClient *client, + + gdm_greeter_panel_reset (GDM_GREETER_PANEL (session->priv->panel)); + gdm_greeter_login_window_reset (GDM_GREETER_LOGIN_WINDOW (session->priv->login_window)); ++ ++ session->priv->n_info_queries = 0; ++ if (session->priv->panel) ++ gdm_greeter_panel_set_domain_enabled (GDM_GREETER_PANEL (session->priv->panel), TRUE); + } + + static void +@@ -174,6 +212,9 @@ on_secret_info_query (GdmGreeterClient *client, + { + g_debug ("GdmGreeterSession: Secret info query: %s", text); + ++ if (session->priv->panel) ++ gdm_greeter_panel_set_domain_enabled (GDM_GREETER_PANEL (session->priv->panel), FALSE); ++ + gdm_greeter_login_window_secret_info_query (GDM_GREETER_LOGIN_WINDOW (session->priv->login_window), text); + } + +@@ -198,8 +239,14 @@ on_begin_verification_for_user (GdmGreeterLoginWindow *login_window, const char *username, GdmGreeterSession *session) { @@ -1881,7 +1931,30 @@ } static void -@@ -236,13 +274,46 @@ on_select_layout (GdmGreeterSession *session, +@@ -207,8 +254,21 @@ on_query_answer (GdmGreeterLoginWindow *login_window, + const char *text, + GdmGreeterSession *session) + { ++ gchar *temp; ++ ++ if (session->priv->n_info_queries == 0) ++ temp = maybe_prepend_domain_to_user (session, text); ++ else ++ temp = g_strdup (text); ++ ++ if (session->priv->panel) ++ gdm_greeter_panel_set_domain_enabled (GDM_GREETER_PANEL (session->priv->panel), FALSE); ++ + gdm_greeter_client_call_answer_query (session->priv->client, +- text); ++ temp); ++ ++ g_free (temp); ++ session->priv->n_info_queries++; + } + + static void +@@ -236,13 +296,46 @@ on_select_layout (GdmGreeterSession *session, } static void @@ -1929,7 +2002,18 @@ } static void -@@ -300,6 +371,11 @@ toggle_panel (GdmGreeterSession *session, +@@ -251,6 +344,10 @@ on_cancelled (GdmGreeterLoginWindow *login_window, + { + gdm_greeter_panel_hide_user_options (GDM_GREETER_PANEL (session->priv->panel)); + gdm_greeter_client_call_cancel (session->priv->client); ++ ++ session->priv->n_info_queries = 0; ++ if (session->priv->panel) ++ gdm_greeter_panel_set_domain_enabled (GDM_GREETER_PANEL (session->priv->panel), TRUE); + } + + static void +@@ -300,6 +397,11 @@ toggle_panel (GdmGreeterSession *session, G_CALLBACK (on_select_session), session); @@ -1941,7 +2025,16 @@ gtk_widget_show (session->priv->panel); } else { gtk_widget_destroy (session->priv->panel); -@@ -563,6 +639,9 @@ gdm_greeter_session_finalize (GObject *object) +@@ -542,6 +644,8 @@ gdm_greeter_session_init (GdmGreeterSession *session) + G_CALLBACK (on_user_authorized), + session); + ++ session->priv->n_info_queries = 0; ++ + /* We want to listen for panel mnemonics even if the + * login window is focused, so we intercept them here. + */ +@@ -563,6 +667,9 @@ gdm_greeter_session_finalize (GObject *object) g_return_if_fail (greeter_session->priv != NULL); ++++++ gdm-save-panel-space-on-low-resolutions.patch ++++++ diff --git a/gui/simple-greeter/gdm-greeter-panel.c b/gui/simple-greeter/gdm-greeter-panel.c index e557ba9..c3e1c9b 100644 --- a/gui/simple-greeter/gdm-greeter-panel.c +++ b/gui/simple-greeter/gdm-greeter-panel.c @@ -557,6 +557,7 @@ gdm_greeter_panel_init (GdmGreeterPanel *panel) { NaTray *tray; GtkWidget *spacer; + GdkScreen *screen; gdm_profile_start (NULL); @@ -634,7 +635,15 @@ gdm_greeter_panel_init (GdmGreeterPanel *panel) panel->priv->clock = gdm_clock_widget_new (); gtk_box_pack_end (GTK_BOX (panel->priv->hbox), GTK_WIDGET (panel->priv->clock), FALSE, FALSE, 6); - gtk_widget_show (panel->priv->clock); + + screen = gtk_widget_get_screen (panel->priv->clock); + if (!screen) + screen = gdk_screen_get_default (); + + /* If resolution is limited, hide clock to conserve horizontal space */ + + if (!screen || gdk_screen_get_width (screen) > 1024) + gtk_widget_show (panel->priv->clock); tray = na_tray_new_for_screen (gtk_window_get_screen (GTK_WINDOW (panel)), GTK_ORIENTATION_HORIZONTAL); diff --git a/gui/simple-greeter/gdm-option-widget.c b/gui/simple-greeter/gdm-option-widget.c index 5561ce6..d49a375 100644 --- a/gui/simple-greeter/gdm-option-widget.c +++ b/gui/simple-greeter/gdm-option-widget.c @@ -617,8 +617,18 @@ gdm_option_widget_check_visibility (GdmOptionWidget *widget) if (widget->priv->number_of_top_rows > 0 || widget->priv->number_of_middle_rows > 1 || widget->priv->number_of_bottom_rows > 0) { + GdkScreen *screen; + gtk_widget_show (widget->priv->items_combo_box); - gtk_widget_show (widget->priv->label); + + screen = gtk_widget_get_screen (widget->priv->label); + if (!screen) + screen = gdk_screen_get_default (); + + /* If resolution is limited, hide labels to conserve horizontal space */ + + if (!screen || gdk_screen_get_width (screen) > 1280) + gtk_widget_show (widget->priv->label); if (widget->priv->icon_name != NULL) { gtk_widget_show (widget->priv->image); ++++++ gdm-sysconfig-settings.patch ++++++ --- /var/tmp/diff_new_pack.z22607/_old 2008-12-01 12:05:12.000000000 +0100 +++ /var/tmp/diff_new_pack.z22607/_new 2008-12-01 12:05:12.000000000 +0100 @@ -992,7 +992,7 @@ + +#endif /* __GDM_SYSCONFIG_H */ diff --git a/daemon/gdm-session-direct.c b/daemon/gdm-session-direct.c -index 75a1cec..8b74dea 100644 +index 75a1cec..886e7e8 100644 --- a/daemon/gdm-session-direct.c +++ b/daemon/gdm-session-direct.c @@ -45,6 +45,8 @@ @@ -1004,18 +1004,101 @@ #include "gdm-session-direct.h" #include "gdm-session.h" #include "gdm-session-private.h" -@@ -600,9 +602,11 @@ get_default_language_name (GdmSessionDirect *session) +@@ -600,8 +602,16 @@ get_default_language_name (GdmSessionDirect *session) static const char * get_default_layout_name (GdmSessionDirect *session) { - if (session->priv->saved_layout != NULL) { - return session->priv->saved_layout; -- } + if (!session->priv->saved_layout) + session->priv->saved_layout = gdm_sysconfig_load_value ("/etc/sysconfig/keyboard", "KEYTABLE"); + -+ if (session->priv->saved_layout) ++ if (session->priv->saved_layout) { ++ if (g_str_has_suffix (session->priv->saved_layout, ".gz")) ++ *(session->priv->saved_layout + strlen (session->priv->saved_layout) - strlen (".gz")) = '\0'; ++ if (g_str_has_suffix (session->priv->saved_layout, ".map")) ++ *(session->priv->saved_layout + strlen (session->priv->saved_layout) - strlen (".map")) = '\0'; ++ + return session->priv->saved_layout; + } return "us"; +diff --git a/gui/simple-greeter/gdm-layouts.c b/gui/simple-greeter/gdm-layouts.c +index 479d5ea..fba3147 100644 +--- a/gui/simple-greeter/gdm-layouts.c ++++ b/gui/simple-greeter/gdm-layouts.c +@@ -70,14 +70,35 @@ xci_desc_to_utf8 (XklConfigItem * ci) + g_locale_to_utf8 (sd, -1, NULL, NULL, NULL); } + ++static gchar * ++canonicalize_layout_name (const gchar *name) ++{ ++ gchar *canon_name; ++ ++ if (!name) ++ return NULL; ++ ++ canon_name = g_strdup (name); ++ ++ if (g_str_has_suffix (canon_name, ".gz")) ++ *(canon_name + strlen (canon_name) - strlen (".gz")) = '\0'; ++ if (g_str_has_suffix (canon_name, ".map")) ++ *(canon_name + strlen (canon_name) - strlen (".map")) = '\0'; ++ ++ return canon_name; ++} ++ + static void + add_variant (XklConfigRegistry *config, + const XklConfigItem *item, + gpointer data) + { + LayoutData *ldata = data; ++ gchar *name; + +- ldata->list = g_slist_prepend (ldata->list, g_strdup_printf ("%s\t%s", ldata->layout, item->name)); ++ name = canonicalize_layout_name (item->name); ++ ldata->list = g_slist_prepend (ldata->list, g_strdup_printf ("%s\t%s", ldata->layout, name)); ++ g_free (name); + } + + static void +@@ -86,11 +107,16 @@ add_layout (XklConfigRegistry *config, + gpointer data) + { + LayoutData *ldata = data; ++ gchar *name; + +- ldata->layout = item->name; +- ldata->list = g_slist_prepend (ldata->list, g_strdup (item->name)); +- xkl_config_registry_foreach_layout_variant (config, item->name, add_variant, data); ++ name = canonicalize_layout_name (item->name); ++ ++ ldata->layout = name; ++ ldata->list = g_slist_prepend (ldata->list, g_strdup (name)); ++ xkl_config_registry_foreach_layout_variant (config, name, add_variant, data); + ldata->layout = NULL; ++ ++ g_free (name); + } + #endif + +@@ -108,7 +134,7 @@ gdm_get_layout_from_name (const char *name) + + init_xkl (); + +- id1 = g_strdup (name); ++ id1 = canonicalize_layout_name (name); + p = strchr (id1, '\t'); + + if (p != NULL) { +@@ -207,7 +233,7 @@ gdm_layout_activate (const char *layout) + config->options = g_strdupv (initial_config->options); + } else { + config->layouts = g_new0 (char *, 2); +- config->layouts[0] = g_strdup (layout); ++ config->layouts[0] = canonicalize_layout_name (layout); + + p = strchr (config->layouts[0], '\t'); + if (p != NULL) { ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

13 years, 7 months

commit bluez-gnome

by root＠Hilbert.suse.de

Hello community, here is the log from the commit of package bluez-gnome checked in at Mon Dec 1 12:05:00 CET 2008. -------- --- GNOME/bluez-gnome/bluez-gnome.changes 2008-10-14 23:30:05.000000000 +0200 +++ /mounts/work_src_done/STABLE/bluez-gnome/bluez-gnome.changes 2008-12-01 02:47:30.000000000 +0100 @@ -1,0 +2,6 @@ +Mon Dec 1 02:40:02 CET 2008 - vuntz(a)novell.com + +- Add bluez-gnome-fix-sendto.patch to have sending to device + working. Fix bnc#441677. + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- bluez-gnome-fix-sendto.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ bluez-gnome.spec ++++++ --- /var/tmp/diff_new_pack.i20346/_old 2008-12-01 12:04:46.000000000 +0100 +++ /var/tmp/diff_new_pack.i20346/_new 2008-12-01 12:04:46.000000000 +0100 @@ -35,9 +35,11 @@ Group: System/GUI/GNOME AutoReqProv: on Version: 1.8 -Release: 1 +Release: 2 Summary: Bluetooth helpers for GNOME Source: %{name}-%{version}.tar.bz2 +# PATCH-FIX-UPSTREAM bluez-gnome-fix-sendto.patch bnc441677 vuntz(a)novell.com -- Patch taken from Fedora (patch already committed upstream) +Patch0: bluez-gnome-fix-sendto.patch Url: http://www.bluez.org BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: %{name}-lang = %{version} @@ -61,6 +63,7 @@ %lang_package %prep %setup -q +%patch0 -p1 %build %configure \ @@ -119,6 +122,9 @@ %files lang -f bluetooth-manager.lang %changelog +* Mon Dec 01 2008 vuntz(a)novell.com +- Add bluez-gnome-fix-sendto.patch to have sending to device + working. Fix bnc#441677. * Wed Oct 15 2008 mboman(a)suse.de - Update to version 1.8: + Add additional support for using obex-client. @@ -131,7 +137,7 @@ + Add activation menu with option to setup devices. + Use the Icon property for device type icons. + Use the Alias property for device names. -* Mon Sep 29 2008 mboman(a)suse.de +* Tue Sep 30 2008 mboman(a)suse.de - Update to version 1.5: + Use GIO to normalize pathnames. + Fix getting name of remote devices. @@ -156,7 +162,7 @@ Fix device status display in selection lists. Enable bluetooth-sendto application. Enable bluetooth-wizard application. -* Sun Aug 31 2008 ro(a)suse.de +* Mon Sep 01 2008 ro(a)suse.de - for 11.0, require gvfs-backends instead of gnome-vfs-obexftp * Tue Aug 12 2008 captain.magnus(a)opensuse.org - Update to version 0.28 @@ -174,7 +180,7 @@ * Update user interface of sendto application. * Move analyzer application to the system category. * Translation updates -* Mon Mar 17 2008 jpr(a)suse.de +* Tue Mar 18 2008 jpr(a)suse.de - Update to version 0.25 Remove signal handlers when no longer needed. Show OBEX errors and close server on failure. @@ -183,7 +189,7 @@ Fix setting filter properties in the device selection widget. Fix missing assignment of filter labels. Show all the possibly known devices. -* Mon Mar 03 2008 jpr(a)suse.de +* Tue Mar 04 2008 jpr(a)suse.de - Update to version 0.23 Update for obex-data-server version 0.3 API. Allow translation of the sendto application. ++++++ bluez-gnome-fix-sendto.patch ++++++ diff -ur bluez-gnome-1.8.orig/common/marshal.list bluez-gnome-1.8/common/marshal.list --- bluez-gnome-1.8.orig/common/marshal.list 2008-08-24 22:14:24.000000000 +0100 +++ bluez-gnome-1.8/common/marshal.list 2008-10-04 23:38:59.000000000 +0100 @@ -3,3 +3,4 @@ VOID:STRING,STRING VOID:STRING,STRING,UINT64 VOID:UINT64 +VOID:STRING,STRING,STRING diff -ur bluez-gnome-1.8.orig/sendto/main.c bluez-gnome-1.8/sendto/main.c --- bluez-gnome-1.8.orig/sendto/main.c 2008-10-04 23:36:27.000000000 +0100 +++ bluez-gnome-1.8/sendto/main.c 2008-10-04 23:40:44.000000000 +0100 @@ -64,6 +64,8 @@ static gint64 first_update = 0; static gint64 last_update = 0; +static DBusGProxy *session_proxy = NULL; + static gchar *filename_to_path(const gchar *filename) { GFile *file; @@ -354,7 +356,16 @@ static void error_occurred(DBusGProxy *proxy, const gchar *name, const gchar *message, gpointer user_data) { - transfer_completed(proxy, user_data); + gtk_progress_bar_set_text(GTK_PROGRESS_BAR(progress), + _("Error Occurred")); + + gchar *text = g_strdup_printf("<span foreground=\"red\">%s</span>", + message); + gtk_label_set_markup(GTK_LABEL(label_status), text); + g_free(text); + + gtk_dialog_set_response_sensitive(GTK_DIALOG(dialog), + GTK_RESPONSE_CLOSE, TRUE); } static void session_connected(DBusGProxy *proxy, gpointer user_data) @@ -363,7 +374,7 @@ first_update = get_system_time(); - send_file(proxy); + send_file(session_proxy); } #define OPENOBEX_CONNECTION_FAILED "org.openobex.Error.ConnectionAttemptFailed" @@ -407,60 +418,41 @@ if (dbus_g_proxy_end_call(proxy, call, &error, DBUS_TYPE_G_OBJECT_PATH, &path, G_TYPE_INVALID) == FALSE) { - gchar *text, *message; + gchar *message; message = get_error_message(error); - text = g_strdup_printf("<span foreground=\"red\">%s</span>", - message); - gtk_label_set_markup(GTK_LABEL(label_status), text); - g_free(text); + error_occurred(proxy,NULL,message,NULL); g_free(message); - gtk_dialog_set_response_sensitive(GTK_DIALOG(dialog), - GTK_RESPONSE_CLOSE, TRUE); return; } - - proxy = dbus_g_proxy_new_for_name(conn, "org.openobex", + session_proxy = dbus_g_proxy_new_for_name(conn, "org.openobex", path, "org.openobex.Session"); - dbus_g_proxy_add_signal(proxy, "Connected", G_TYPE_INVALID); - - dbus_g_proxy_connect_signal(proxy, "Connected", - G_CALLBACK(session_connected), NULL, NULL); - - dbus_g_proxy_add_signal(proxy, "ErrorOccurred", - G_TYPE_STRING, G_TYPE_STRING, G_TYPE_INVALID); - - dbus_g_proxy_connect_signal(proxy, "ErrorOccurred", - G_CALLBACK(error_occurred), NULL, NULL); - - dbus_g_proxy_add_signal(proxy, "Cancelled", G_TYPE_INVALID); + dbus_g_proxy_add_signal(session_proxy, "Cancelled", G_TYPE_INVALID); - dbus_g_proxy_connect_signal(proxy, "Cancelled", + dbus_g_proxy_connect_signal(session_proxy, "Cancelled", G_CALLBACK(transfer_cancelled), NULL, NULL); - dbus_g_proxy_add_signal(proxy, "TransferStarted", G_TYPE_STRING, + dbus_g_proxy_add_signal(session_proxy, "TransferStarted", G_TYPE_STRING, G_TYPE_STRING, G_TYPE_UINT64, G_TYPE_INVALID); - dbus_g_proxy_connect_signal(proxy, "TransferStarted", + dbus_g_proxy_connect_signal(session_proxy, "TransferStarted", G_CALLBACK(transfer_started), NULL, NULL); - dbus_g_proxy_add_signal(proxy, "TransferProgress", + dbus_g_proxy_add_signal(session_proxy, "TransferProgress", G_TYPE_UINT64, G_TYPE_INVALID); - dbus_g_proxy_connect_signal(proxy, "TransferProgress", + dbus_g_proxy_connect_signal(session_proxy, "TransferProgress", G_CALLBACK(transfer_progress), NULL, NULL); - dbus_g_proxy_add_signal(proxy, "TransferCompleted", G_TYPE_INVALID); + dbus_g_proxy_add_signal(session_proxy, "TransferCompleted", G_TYPE_INVALID); - dbus_g_proxy_connect_signal(proxy, "TransferCompleted", + dbus_g_proxy_connect_signal(session_proxy, "TransferCompleted", G_CALLBACK(transfer_completed), NULL, NULL); - dbus_g_proxy_call(proxy, "Connect", NULL, G_TYPE_INVALID, - G_TYPE_INVALID); } static gchar *get_name(DBusGProxy *device) @@ -766,6 +758,14 @@ dbus_g_object_register_marshaller(marshal_VOID__UINT64, G_TYPE_NONE, G_TYPE_UINT64, G_TYPE_INVALID); + + dbus_g_object_register_marshaller(marshal_VOID__STRING_STRING_STRING, + G_TYPE_NONE, + DBUS_TYPE_G_OBJECT_PATH, + G_TYPE_STRING, + G_TYPE_STRING, + G_TYPE_INVALID); + device_name = get_device_name(option_device); if (device_name == NULL) @@ -787,9 +787,21 @@ dbus_g_proxy_connect_signal(proxy, "NameOwnerChanged", G_CALLBACK(name_owner_changed), NULL, NULL); + dbus_g_proxy_add_signal(proxy, "SessionConnected", DBUS_TYPE_G_OBJECT_PATH, G_TYPE_INVALID); + + dbus_g_proxy_connect_signal(proxy, "SessionConnected", + G_CALLBACK(session_connected), NULL, NULL); + + dbus_g_proxy_add_signal(proxy, "SessionConnectError", + DBUS_TYPE_G_OBJECT_PATH, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_INVALID); + + dbus_g_proxy_connect_signal(proxy, "SessionConnectError", + G_CALLBACK(error_occurred), NULL, NULL); + dbus_g_proxy_begin_call(proxy, "CreateBluetoothSession", create_notify, NULL, NULL, G_TYPE_STRING, option_device, + G_TYPE_STRING, "00:00:00:00:00:00", G_TYPE_STRING, "opp", G_TYPE_INVALID); } else { GHashTable *hash = NULL; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

13 years, 7 months

Jump to page:

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

openSUSE Commits December 2008