1999-04-09 Federico Mena Quintero <federico@nuclecu.unam.mx>

* gscreen.c (panel_icon_list_button_press): Ignore double clicks.
	(panel_widget_motion): Don't do anything if the button state does
	not match the button we are expecting.

	* gtkflist.c (gtk_flist_button_press): Remove pending selections
	when we receive a double click.

	* gaction.c: #include "view.h"
This commit is contained in:
Miguel de Icaza 1999-04-10 00:54:10 +00:00
parent aa723d5ddd
commit 9f68cc2df5
11 changed files with 41 additions and 10 deletions

View File

@ -1,3 +1,7 @@
1999-04-09 Federico Mena Quintero <federico@nuclecu.unam.mx>
* configure.in (VERSION): Bumped version number to 4.5.30.
1999-03-30 Federico Mena Quintero <federico@nuclecu.unam.mx>
* configure.in (VERSION): Bumped version number to 4.5.29.

View File

@ -5,7 +5,7 @@ AC_INIT(create_vcs)
AC_CONFIG_HEADER(config.h)
PACKAGE=mc
VERSION=4.5.29
VERSION=4.5.30
AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE")
AC_DEFINE_UNQUOTED(VERSION, "$VERSION")
AC_SUBST(VERSION)

View File

@ -1,3 +1,14 @@
1999-04-09 Federico Mena Quintero <federico@nuclecu.unam.mx>
* gscreen.c (panel_icon_list_button_press): Ignore double clicks.
(panel_widget_motion): Don't do anything if the button state does
not match the button we are expecting.
* gtkflist.c (gtk_flist_button_press): Remove pending selections
when we receive a double click.
* gaction.c: #include "view.h"
1999-04-09 Miguel de Icaza <miguel@nuclecu.unam.mx>
* gmount.c (is_block_device_mountable): Allow root to mount

View File

@ -16,6 +16,7 @@
#include "gmain.h"
#include "dir.h"
#include "dialog.h"
#include "view.h"
#include "gcmd.h"
#include "../vfs/vfs.h"
#include "gnome-open-dialog.h"
@ -24,7 +25,6 @@ static void
gmc_unable_to_execute_dlg (gchar *fname, const gchar *command, gchar *action, const gchar *mime)
{
GtkWidget *msg_dialog = NULL;
GtkWidget *hack_widget;
gchar *msg;
gchar *fix = NULL;
if (!strcmp (action, "x-gnome-app-info")) {

View File

@ -25,7 +25,6 @@
#include "gdesktop.h"
#include "../vfs/vfs.h"
static void start_search (WPanel *panel);
enum {
SORT_NAME,

View File

@ -624,7 +624,6 @@ void
gnome_check_super_user (void)
{
GtkWidget *warning_dlg;
GnomeClient *client;
if (geteuid () != 0)
return;

View File

@ -942,6 +942,10 @@ panel_widget_motion (GtkWidget *widget, GdkEventMotion *event, WPanel *panel)
if (!panel->maybe_start_drag)
return FALSE;
if (!((panel->maybe_start_drag == 1 && (event->state & GDK_BUTTON1_MASK))
|| (panel->maybe_start_drag == 2 && (event->state & GDK_BUTTON2_MASK))))
return FALSE;
/* This is the same threshold value that is used in gtkdnd.c */
if (MAX (abs (panel->click_x - event->x),
@ -1456,10 +1460,13 @@ panel_icon_list_button_press (GtkWidget *widget, GdkEventButton *event, WPanel *
GnomeIconList *gil = GNOME_ICON_LIST (widget);
int icon;
if (event->type != GDK_BUTTON_PRESS)
return FALSE;
icon = gnome_icon_list_get_icon_at (gil, event->x, event->y);
if (icon == -1) {
if (event->type == GDK_BUTTON_PRESS && event->button == 3) {
if (event->button == 3) {
file_list_popup (event, panel);
return TRUE;
}

View File

@ -279,6 +279,9 @@ gtk_flist_button_press (GtkWidget *widget, GdkEventButton *event)
if (event->button != 1)
break;
flist->dnd_select_pending = FALSE;
flist->dnd_select_pending_state = 0;
gtk_signal_emit (GTK_OBJECT (flist), flist_signals[OPEN_ROW]);
retval = TRUE;
break;

View File

@ -1,3 +1,10 @@
1999-04-09 Federico Mena Quintero <federico@nuclecu.unam.mx>
* tree.c (tree_start_search): Renamed from start_search() to avoid
collisions with screen.c:start_search().
* panel.h: Added prototype for start_search().
1999-04-09 Rosanna Yuen <rwsy@mit.edu>
* screen.c (do_enter_on_file_entry): split GNOME version and

View File

@ -245,6 +245,7 @@ format_e *use_display_format (WPanel *panel, char *format, char **error, int iss
char *panel_format (WPanel *panel);
char *mini_status_format (WPanel *panel);
int set_panel_formats (WPanel *p);
void start_search (WPanel *panel);
WPanel *get_current_panel (void);
WPanel *get_other_panel (void);

View File

@ -882,7 +882,7 @@ chdir_sel (WTree *tree)
}
static void
start_search (WTree *tree)
tree_start_search (WTree *tree)
{
int i;
@ -926,8 +926,8 @@ static key_map tree_keymap [] = {
{ ALT('v'), move_prevp },
{ XCTRL('p'), move_up },
{ XCTRL('p'), move_down },
{ XCTRL('s'), start_search },
{ ALT('s'), start_search },
{ XCTRL('s'), tree_start_search },
{ ALT('s'), tree_start_search },
{ XCTRL('r'), tree_rescan_cmd },
{ KEY_DC, tree_rmdir_cmd },
{ 0, 0 }
@ -940,7 +940,7 @@ tree_key (WTree *tree, int key)
for (i = 0; tree_keymap [i].key_code; i++){
if (key == tree_keymap [i].key_code){
if (tree_keymap [i].fn != start_search)
if (tree_keymap [i].fn != tree_start_search)
tree->searching = 0;
(*tree_keymap [i].fn)(tree);
show_tree (tree);
@ -975,7 +975,7 @@ tree_key (WTree *tree, int key)
}
if (!command_prompt) {
start_search (tree);
tree_start_search (tree);
tree_do_search (tree, key);
return 1;
}