Mailinglist Archive: opensuse-commit (918 mails)

< Previous Next >
commit dasher
  • From: root@xxxxxxxxxxxxxxx (h_root)
  • Date: Sun, 25 Feb 2007 23:21:41 +0100
  • Message-id: <20070225222141.69B07678184@xxxxxxxxxxxxxxx>

Hello community,

here is the log from the commit of package dasher
checked in at Sun Feb 25 23:21:41 CET 2007.

--------
--- GNOME/dasher/dasher.changes 2007-01-04 16:09:08.000000000 +0100
+++ /mounts/work_src_done/STABLE/dasher/dasher.changes 2007-02-21 17:25:44.000000000 +0100
@@ -1,0 +2,6 @@
+Wed Feb 21 17:21:23 CET 2007 - mvaner@xxxxxxx
+
+- Fixed uninitiated variable (#230228)
+ - unused-code.patch
+
+-------------------------------------------------------------------

New:
----
dasher-4.2.0-unused-code.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ dasher.spec ++++++
--- /var/tmp/diff_new_pack.E22422/_old 2007-02-25 23:21:26.000000000 +0100
+++ /var/tmp/diff_new_pack.E22422/_new 2007-02-25 23:21:26.000000000 +0100
@@ -13,7 +13,7 @@
Name: dasher
BuildRequires: at-spi-devel cairo-devel docbook_4 gcc-c++ gnome-doc-utils-devel gnome-icon-theme gnome-speech-devel kdelibs3-doc libglade2-devel libgnomeui-devel libstdc++ libwnck-devel perl-XML-Parser scrollkeeper update-desktop-files
Version: 4.2.0
-Release: 38
+Release: 43
URL: http://www.inference.phy.cam.ac.uk/dasher/
Group: System/GUI/GNOME
License: GNU General Public License (GPL)
@@ -22,6 +22,7 @@
Patch2: %name-desktop.patch
Patch3: %{name}-return-random-data.patch
Patch4: %{name}-warning.patch
+Patch5: %{name}-%{version}-unused-code.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Autoreqprov: on

@@ -50,6 +51,7 @@
%patch2 -p1
%patch3
%patch4
+%patch5

%build
#export CXXFLAGS="$RPM_OPT_FLAGS -fpermissive"
@@ -94,7 +96,10 @@
%{_datadir}/pixmaps/*.png
%doc %{_mandir}/man?/*.*

-%changelog -n dasher
+%changelog
+* Wed Feb 21 2007 - mvaner@xxxxxxx
+- Fixed uninitiated variable (#230228)
+ - unused-code.patch
* Thu Jan 04 2007 - sbrabec@xxxxxxx
- Prefix changed to /usr.
- Spec file cleanup.

++++++ dasher-4.2.0-unused-code.patch ++++++
--- Src/Gtk2/dasher_external_buffer.cpp
+++ Src/Gtk2/dasher_external_buffer.cpp
@@ -175,54 +175,6 @@
SPI_generateKeyboardEvent(0, szNewText, SPI_KEY_STRING);

delete[] szNewText;
- return;
-
- // EVERYTHING BELOW HERE IN THIS METHOD NOT USED
-
- glong numoutput;
- int numcodes;
- Display *dpy = gdk_x11_get_default_xdisplay();
- int min, max;
- KeySym *keysym;
- KeyCode code;
-
- if(szText[0] == '\n') {
- // If it's a nreline, we want to mimic an enter press rather than a raw newline
- code = XKeysymToKeycode(dpy, XK_Return);
- if(code != 0) {
- XTestFakeKeyEvent(dpy, code, True, CurrentTime);
- XSync(dpy, true);
- XTestFakeKeyEvent(dpy, code, False, CurrentTime);
- XSync(dpy, true);
- }
- }
- else {
- gunichar *wideoutput = g_utf8_to_ucs4(szText, -1, NULL, &numoutput, NULL);
-
- for(int i = 0; i < numoutput; i++) {
- int modifiedkey = (modifiedkey + 1) % 10;
- // This gives us the magic X keysym
- wideoutput[i] = wideoutput[i] | 0x01000000;
-
- XDisplayKeycodes(dpy, &min, &max);
- keysym = XGetKeyboardMapping(dpy, min, max - min + 1, &numcodes);
- keysym[(max - min - modifiedkey - 1) * numcodes] = wideoutput[i];
- XChangeKeyboardMapping(dpy, min, numcodes, keysym, (max - min));
- XSync(dpy, true);
- XFree(keysym);
- // There's no way whatsoever that this could ever possibly
- // be guaranteed to work (ever), but it does.
- code = (max - modifiedkey - 1);
- if(code != 0) {
- XTestFakeKeyEvent(dpy, code, True, CurrentTime);
- XSync(dpy, true);
- XTestFakeKeyEvent(dpy, code, False, CurrentTime);
- XSync(dpy, true);
- }
- }
- XSync(dpy, true);
- g_free(wideoutput);
- }
}

void dasher_external_buffer_delete(DasherExternalBuffer *pSelf, int iLength) {
++++++ dasher-desktop.patch ++++++
--- /var/tmp/diff_new_pack.E22422/_old 2007-02-25 23:21:27.000000000 +0100
+++ /var/tmp/diff_new_pack.E22422/_new 2007-02-25 23:21:27.000000000 +0100
@@ -1,6 +1,6 @@
---- dasher-4.1.8/Data/dasher.desktop
-+++ dasher-4.1.8/Data/dasher.desktop
-@@ -125,7 +125,7 @@
+--- dasher-4.2.0/Data/dasher.desktop
++++ dasher-4.2.0/Data/dasher.desktop
+@@ -156,7 +156,7 @@
Comment[zh_HK]=預測方式輸入文字
Comment[zh_TW]=預測方式輸入文字
Exec=dasher

++++++ dasher-return-random-data.patch ++++++
--- /var/tmp/diff_new_pack.E22422/_old 2007-02-25 23:21:27.000000000 +0100
+++ /var/tmp/diff_new_pack.E22422/_new 2007-02-25 23:21:27.000000000 +0100
@@ -43,7 +43,7 @@
extern "C" gboolean advanced_preferences_show(GtkWidget *widget, gpointer user_data) {
--- Src/Gtk2/dasher_main.cpp
+++ Src/Gtk2/dasher_main.cpp
-@@ -1057,9 +1057,12 @@
+@@ -1060,9 +1060,12 @@
if(!strcmp("More Alphabets...", szSelected)) {
gtk_combo_box_set_active(GTK_COMBO_BOX(pPrivate->pAlphabetCombo), 0);
dasher_preferences_dialogue_show(g_pPreferencesDialogue);


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx

< Previous Next >
This Thread
  • No further messages