summaryrefslogtreecommitdiff
path: root/gpe-contacts
diff options
context:
space:
mode:
authorChris Larson <clarson@kergoth.com>2004-11-09 00:36:47 +0000
committerChris Larson <clarson@kergoth.com>2004-11-09 00:36:47 +0000
commitf96441b9faf769c9ecdd4d338b605ea3d0cc4010 (patch)
treeedb17ec2c4ea13c5acb1c7350957a249a820e28d /gpe-contacts
parentb6588aa6851fb220cedc387d21c51513ef8d67f4 (diff)
Disable bk EOLN_NATIVE conversions on all files in packages FILESPATHs, to prevent it screwing up patches.
BKrev: 4190111fA4MuVozAqwE7xOSL9fr-TA
Diffstat (limited to 'gpe-contacts')
-rw-r--r--gpe-contacts/filtered-paste.patch51
-rw-r--r--gpe-contacts/new-button-disabled-after-window-close.patch37
-rw-r--r--gpe-contacts/select-start.patch15
3 files changed, 103 insertions, 0 deletions
diff --git a/gpe-contacts/filtered-paste.patch b/gpe-contacts/filtered-paste.patch
index e69de29bb2..4b1e70dadb 100644
--- a/gpe-contacts/filtered-paste.patch
+++ b/gpe-contacts/filtered-paste.patch
@@ -0,0 +1,51 @@
+Index: editing.c
+===================================================================
+RCS file: /cvs/gpe/base/gpe-contacts/editing.c,v
+retrieving revision 1.59
+diff -u -r1.59 editing.c
+--- editing.c 20 Oct 2004 14:00:36 -0000 1.59
++++ editing.c 24 Oct 2004 22:32:43 -0000
+@@ -46,17 +46,23 @@
+ void on_name_clicked (GtkButton *button, gpointer user_data);
+
+
+-
+ /* this is the filter for phone number edits */
+-static gboolean
+-phone_key_press_event (GtkWidget *widget, GdkEventKey *k, gpointer p)
++void
++on_phone_insert_text(GtkEditable *editable, gchar *new_text,
++ gint new_text_length, gint *position,
++ gpointer user_data)
+ {
+- if (!strstr(" +0123456789-/()", k->string)
+- && !(k->state & GDK_CONTROL_MASK))
+- {
+- return TRUE;
+- }
+- return FALSE;
++ int i;
++ gboolean isok = TRUE;
++
++ for (i = 0; i < new_text_length; i++)
++ if (!strchr(" +0123456789-/()", new_text[i]))
++ {
++ isok = FALSE;
++ break;
++ }
++ if (!isok)
++ gtk_signal_emit_stop_by_name(GTK_OBJECT(editable), "insert-text");
+ }
+
+ static void
+@@ -91,8 +97,8 @@
+ || strstr(e->tag,".MOBILE")
+ || strstr(e->tag,".FAX"))
+ {
+- g_signal_connect (G_OBJECT (w), "key_press_event",
+- G_CALLBACK (phone_key_press_event), NULL);
++ g_signal_connect (G_OBJECT (w), "insert-text",
++ G_CALLBACK (on_phone_insert_text), NULL);
+ }
+ if (strcasecmp(e->tag, "NAME")) /* the name field on a button */
+ {
diff --git a/gpe-contacts/new-button-disabled-after-window-close.patch b/gpe-contacts/new-button-disabled-after-window-close.patch
index e69de29bb2..3c0f3a2658 100644
--- a/gpe-contacts/new-button-disabled-after-window-close.patch
+++ b/gpe-contacts/new-button-disabled-after-window-close.patch
@@ -0,0 +1,37 @@
+--- editing.orig 2004-10-17 00:11:23.000000000 +0200
++++ editing.c 2004-10-18 23:52:14.000000000 +0200
+@@ -28,6 +28,7 @@
+ #include "namedetail.h"
+
+ void on_edit_cancel_clicked (GtkButton * button, gpointer user_data);
++void on_edit_window_closed_clicked (gpointer user_data);
+ void on_edit_save_clicked (GtkButton * button, gpointer user_data);
+ void on_edit_bt_image_clicked (GtkWidget *image, gpointer user_data);
+ void on_categories_clicked (GtkButton *button, gpointer user_data);
+@@ -377,6 +378,11 @@
+ G_CALLBACK (on_edit_cancel_clicked), edit);
+ g_signal_connect (G_OBJECT (edit_save), "clicked",
+ G_CALLBACK (on_edit_save_clicked), edit);
++
++ /* Call the on_edit_window_closed_clicked function when the window is destroyed,
++ * otherwise the new button gets disabled */
++ g_signal_connect (G_OBJECT (edit), "delete_event",
++ G_CALLBACK (on_edit_window_closed_clicked), edit);
+
+ g_signal_connect (G_OBJECT (action_area), "key_press_event",
+ G_CALLBACK (action_area_key_press_event), notebook2);
+@@ -1008,6 +1014,14 @@
+ gtk_widget_destroy (GTK_WIDGET (edit));
+ }
+
++void
++on_edit_window_closed_clicked (gpointer user_data)
++{
++ GtkWidget *edit = user_data;
++ update_display ();
++ gtk_widget_destroy (GTK_WIDGET (edit));
++}
++
+ void
+ tv_move_cursor (GtkTextView *textview,
+ GtkMovementStep arg1,
diff --git a/gpe-contacts/select-start.patch b/gpe-contacts/select-start.patch
index e69de29bb2..580e0468a0 100644
--- a/gpe-contacts/select-start.patch
+++ b/gpe-contacts/select-start.patch
@@ -0,0 +1,15 @@
+Index: main.c
+===================================================================
+RCS file: /cvs/gpe/base/gpe-contacts/main.c,v
+retrieving revision 1.102
+diff -u -r1.102 main.c
+--- main.c 16 Oct 2004 22:21:17 -0000 1.102
++++ main.c 26 Oct 2004 11:41:39 -0000
+@@ -1246,6 +1246,7 @@
+ list_view = gtk_tree_view_new_with_model (GTK_TREE_MODEL (list_store));
+ gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (list_view), FALSE);
+ tree_sel = gtk_tree_view_get_selection (GTK_TREE_VIEW (list_view));
++ gtk_tree_selection_set_mode(tree_sel, GTK_SELECTION_BROWSE);
+
+ GTK_WIDGET_UNSET_FLAGS (list_view, GTK_CAN_FOCUS);
+