callisto-debian/evolution
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* 10_addressbook-default-drag-action-move.patch: Fix pointer

Browse Source 
when drag and dropping contacts. (bugzilla #417797)
* 15_contact-list-editor-expand.patch: Fix contact list dialog resize
  bug (bugzilla #424055)
* 20_minicard-email-colon.patch: Fix for missing row columns in
  contacts minicard view (bugzilla #404239)
* 25_mute-debug-messages.patch: Mute console noise from plugins

git-svn-id: file:///svn/pkg-evolution/unstable/evolution@790 ed03ce00-e4f4-0310-9448-ee38221cb277
This commit is contained in:
Øystein Gisnås
2007-05-06 10:48:04 +00:00
parent dde2bc1287
commit 9f7836fe7a
5 changed files with 125 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
debian/changelog vendored
View File

@ -1,3 +1,15 @@
evolution (2.10.1-2) UNRELEASED; urgency=low
* 10_addressbook-default-drag-action-move.patch: Fix pointer
when drag and dropping contacts. (bugzilla #417797)
* 15_contact-list-editor-expand.patch: Fix contact list dialog resize
bug (bugzilla #424055)
* 20_minicard-email-colon.patch: Fix for missing row columns in
contacts minicard view (bugzilla #404239)
* 25_mute-debug-messages.patch: Mute console noise from plugins
-- Oystein Gisnas <oystein@gisnas.net> Sun, 06 May 2007 12:46:06 +0200
evolution (2.10.1-1) unstable; urgency=low
[ Oystein Gisnas ]

33
debian/patches/10_addressbook-default-drag-action-move.patch vendored Normal file
View File

@ -0,0 +1,33 @@
--- addressbook/gui/component/addressbook-view.c.orig 2007-04-21 04:48:24.677323158 +0200
+++ addressbook/gui/component/addressbook-view.c 2007-04-21 05:13:59.577248408 +0200
@@ -1065,7 +1065,11 @@
goto finish;
gtk_tree_view_set_drag_dest_row(GTK_TREE_VIEW (widget), path, GTK_TREE_VIEW_DROP_INTO_OR_BEFORE);
- action = context->suggested_action;
+ // Make default action move, not copy
+ if (context->actions & GDK_ACTION_MOVE)
+ action = GDK_ACTION_MOVE;
+ else
+ action = context->suggested_action;
finish:
if (path)
@@ -1207,7 +1211,7 @@
merge_context->current_contact = contactlist->data;
merge_context->remaining_contacts = g_list_delete_link (contactlist, contactlist);
- merge_context->remove_from_source = context->suggested_action == GDK_ACTION_MOVE ? FALSE : TRUE;
+ merge_context->remove_from_source = context->action == GDK_ACTION_MOVE ? TRUE : FALSE;
/* Start merge */
@@ -1220,7 +1224,7 @@
if (target)
g_object_unref (target);
- gtk_drag_finish (context, success, context->action == GDK_ACTION_MOVE, time);
+ gtk_drag_finish (context, success, merge_context->remove_from_source, time);
return TRUE;
}

12
debian/patches/15_contact-list-editor-expand.patch vendored Normal file
View File

@ -0,0 +1,12 @@
diff -urN addressbook/gui/contact-list-editor.orig/contact-list-editor.glade addressbook/gui/contact-list-editor/contact-list-editor.glade
--- addressbook/gui/contact-list-editor.orig/contact-list-editor.glade 2007-04-09 15:07:42.000000000 +0200
+++ addressbook/gui/contact-list-editor/contact-list-editor.glade 2007-04-21 05:43:19.679247908 +0200
@@ -258,7 +258,7 @@
</widget>
<packing>
<property name="padding">0</property>
- <property name="expand">True</property>
+ <property name="expand">False</property>
<property name="fill">True</property>
</packing>
</child>

19
debian/patches/20_minicard-email-colon.patch vendored Normal file
View File

@ -0,0 +1,19 @@
--- ./addressbook/gui/widgets/e-minicard.c.orig 2007-04-21 21:41:54.390635548 +0200
+++ ./addressbook/gui/widgets/e-minicard.c 2007-04-21 21:42:06.611399298 +0200
@@ -847,7 +847,7 @@
for (l=email_list, le=emails; l!=NULL && count < limit && le!=NULL; l = l->next, le=le->next) {
- name = get_email_location ((EVCardAttribute *) l->data);
+ name = g_strdup_printf("%s:", get_email_location ((EVCardAttribute *) l->data));
string = e_text_to_html (le->data, 0);
new_item = e_minicard_label_new(group);
@@ -877,6 +877,7 @@
e_minicard->fields = g_list_append( e_minicard->fields, minicard_field);
e_canvas_item_move_absolute(new_item, 2, e_minicard->height);
count++;
+ g_free(name);
g_free(string);
}
g_list_free (emails);

49
debian/patches/25_mute-debug-messages.patch vendored Normal file
View File

@ -0,0 +1,49 @@
--- plugins/caldav/caldav-source.c.orig 2007-04-23 20:23:17.931600926 +0200
+++ plugins/caldav/caldav-source.c 2007-04-23 20:23:27.760215176 +0200
@@ -38,6 +38,8 @@
#include <string.h>
+#define d(x)
+
/*****************************************************************************/
/* prototypes */
int e_plugin_lib_enable (EPluginLib *ep,
@@ -84,7 +86,7 @@
{
if (enable) {
- g_print ("CalDAV Eplugin starting up ...\n");
+ d (g_print ("CalDAV Eplugin starting up ...\n"));
ensure_caldav_source_group ();
}
--- plugins/default-mailer/default-mailer.c.orig 2007-04-23 20:24:27.627956676 +0200
+++ plugins/default-mailer/default-mailer.c 2007-04-23 20:25:36.000229676 +0200
@@ -33,6 +33,8 @@
#define GCONF_KEY_MAILTO_COMMAND "/desktop/gnome/url-handlers/mailto/command"
#define EVOLUTION_MAILTO_COMMAND "evolution --component=mail %s"
+#define d(x)
+
void org_gnome_default_mailer_check_default (EPlugin *ep, ESEventTargetUpgrade *target);
static gboolean
@@ -46,7 +48,7 @@
if (mailto_command == NULL)
return FALSE;
- g_debug ("mailto URL command: %s", mailto_command);
+ d (g_debug ("mailto URL command: %s", mailto_command));
/* tokenize the mailto command */
if (!g_shell_parse_argv (mailto_command, &argc, &argv, NULL))
@@ -56,7 +58,7 @@
/* check the basename of the first token */
basename = g_path_get_basename (argv[0]);
- g_debug ("mailto URL program: %s", basename);
+ d (g_debug ("mailto URL program: %s", basename));
is_default = g_str_has_prefix (basename, "evolution");
g_free (basename);