← Back to branch summary

~ubuntu-branches/ubuntu/jaunty/gimp/jaunty-security

« back to all changes in this revision

Viewing changes to plug-ins/imagemap/imap_browse.c

  • Committer: Bazaar Package Importer
  • Author(s): Daniel Holbach
  • Date: 2007-05-02 16:33:03 UTC
  • mfrom: (1.1.4 upstream)
  • Revision ID: james.westby@ubuntu.com-20070502163303-bvzhjzbpw8qglc4y
Tags: 2.3.16-1ubuntu1
* Resynchronized with Debian, remaining Ubuntu changes:
  - debian/rules: i18n magic.
* debian/control.in:
  - Maintainer: Ubuntu Core Developers <ubuntu-devel@lists.ubuntu.com>
* debian/patches/02_help-message.patch,
  debian/patches/03_gimp.desktop.in.in.patch,
  debian/patches/10_dont_show_wizard.patch: updated.
* debian/patches/04_composite-signedness.patch,
  debian/patches/05_add-letter-spacing.patch: dropped, used upstream.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plug-ins/imagemap/imap_browse.c
74
74
                                      GTK_STOCK_OPEN,   GTK_RESPONSE_OK,
75
75
 
76
76
                                      NULL);
 
77
 
 
78
       gtk_dialog_set_alternative_button_order (GTK_DIALOG (dialog),
 
79
                                                GTK_RESPONSE_OK,
 
80
                                                GTK_RESPONSE_CANCEL,
 
81
                                                -1);
 
82
 
77
83
       gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK);
78
84
 
79
85
       g_signal_connect (dialog, "destroy",
90
96
handle_drop(GtkWidget *widget, GdkDragContext *context, gint x, gint y,
91
97
            GtkSelectionData *data, guint info, guint time)
92
98
{
93
 
   gboolean success;
 
99
   gboolean success = FALSE;
94
100
 
95
101
   if (data->length >= 0 && data->format == 8)
96
102
     {
97
 
       gtk_entry_set_text(GTK_ENTRY(widget), data->data);
98
 
       success = TRUE;
99
 
     }
100
 
   else
101
 
     {
102
 
       success = FALSE;
 
103
       const gchar *text = (const gchar *) data->data;
 
104
 
 
105
       if (g_utf8_validate (text, -1, NULL))
 
106
         {
 
107
           gtk_entry_set_text (GTK_ENTRY (widget), text);
 
108
           success = TRUE;
 
109
         }
103
110
     }
104
111
 
105
112
   gtk_drag_finish(context, success, FALSE, time);
123
130
   gtk_box_pack_start (GTK_BOX(browse->hbox), browse->file, TRUE, TRUE, 0);
124
131
   gtk_drag_dest_set (browse->file, GTK_DEST_DEFAULT_ALL, target_table,
125
132
                      2, GDK_ACTION_COPY);
126
 
   g_signal_connect (browse->file, "drag_data_received",
 
133
   g_signal_connect (browse->file, "drag-data-received",
127
134
                     G_CALLBACK(handle_drop), NULL);
128
135
 
129
136
   gtk_widget_show (browse->file);