[Goodies-commits] r4566 - in xfce4-dict/trunk: . lib panel-plugin

[Enrico Troeger]

Author: enrico
Date: 2008-04-14 18:47:24 +0000 (Mon, 14 Apr 2008)
New Revision: 4566

Modified:
   xfce4-dict/trunk/ChangeLog
   xfce4-dict/trunk/lib/common.c
   xfce4-dict/trunk/lib/gui.c
   xfce4-dict/trunk/panel-plugin/xfce4-dict-plugin.c
Log:
Always start searching when text is dragged into the text entry in the main window.
Connect to "drag-data-received" signal in library as it is equal for panel plugin and standalone code.


Modified: xfce4-dict/trunk/ChangeLog
===================================================================
--- xfce4-dict/trunk/ChangeLog	2008-04-14 18:47:19 UTC (rev 4565)
+++ xfce4-dict/trunk/ChangeLog	2008-04-14 18:47:24 UTC (rev 4566)
@@ -2,6 +2,10 @@
 
 	* Fix make distcheck.
 	* Avoid creation of inline-icon.h during a normal build.
+	* Always start searching when text is dragged into the text entry in
+	  the main window.
+	* Connect to "drag-data-received" signal in library as it is equal for
+	  panel plugin and standalone code.
 
 
 2008-04-03  Enrico Tröger  <enrico(dot)troeger(at)uvena(dot)de>

Modified: xfce4-dict/trunk/lib/common.c
===================================================================
--- xfce4-dict/trunk/lib/common.c	2008-04-14 18:47:19 UTC (rev 4565)
+++ xfce4-dict/trunk/lib/common.c	2008-04-14 18:47:24 UTC (rev 4566)
@@ -386,19 +386,23 @@
 void dict_drag_data_received(GtkWidget *widget, GdkDragContext *drag_context, gint x, gint y,
 							 GtkSelectionData *data, guint info, guint ltime, DictData *dd)
 {
-	if ((data->length >= 0) && (data->format == 8))
+	if ((data != NULL) && (data->length >= 0) && (data->format == 8))
 	{
-		drag_context->action = GDK_ACTION_COPY;
+/*
+		GtkWidget *source = gtk_drag_get_source_widget(drag_context);
 
-		if (widget == dd->main_entry)
+		if (widget == dd->main_entry &&
+			source != NULL &&
+			gtk_widget_get_toplevel(source) == dd->window)
 		{
 			gtk_entry_set_text(GTK_ENTRY(dd->main_entry), "");
 		}
 		else
-		{
-			gtk_entry_set_text(GTK_ENTRY(dd->main_entry), (const gchar*) data->data);
+*/		{
 			dict_search_word(dd, (const gchar*) data->data);
 		}
+
+		drag_context->action = GDK_ACTION_COPY;
 		gtk_drag_finish(drag_context, TRUE, FALSE, ltime);
 	}
 }

Modified: xfce4-dict/trunk/lib/gui.c
===================================================================
--- xfce4-dict/trunk/lib/gui.c	2008-04-14 18:47:19 UTC (rev 4565)
+++ xfce4-dict/trunk/lib/gui.c	2008-04-14 18:47:24 UTC (rev 4566)
@@ -304,6 +304,9 @@
 	dd->statusbar = gtk_statusbar_new();
 	gtk_widget_show(dd->statusbar);
 	gtk_box_pack_end(GTK_BOX(main_box), dd->statusbar, FALSE, FALSE, 0);
+
+	/* DnD */
+	g_signal_connect(dd->main_entry, "drag-data-received", G_CALLBACK(dict_drag_data_received), dd);
 }
 
 

Modified: xfce4-dict/trunk/panel-plugin/xfce4-dict-plugin.c
===================================================================
--- xfce4-dict/trunk/panel-plugin/xfce4-dict-plugin.c	2008-04-14 18:47:19 UTC (rev 4565)
+++ xfce4-dict/trunk/panel-plugin/xfce4-dict-plugin.c	2008-04-14 18:47:24 UTC (rev 4566)
@@ -391,7 +391,6 @@
 		NULL, 0, GDK_ACTION_COPY | GDK_ACTION_MOVE);
 	gtk_drag_dest_add_text_targets(GTK_WIDGET(dpd->panel_button));
 	g_signal_connect(dpd->panel_button, "drag-data-received", G_CALLBACK(dict_drag_data_received), dpd->dd);
-	g_signal_connect(dpd->dd->main_entry, "drag-data-received", G_CALLBACK(dict_drag_data_received), dpd->dd);
 	g_signal_connect(dpd->dd->panel_entry, "drag-data-received", G_CALLBACK(dict_drag_data_received), dpd->dd);
 
 	dict_gui_status_add(dpd->dd, _("Ready."));