diff options
| author | Jean-Marie Traissard <jim@lapin.org> | 2006-11-19 22:45:43 +0300 |
|---|---|---|
| committer | Jean-Marie Traissard <jim@lapin.org> | 2006-11-19 22:45:43 +0300 |
| commit | 31c3deb86ec3718b020deb2e22873ce6e72fbb94 (patch) | |
| tree | a2bd3317eab3834a3ae6385be4210cf9bfbfab2b /data/glade | |
| parent | a6b38b60103f81535a0078cc6b21213f8a6e4fb9 (diff) | |
Merge back [7466], [7467] and [7472] that were overwritten by ad_hoc merge. Fixes
#2200.
Diffstat (limited to 'data/glade')
| -rw-r--r-- | data/glade/input_dialog.glade | 2 | ||||
| -rw-r--r-- | data/glade/roster_window.glade | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/data/glade/input_dialog.glade b/data/glade/input_dialog.glade index 141127c11..77b17f1f2 100644 --- a/data/glade/input_dialog.glade +++ b/data/glade/input_dialog.glade @@ -17,7 +17,9 @@ <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property> <property name="gravity">GDK_GRAVITY_NORTH_WEST</property> <property name="focus_on_map">True</property> + <property name="urgency_hint">False</property> <property name="has_separator">False</property> + <signal name="destroy" handler="on_input_dialog_destroy" last_modification_time="Sat, 18 Nov 2006 20:23:21 GMT"/> <child internal-child="vbox"> <widget class="GtkVBox" id="dialog-vbox10"> diff --git a/data/glade/roster_window.glade b/data/glade/roster_window.glade index 23c7edaa3..5e393ae45 100644 --- a/data/glade/roster_window.glade +++ b/data/glade/roster_window.glade @@ -26,6 +26,7 @@ <signal name="focus_in_event" handler="on_roster_window_focus_in_event" last_modification_time="Sun, 04 Sep 2005 16:33:35 GMT"/> <signal name="key_press_event" handler="on_roster_window_key_press_event" last_modification_time="Tue, 20 Sep 2005 19:26:27 GMT"/> <signal name="focus_out_event" handler="on_roster_window_focus_out_event" last_modification_time="Tue, 08 Nov 2005 14:01:01 GMT"/> + <signal name="popup_menu" handler="on_roster_window_popup_menu" last_modification_time="Sat, 18 Nov 2006 21:12:06 GMT"/> <child> <widget class="GtkVBox" id="roster_vbox"> |