Mercurial > mplayer.hg

comparison gui/dialog/fileselect.c @ 36096:2edbcc85bf5a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Remove signal "activate" handling. The combo boxes already immediately react on the "changed" signal. So there is nothing more to be done on "activate".
author ib
date Tue, 30 Apr 2013 10:46:11 +0000
parents 042329ce1297
children 64282f0366c6
comparison
equal deleted inserted replaced
36095:042329ce1297 36096:2edbcc85bf5a
365 } 365 }
366 366
367 CheckDir(fsFNameList); 367 CheckDir(fsFNameList);
368 } 368 }
369 369
370 static void fs_fsFilterCombo_activate(GtkEntry *entry,
371 gpointer user_data)
372 {
373 (void)entry;
374
375 fsFilter = gtk_entry_get_text(GTK_ENTRY(user_data));
376 CheckDir(fsFNameList);
377 }
378
379 static void fs_fsPathCombo_changed(GtkEditable *editable, 370 static void fs_fsPathCombo_changed(GtkEditable *editable,
380 gpointer user_data) 371 gpointer user_data)
381 { 372 {
382 const unsigned char *str; 373 const unsigned char *str;
383 gchar *dirname; 374 gchar *dirname;
384 375
385 (void)editable; 376 (void)editable;
386
387 str = gtk_entry_get_text(GTK_ENTRY(user_data));
388 dirname = g_hash_table_lookup(fsPathTable, str);
389
390 if (chdir(dirname ? (const unsigned char *)dirname : str) != -1)
391 CheckDir(fsFNameList);
392 }
393
394 static void fs_fsPathCombo_activate(GtkEntry *entry,
395 gpointer user_data)
396 {
397 const unsigned char *str;
398 gchar *dirname;
399
400 (void)entry;
401 377
402 str = gtk_entry_get_text(GTK_ENTRY(user_data)); 378 str = gtk_entry_get_text(GTK_ENTRY(user_data));
403 dirname = g_hash_table_lookup(fsPathTable, str); 379 dirname = g_hash_table_lookup(fsPathTable, str);
404 380
405 if (chdir(dirname ? (const unsigned char *)dirname : str) != -1) 381 if (chdir(dirname ? (const unsigned char *)dirname : str) != -1)
690 666
691 gtk_signal_connect(GTK_OBJECT(FileSelector), "destroy", GTK_SIGNAL_FUNC(fs_Destroy), NULL); 667 gtk_signal_connect(GTK_OBJECT(FileSelector), "destroy", GTK_SIGNAL_FUNC(fs_Destroy), NULL);
692 gtk_signal_connect(GTK_OBJECT(fsFNameListWindow), "key_release_event", GTK_SIGNAL_FUNC(on_FileSelect_key_release_event), NULL); 668 gtk_signal_connect(GTK_OBJECT(fsFNameListWindow), "key_release_event", GTK_SIGNAL_FUNC(on_FileSelect_key_release_event), NULL);
693 669
694 gtk_signal_connect(GTK_OBJECT(fsFilterCombo), "changed", GTK_SIGNAL_FUNC(fs_fsFilterCombo_changed), fsFilterCombo); 670 gtk_signal_connect(GTK_OBJECT(fsFilterCombo), "changed", GTK_SIGNAL_FUNC(fs_fsFilterCombo_changed), fsFilterCombo);
695 gtk_signal_connect(GTK_OBJECT(fsFilterCombo), "activate", GTK_SIGNAL_FUNC(fs_fsFilterCombo_activate), fsFilterCombo);
696 gtk_signal_connect(GTK_OBJECT(fsPathCombo), "changed", GTK_SIGNAL_FUNC(fs_fsPathCombo_changed), fsPathCombo); 671 gtk_signal_connect(GTK_OBJECT(fsPathCombo), "changed", GTK_SIGNAL_FUNC(fs_fsPathCombo_changed), fsPathCombo);
697 gtk_signal_connect(GTK_OBJECT(fsPathCombo), "activate", GTK_SIGNAL_FUNC(fs_fsPathCombo_activate), fsPathCombo);
698 gtk_signal_connect(GTK_OBJECT(fsUp), "released", GTK_SIGNAL_FUNC(fs_Up_released), fsFNameList); 672 gtk_signal_connect(GTK_OBJECT(fsUp), "released", GTK_SIGNAL_FUNC(fs_Up_released), fsFNameList);
699 gtk_signal_connect(GTK_OBJECT(fsUp), "key_release_event", GTK_SIGNAL_FUNC(on_FileSelect_key_release_event), NULL); 673 gtk_signal_connect(GTK_OBJECT(fsUp), "key_release_event", GTK_SIGNAL_FUNC(on_FileSelect_key_release_event), NULL);
700 gtk_signal_connect(GTK_OBJECT(fsOk), "released", GTK_SIGNAL_FUNC(fs_Ok_released), fsCombo4); 674 gtk_signal_connect(GTK_OBJECT(fsOk), "released", GTK_SIGNAL_FUNC(fs_Ok_released), fsCombo4);
701 gtk_signal_connect(GTK_OBJECT(fsOk), "key_release_event", GTK_SIGNAL_FUNC(on_FileSelect_key_release_event), NULL); 675 gtk_signal_connect(GTK_OBJECT(fsOk), "key_release_event", GTK_SIGNAL_FUNC(on_FileSelect_key_release_event), NULL);
702 gtk_signal_connect(GTK_OBJECT(fsCancel), "released", GTK_SIGNAL_FUNC(fs_Cancel_released), NULL); 676 gtk_signal_connect(GTK_OBJECT(fsCancel), "released", GTK_SIGNAL_FUNC(fs_Cancel_released), NULL);