]>
Commit | Line | Data |
---|---|---|
845bceb6 | 1 | --- avahi-0.6.26/avahi-discover-standalone/Makefile.am~ 2010-06-25 05:25:11.000000000 +0200 |
2 | +++ avahi-0.6.26/avahi-discover-standalone/Makefile.am 2010-07-07 11:03:44.306813189 +0200 | |
3 | @@ -18,7 +18,8 @@ | |
6cccd02c | 4 | AM_CFLAGS=-I$(top_srcdir) |
845bceb6 | 5 | |
6cccd02c | 6 | interfaces = \ |
845bceb6 | 7 | - avahi-discover.ui |
8 | + avahi-discover.ui \ | |
9 | + avahi-discover-standalone.glade | |
10 | ||
6cccd02c | 11 | # This cool debug trap works on i386/gcc only |
12 | AM_CFLAGS+='-DDEBUG_TRAP=__asm__("int $$3")' | |
13 | diff -aurN avahi-0.6.5.orig/avahi-discover-standalone/avahi-discover-standalone.glade avahi-0.6.5/avahi-discover-standalone/avahi-discover-standalone.glade | |
14 | --- avahi-0.6.5.orig/avahi-discover-standalone/avahi-discover-standalone.glade 1970-01-01 01:00:00.000000000 +0100 | |
15 | +++ avahi-0.6.5/avahi-discover-standalone/avahi-discover-standalone.glade 2005-09-25 22:34:48.000000000 +0200 | |
16 | @@ -0,0 +1,91 @@ | |
17 | +<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*--> | |
18 | +<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd"> | |
19 | + | |
20 | +<glade-interface> | |
21 | + | |
22 | +<widget class="GtkWindow" id="main_window"> | |
23 | + <property name="visible">True</property> | |
24 | + <property name="title" translatable="yes">Avahi Discovery</property> | |
25 | + <property name="type">GTK_WINDOW_TOPLEVEL</property> | |
26 | + <property name="window_position">GTK_WIN_POS_NONE</property> | |
27 | + <property name="modal">False</property> | |
28 | + <property name="default_width">500</property> | |
29 | + <property name="default_height">400</property> | |
30 | + <property name="resizable">True</property> | |
31 | + <property name="destroy_with_parent">False</property> | |
32 | + <property name="decorated">True</property> | |
33 | + <property name="skip_taskbar_hint">False</property> | |
34 | + <property name="skip_pager_hint">False</property> | |
35 | + <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property> | |
36 | + <property name="gravity">GDK_GRAVITY_NORTH_WEST</property> | |
37 | + <property name="focus_on_map">True</property> | |
38 | + <signal handler="gtk_main_quit" name="destroy" after="False"/> | |
39 | + | |
40 | + <child> | |
41 | + <widget class="GtkVBox" id="vbox1"> | |
42 | + <property name="border_width">12</property> | |
43 | + <property name="visible">True</property> | |
44 | + <property name="homogeneous">False</property> | |
45 | + <property name="spacing">12</property> | |
46 | + | |
47 | + <child> | |
48 | + <widget class="GtkScrolledWindow" id="scrolledwindow1"> | |
49 | + <property name="visible">True</property> | |
50 | + <property name="can_focus">True</property> | |
51 | + <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property> | |
52 | + <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property> | |
53 | + <property name="shadow_type">GTK_SHADOW_IN</property> | |
54 | + <property name="window_placement">GTK_CORNER_TOP_LEFT</property> | |
55 | + | |
56 | + <child> | |
57 | + <widget class="GtkTreeView" id="tree_view"> | |
58 | + <property name="visible">True</property> | |
59 | + <property name="can_focus">True</property> | |
60 | + <property name="headers_visible">True</property> | |
61 | + <property name="rules_hint">False</property> | |
62 | + <property name="reorderable">False</property> | |
63 | + <property name="enable_search">True</property> | |
64 | + <property name="fixed_height_mode">False</property> | |
65 | + <property name="hover_selection">False</property> | |
66 | + <property name="hover_expand">False</property> | |
67 | + <signal name="cursor_changed" handler="on_tree_view_cursor_changed" last_modification_time="Sat, 30 Jul 2005 21:39:13 GMT"/> | |
68 | + </widget> | |
69 | + </child> | |
70 | + </widget> | |
71 | + <packing> | |
72 | + <property name="padding">0</property> | |
73 | + <property name="expand">True</property> | |
74 | + <property name="fill">True</property> | |
75 | + </packing> | |
76 | + </child> | |
77 | + | |
78 | + <child> | |
79 | + <widget class="GtkLabel" id="info_label"> | |
80 | + <property name="visible">True</property> | |
81 | + <property name="can_focus">True</property> | |
82 | + <property name="label" translatable="yes"><i>No service currently selected.</i></property> | |
83 | + <property name="use_underline">False</property> | |
84 | + <property name="use_markup">True</property> | |
85 | + <property name="justify">GTK_JUSTIFY_LEFT</property> | |
86 | + <property name="wrap">False</property> | |
87 | + <property name="selectable">True</property> | |
88 | + <property name="xalign">0</property> | |
89 | + <property name="yalign">0.5</property> | |
90 | + <property name="xpad">0</property> | |
91 | + <property name="ypad">0</property> | |
92 | + <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> | |
93 | + <property name="width_chars">-1</property> | |
94 | + <property name="single_line_mode">False</property> | |
95 | + <property name="angle">0</property> | |
96 | + </widget> | |
97 | + <packing> | |
98 | + <property name="padding">0</property> | |
99 | + <property name="expand">False</property> | |
100 | + <property name="fill">False</property> | |
101 | + </packing> | |
102 | + </child> | |
103 | + </widget> | |
104 | + </child> | |
105 | +</widget> | |
106 | + | |
107 | +</glade-interface> | |
845bceb6 | 108 | --- avahi-0.6.26/avahi-discover-standalone/main.c~ 2010-06-25 02:41:25.000000000 +0200 |
109 | +++ avahi-0.6.26/avahi-discover-standalone/main.c 2010-07-07 11:06:22.006805326 +0200 | |
110 | @@ -330,7 +330,7 @@ | |
6cccd02c | 111 | poll_api = avahi_glib_poll_new(NULL, G_PRIORITY_DEFAULT); |
845bceb6 | 112 | |
113 | ui = gtk_builder_new(); | |
114 | - gtk_builder_add_from_file(ui, AVAHI_INTERFACES_DIR"avahi-discover.ui", NULL); | |
115 | + gtk_builder_add_from_file(ui, AVAHI_INTERFACES_DIR"avahi-discover-standalone.glade", NULL); | |
116 | main_window = GTK_WIDGET(gtk_builder_get_object(ui, "main_window")); | |
6cccd02c | 117 | g_signal_connect(main_window, "delete-event", (GCallback) main_window_on_delete_event, NULL); |