comparison: pidgin/gtkstatusbox.c
pidgin/gtkstatusbox.c
- changeset 19659
- acdd4962bf80
- parent 19576
- 09a205dd2fea
- child 19859
- 71d37b57eff2
equal
deleted
inserted
replaced
| 19658:90dfb0f9cba1 | 19659:acdd4962bf80 |
|---|---|
| 1392 GDK_CURRENT_TIME, TRUE)) { | 1392 GDK_CURRENT_TIME, TRUE)) { |
| 1393 gtk_widget_hide (box->popup_window); | 1393 gtk_widget_hide (box->popup_window); |
| 1394 return; | 1394 return; |
| 1395 } | 1395 } |
| 1396 gtk_grab_add (box->popup_window); | 1396 gtk_grab_add (box->popup_window); |
| 1397 box->popup_in_progress = TRUE; | 1397 // box->popup_in_progress = TRUE; |
| 1398 gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (box->toggle_button), | 1398 gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (box->toggle_button), |
| 1399 TRUE); | 1399 TRUE); |
| 1400 | 1400 |
| 1401 if (box->active_row) { | 1401 if (box->active_row) { |
| 1402 GtkTreePath *path = gtk_tree_row_reference_get_path(box->active_row); | 1402 GtkTreePath *path = gtk_tree_row_reference_get_path(box->active_row); |
| 1588 if (ewidget == status_box->toggle_button && | 1588 if (ewidget == status_box->toggle_button && |
| 1589 status_box->popup_in_progress && | 1589 status_box->popup_in_progress && |
| 1590 gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (status_box->toggle_button))) { | 1590 gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (status_box->toggle_button))) { |
| 1591 pidgin_status_box_popdown (status_box); | 1591 pidgin_status_box_popdown (status_box); |
| 1592 return TRUE; | 1592 return TRUE; |
| 1593 } else if (ewidget == status_box->toggle_button) { | |
| 1594 status_box->popup_in_progress = TRUE; | |
| 1593 } | 1595 } |
| 1594 | 1596 |
| 1595 /* released outside treeview */ | 1597 /* released outside treeview */ |
| 1596 if (ewidget != status_box->toggle_button) | 1598 if (ewidget != status_box->toggle_button) { |
| 1597 { | |
| 1598 pidgin_status_box_popdown (status_box); | 1599 pidgin_status_box_popdown (status_box); |
| 1599 return TRUE; | 1600 return TRUE; |
| 1600 } | 1601 } |
| 1601 | 1602 |
| 1602 return FALSE; | 1603 return FALSE; |
| 1603 } | 1604 } |
| 1604 | 1605 |
| 1605 ret = gtk_tree_view_get_path_at_pos (GTK_TREE_VIEW (status_box->tree_view), | 1606 ret = gtk_tree_view_get_path_at_pos (GTK_TREE_VIEW (status_box->tree_view), |
