rpms/gmrun/EL-5 gmrun-0.9.2-f12.patch, NONE, 1.1 gmrun-0.9.2-mousewheel.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 gmrun.spec, 1.7, 1.8 sources, 1.3, 1.4
Gilboa Davara
gilboa at fedoraproject.org
Fri Jan 22 10:45:53 UTC 2010
Author: gilboa
Update of /cvs/pkgs/rpms/gmrun/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8685
Modified Files:
.cvsignore gmrun.spec sources
Added Files:
gmrun-0.9.2-f12.patch gmrun-0.9.2-mousewheel.patch
Log Message:
gmrun-0.9.2-f12.patch:
gtkcompletionline.cc | 9 +++------
gtkcompletionline.h | 3 ++-
2 files changed, 5 insertions(+), 7 deletions(-)
--- NEW FILE gmrun-0.9.2-f12.patch ---
diff -ur gmrun-0.9.2/src/gtkcompletionline.cc gmrun-0.9.2.new/src/gtkcompletionline.cc
--- gmrun-0.9.2/src/gtkcompletionline.cc 2010-01-11 12:22:35.097644540 +0200
+++ gmrun-0.9.2.new/src/gtkcompletionline.cc 2010-01-11 12:22:45.686644030 +0200
@@ -79,9 +79,9 @@
on_scroll(GtkCompletionLine *cl, GdkEventScroll *event, gpointer data);
/* get_type */
-guint gtk_completion_line_get_type(void)
+GtkType gtk_completion_line_get_type(void)
{
- static guint type = 0;
+ static GtkType type = 0;
if (type == 0)
{
GtkTypeInfo type_info =
@@ -381,10 +381,7 @@
return 0;
}
-int my_alphasort(const void* va, const void* vb) {
- const struct dirent** a = (const struct dirent**)va;
- const struct dirent** b = (const struct dirent**)vb;
-
+int my_alphasort(const struct dirent** a, const struct dirent** b) {
const char* s1 = (*a)->d_name;
const char* s2 = (*b)->d_name;
diff -ur gmrun-0.9.2/src/gtkcompletionline.h gmrun-0.9.2.new/src/gtkcompletionline.h
--- gmrun-0.9.2/src/gtkcompletionline.h 2003-11-16 12:43:32.000000000 +0200
+++ gmrun-0.9.2.new/src/gtkcompletionline.h 2010-01-11 12:22:45.686644030 +0200
@@ -14,6 +14,7 @@
#define __GTKCOMPLETIONLINE_H__
#include <gtk/gtkentry.h>
+#include <gtk/gtktypeutils.h>
#include <string>
@@ -76,7 +77,7 @@
void (* cancel)(GtkCompletionLine *cl);
};
- guint gtk_completion_line_get_type(void);
+ GtkType gtk_completion_line_get_type(void);
GtkWidget *gtk_completion_line_new();
void gtk_completion_line_last_history_item(GtkCompletionLine*);
gmrun-0.9.2-mousewheel.patch:
gtkcompletionline.cc | 43 +++++++++++++++++++++++++++++++++++++++++++
gtkcompletionline.cc.orig |only
2 files changed, 43 insertions(+)
--- NEW FILE gmrun-0.9.2-mousewheel.patch ---
diff -ur gmrun-0.9.2/src/gtkcompletionline.cc gmrun-0.9.2.new/src/gtkcompletionline.cc
--- gmrun-0.9.2/src/gtkcompletionline.cc 2010-01-11 12:20:16.076644635 +0200
+++ gmrun-0.9.2.new/src/gtkcompletionline.cc 2010-01-11 12:21:11.815581518 +0200
@@ -75,6 +75,8 @@
static gboolean
on_key_press(GtkCompletionLine *cl, GdkEventKey *event, gpointer data);
+static gboolean
+on_scroll(GtkCompletionLine *cl, GdkEventScroll *event, gpointer data);
/* get_type */
guint gtk_completion_line_get_type(void)
@@ -204,6 +206,8 @@
GTK_SIGNAL_FUNC(on_key_press), NULL);
gtk_signal_connect(GTK_OBJECT(object), "key_release_event",
GTK_SIGNAL_FUNC(on_key_press), NULL);
+ gtk_signal_connect(GTK_OBJECT(object), "scroll-event",
+ GTK_SIGNAL_FUNC(on_scroll), NULL);
object->hist = new HistoryFile();
@@ -954,6 +958,45 @@
}
static gboolean
+on_scroll(GtkCompletionLine *cl, GdkEventScroll *event, gpointer data)
+{
+ if (event->direction == GDK_SCROLL_UP) {
+ if (cl->win_compl != NULL) {
+ int &item = cl->list_compl_items_where;
+ item--;
+ if (item < 0) {
+ item = 0;
+ } else {
+ complete_from_list(cl);
+ }
+ } else {
+ up_history(cl);
+ }
+ if (MODE_SRC) {
+ search_off(cl);
+ }
+ return TRUE;
+ } else if (event->direction == GDK_SCROLL_DOWN) {
+ if (cl->win_compl != NULL) {
+ int &item = cl->list_compl_items_where;
+ item++;
+ if (item >= cl->list_compl_nr_rows) {
+ item = cl->list_compl_nr_rows - 1;
+ } else {
+ complete_from_list(cl);
+ }
+ } else {
+ down_history(cl);
+ }
+ if (MODE_SRC) {
+ search_off(cl);
+ }
+ return TRUE;
+ }
+ return FALSE;
+}
+
+static gboolean
on_key_press(GtkCompletionLine *cl, GdkEventKey *event, gpointer data)
{
static gint tt_id = -1;
Only in gmrun-0.9.2.new/src: gtkcompletionline.cc.orig
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gmrun/EL-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore 22 Jan 2010 10:32:02 -0000 1.2
+++ .cvsignore 22 Jan 2010 10:45:53 -0000 1.3
@@ -1,2 +1 @@
-gmrun-0.9.2-mousewheel.patch
-gmrun-0.9.2-f12.patch
+gmrun-0.9.2.tar.gz
Index: gmrun.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gmrun/EL-5/gmrun.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- gmrun.spec 22 Jan 2010 10:32:02 -0000 1.7
+++ gmrun.spec 22 Jan 2010 10:45:53 -0000 1.8
@@ -1,6 +1,6 @@
Name: gmrun
Version: 0.9.2
-Release: 20%{?dist}
+Release: 21%{?dist}
Summary: Lightweight "Run program" dialog box with search history and tab completion
Group: User Interface/Desktops
@@ -65,7 +65,7 @@ rm -rf $RPM_BUILD_ROOT
%changelog
-* Fri Jan 22 2010 Gilboa Davara <gilboad at gmail.com> - 0.9.2-20
+* Fri Jan 22 2010 Gilboa Davara <gilboad at gmail.com> - 0.9.2-21
- Make the F12 optional on F11 and above.
* Mon Jan 11 2010 Gilboa Davara <gilboad at gmail.com> - 0.9.2-19
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gmrun/EL-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources 22 Jan 2010 10:32:02 -0000 1.3
+++ sources 22 Jan 2010 10:45:53 -0000 1.4
@@ -1,2 +1 @@
-01a46a0df874458c5e39c82540cf4773 gmrun-0.9.2-mousewheel.patch
-9451c636e644ad71bcb4472474690f49 gmrun-0.9.2-f12.patch
+6cef37a968006d9496fc56a7099c603c gmrun-0.9.2.tar.gz
More information about the scm-commits
mailing list