Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 169666 Details for
Bug 243004
net-misc/vinagre-2.24.1 pulls in net-dns/avahi, which blocks net-misc/mDNSResponder
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Make avahi optional
vinagre-2.24.1-avahi.patch (text/plain), 49.28 KB, created by
Sven E.
on 2008-10-24 03:08:28 UTC
(
hide
)
Description:
Make avahi optional
Filename:
MIME Type:
Creator:
Sven E.
Created:
2008-10-24 03:08:28 UTC
Size:
49.28 KB
patch
obsolete
>diff -Naur vinagre-2.24.1/configure.ac vinagrenew/configure.ac >--- vinagre-2.24.1/configure.ac 2008-10-20 16:59:15.000000000 +0200 >+++ vinagrenew/configure.ac 2008-10-24 04:35:17.492528210 +0200 >@@ -50,12 +50,22 @@ > gconf-2.0 >= $GCONF_REQUIRED \ > gthread-2.0 >= $GTHREAD_REQUIRED \ > gnome-keyring-1 \ >- gtk-vnc-1.0 >= $GTK_VNC_REQUIRED \ >- avahi-ui >= $AVAHI_REQUIRED \ >- avahi-gobject >= $AVAHI_REQUIRED) >+ gtk-vnc-1.0 >= $GTK_VNC_REQUIRED) > AC_SUBST(VINAGRE_CFLAGS) > AC_SUBST(VINAGRE_LIBS) > >+AC_ARG_ENABLE(avahi, [ --disable-avahi Disable avahi features],,enable_avahi=yes) >+if test "x$enable_avahi" = "xyes" ; >+ then >+ PKG_CHECK_MODULES(AVAHI,\ >+ avahi-ui >= $AVAHI_REQUIRED\ >+ avahi-gobject >= $AVAHI_REQUIRED) >+ AC_SUBST(AVAHI_CFLAGS) >+ AC_SUBST(AVAHI_LIBS) >+ AC_DEFINE([AVAHI],[1],[We want avahi support]) >+fi >+AM_CONDITIONAL(AVAHI, test "x$enable_avahi" = "xyes") >+ > PKG_CHECK_MODULES(APPLET, \ > libpanelapplet-2.0 >= $PANEL_REQUIRED_VERSION) > AC_SUBST(APPLET_CFLAGS) >diff -Naur vinagre-2.24.1/data/Makefile.am vinagrenew/data/Makefile.am >--- vinagre-2.24.1/data/Makefile.am 2008-10-20 16:59:15.000000000 +0200 >+++ vinagrenew/data/Makefile.am 2008-10-24 04:34:48.812691226 +0200 >@@ -1,7 +1,12 @@ > SUBDIRS = icons > > gladedir = $(datadir)/vinagre >+ >+if AVAHI > glade_DATA = vinagre.glade >+else >+glade_DATA = vinagre-noavahi.glade >+endif > > man_MANS = vinagre.1 > >diff -Naur vinagre-2.24.1/data/vinagre-noavahi.glade vinagrenew/data/vinagre-noavahi.glade >--- vinagre-2.24.1/data/vinagre-noavahi.glade 1970-01-01 01:00:00.000000000 +0100 >+++ vinagrenew/data/vinagre-noavahi.glade 2008-10-24 04:30:00.934402886 +0200 >@@ -0,0 +1,748 @@ >+<?xml version="1.0" encoding="UTF-8" standalone="no"?> >+<!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd"> >+<!--Generated with glade3 3.4.5 on Sun Jun 1 09:41:43 2008 --> >+<glade-interface> >+ <widget class="GtkDialog" id="connect_dialog"> >+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> >+ <property name="border_width">5</property> >+ <property name="resizable">False</property> >+ <property name="modal">True</property> >+ <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property> >+ <property name="destroy_with_parent">True</property> >+ <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property> >+ <child internal-child="vbox"> >+ <widget class="GtkVBox" id="dialog-vbox1"> >+ <property name="visible">True</property> >+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> >+ <property name="spacing">2</property> >+ <child> >+ <widget class="GtkLabel" id="label1"> >+ <property name="visible">True</property> >+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> >+ <property name="xalign">0</property> >+ <property name="label" translatable="yes"><b>Which machine do you want to connect to?</b></property> >+ <property name="use_markup">True</property> >+ </widget> >+ <packing> >+ <property name="expand">False</property> >+ <property name="fill">False</property> >+ <property name="padding">6</property> >+ <property name="position">1</property> >+ </packing> >+ </child> >+ <child> >+ <widget class="GtkTable" id="table1"> >+ <property name="visible">True</property> >+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> >+ <property name="n_rows">1</property> >+ <property name="n_columns">4</property> >+ <property name="column_spacing">6</property> >+ <property name="row_spacing">6</property> >+ <child> >+ <widget class="GtkComboBoxEntry" id="host_entry"> >+ <property name="width_request">250</property> >+ <property name="visible">True</property> >+ <property name="tooltip" translatable="yes" comments="Tooltip for host entry in connect dialog">host or host:display or host::port</property> >+ <child internal-child="entry"> >+ <widget class="GtkEntry" id="comboboxentry-entry1"> >+ <property name="visible">True</property> >+ <property name="can_focus">True</property> >+ <property name="activates_default">True</property> >+ </widget> >+ </child> >+ </widget> >+ <packing> >+ <property name="left_attach">2</property> >+ <property name="right_attach">3</property> >+ <property name="y_options"></property> >+ </packing> >+ </child> >+ <child> >+ <widget class="GtkLabel" id="label2"> >+ <property name="visible">True</property> >+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> >+ <property name="label"> </property> >+ </widget> >+ <packing> >+ <property name="x_options">GTK_FILL</property> >+ <property name="y_options"></property> >+ </packing> >+ </child> >+ <child> >+ <widget class="GtkLabel" id="label3"> >+ <property name="visible">True</property> >+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> >+ <property name="label" translatable="yes">_Host:</property> >+ <property name="use_underline">True</property> >+ <property name="mnemonic_widget">host_entry</property> >+ </widget> >+ <packing> >+ <property name="left_attach">1</property> >+ <property name="right_attach">2</property> >+ <property name="x_options"></property> >+ <property name="y_options"></property> >+ </packing> >+ </child> >+ </widget> >+ <packing> >+ <property name="padding">4</property> >+ <property name="position">2</property> >+ </packing> >+ </child> >+ <child> >+ <widget class="GtkLabel" id="label4"> >+ <property name="visible">True</property> >+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> >+ <property name="xalign">0</property> >+ <property name="label" translatable="yes"><b>Connection options</b></property> >+ <property name="use_markup">True</property> >+ </widget> >+ <packing> >+ <property name="expand">False</property> >+ <property name="fill">False</property> >+ <property name="padding">6</property> >+ <property name="position">4</property> >+ </packing> >+ </child> >+ <child> >+ <widget class="GtkTable" id="table4"> >+ <property name="visible">True</property> >+ <property name="n_rows">3</property> >+ <property name="n_columns">2</property> >+ <property name="column_spacing">6</property> >+ <property name="row_spacing">2</property> >+ <child> >+ <placeholder/> >+ </child> >+ <child> >+ <placeholder/> >+ </child> >+ <child> >+ <widget class="GtkCheckButton" id="scaling_check"> >+ <property name="visible">True</property> >+ <property name="can_focus">True</property> >+ <property name="label" translatable="yes">_Scaling</property> >+ <property name="use_underline">True</property> >+ <property name="response_id">0</property> >+ <property name="draw_indicator">True</property> >+ </widget> >+ <packing> >+ <property name="left_attach">1</property> >+ <property name="right_attach">2</property> >+ <property name="top_attach">2</property> >+ <property name="bottom_attach">3</property> >+ </packing> >+ </child> >+ <child> >+ <widget class="GtkCheckButton" id="viewonly_check"> >+ <property name="visible">True</property> >+ <property name="can_focus">True</property> >+ <property name="label" translatable="yes">_View only</property> >+ <property name="use_underline">True</property> >+ <property name="response_id">0</property> >+ <property name="draw_indicator">True</property> >+ </widget> >+ <packing> >+ <property name="left_attach">1</property> >+ <property name="right_attach">2</property> >+ <property name="top_attach">1</property> >+ <property name="bottom_attach">2</property> >+ </packing> >+ </child> >+ <child> >+ <widget class="GtkCheckButton" id="fullscreen_check"> >+ <property name="visible">True</property> >+ <property name="can_focus">True</property> >+ <property name="label" translatable="yes">_Full screen</property> >+ <property name="use_underline">True</property> >+ <property name="response_id">0</property> >+ <property name="draw_indicator">True</property> >+ </widget> >+ <packing> >+ <property name="left_attach">1</property> >+ <property name="right_attach">2</property> >+ </packing> >+ </child> >+ <child> >+ <widget class="GtkLabel" id="label6"> >+ <property name="visible">True</property> >+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> >+ <property name="label"> </property> >+ </widget> >+ <packing> >+ <property name="x_options"></property> >+ <property name="y_options"></property> >+ </packing> >+ </child> >+ </widget> >+ <packing> >+ <property name="position">5</property> >+ </packing> >+ </child> >+ <child internal-child="action_area"> >+ <widget class="GtkHButtonBox" id="dialog-action_area1"> >+ <property name="visible">True</property> >+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> >+ <property name="layout_style">GTK_BUTTONBOX_END</property> >+ <child> >+ <widget class="GtkButton" id="button1"> >+ <property name="visible">True</property> >+ <property name="can_focus">True</property> >+ <property name="receives_default">True</property> >+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> >+ <property name="label">gtk-cancel</property> >+ <property name="use_stock">True</property> >+ <property name="response_id">-6</property> >+ </widget> >+ </child> >+ <child> >+ <widget class="GtkButton" id="button2"> >+ <property name="visible">True</property> >+ <property name="can_focus">True</property> >+ <property name="can_default">True</property> >+ <property name="has_default">True</property> >+ <property name="receives_default">True</property> >+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> >+ <property name="label">gtk-connect</property> >+ <property name="use_stock">True</property> >+ <property name="response_id">-5</property> >+ </widget> >+ <packing> >+ <property name="position">1</property> >+ </packing> >+ </child> >+ </widget> >+ <packing> >+ <property name="expand">False</property> >+ <property name="pack_type">GTK_PACK_END</property> >+ </packing> >+ </child> >+ </widget> >+ </child> >+ </widget> >+ <widget class="GtkDialog" id="password_required_dialog"> >+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> >+ <property name="border_width">5</property> >+ <property name="resizable">False</property> >+ <property name="modal">True</property> >+ <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property> >+ <property name="destroy_with_parent">True</property> >+ <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property> >+ <property name="has_separator">False</property> >+ <child internal-child="vbox"> >+ <widget class="GtkVBox" id="dialog-vbox2"> >+ <property name="visible">True</property> >+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> >+ <property name="spacing">2</property> >+ <child> >+ <widget class="GtkVBox" id="vbox1"> >+ <property name="visible">True</property> >+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> >+ <property name="spacing">6</property> >+ <child> >+ <widget class="GtkLabel" id="label5"> >+ <property name="visible">True</property> >+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> >+ <property name="xalign">0</property> >+ <property name="label" translatable="yes"><b>In order to connect on this machine, a password is required. Please supply it.</b></property> >+ <property name="use_markup">True</property> >+ <property name="wrap">True</property> >+ </widget> >+ <packing> >+ <property name="padding">6</property> >+ </packing> >+ </child> >+ <child> >+ <widget class="GtkTable" id="table3"> >+ <property name="visible">True</property> >+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> >+ <property name="n_rows">3</property> >+ <property name="n_columns">2</property> >+ <property name="row_spacing">5</property> >+ <child> >+ <placeholder/> >+ </child> >+ <child> >+ <widget class="GtkLabel" id="label19"> >+ <property name="visible">True</property> >+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> >+ <property name="xalign">0</property> >+ <property name="label" translatable="yes">Host:</property> >+ <property name="use_underline">True</property> >+ <property name="mnemonic_widget">password_entry</property> >+ </widget> >+ </child> >+ <child> >+ <widget class="GtkLabel" id="label21"> >+ <property name="visible">True</property> >+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> >+ <property name="xalign">0</property> >+ <property name="label" translatable="yes">_Password:</property> >+ <property name="use_underline">True</property> >+ <property name="mnemonic_widget">password_entry</property> >+ </widget> >+ <packing> >+ <property name="top_attach">1</property> >+ <property name="bottom_attach">2</property> >+ </packing> >+ </child> >+ <child> >+ <widget class="GtkEntry" id="password_entry"> >+ <property name="visible">True</property> >+ <property name="can_focus">True</property> >+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> >+ <property name="max_length">8</property> >+ <property name="visibility">False</property> >+ <property name="activates_default">True</property> >+ </widget> >+ <packing> >+ <property name="left_attach">1</property> >+ <property name="right_attach">2</property> >+ <property name="top_attach">1</property> >+ <property name="bottom_attach">2</property> >+ </packing> >+ </child> >+ <child> >+ <widget class="GtkLabel" id="host_label"> >+ <property name="visible">True</property> >+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> >+ <property name="xalign">0</property> >+ </widget> >+ <packing> >+ <property name="left_attach">1</property> >+ <property name="right_attach">2</property> >+ </packing> >+ </child> >+ <child> >+ <widget class="GtkCheckButton" id="save_password_check"> >+ <property name="visible">True</property> >+ <property name="can_focus">True</property> >+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> >+ <property name="label" translatable="yes">_Remember this password</property> >+ <property name="use_underline">True</property> >+ <property name="response_id">0</property> >+ <property name="draw_indicator">True</property> >+ </widget> >+ <packing> >+ <property name="left_attach">1</property> >+ <property name="right_attach">2</property> >+ <property name="top_attach">2</property> >+ <property name="bottom_attach">3</property> >+ </packing> >+ </child> >+ </widget> >+ <packing> >+ <property name="position">1</property> >+ </packing> >+ </child> >+ </widget> >+ <packing> >+ <property name="position">1</property> >+ </packing> >+ </child> >+ <child internal-child="action_area"> >+ <widget class="GtkHButtonBox" id="dialog-action_area2"> >+ <property name="visible">True</property> >+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> >+ <property name="layout_style">GTK_BUTTONBOX_END</property> >+ <child> >+ <widget class="GtkButton" id="button3"> >+ <property name="visible">True</property> >+ <property name="can_focus">True</property> >+ <property name="receives_default">True</property> >+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> >+ <property name="label">gtk-cancel</property> >+ <property name="use_stock">True</property> >+ <property name="response_id">-6</property> >+ </widget> >+ </child> >+ <child> >+ <widget class="GtkButton" id="button4"> >+ <property name="visible">True</property> >+ <property name="can_focus">True</property> >+ <property name="can_default">True</property> >+ <property name="has_default">True</property> >+ <property name="receives_default">True</property> >+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> >+ <property name="label">gtk-ok</property> >+ <property name="use_stock">True</property> >+ <property name="response_id">-5</property> >+ </widget> >+ <packing> >+ <property name="position">1</property> >+ </packing> >+ </child> >+ </widget> >+ <packing> >+ <property name="expand">False</property> >+ <property name="pack_type">GTK_PACK_END</property> >+ </packing> >+ </child> >+ </widget> >+ </child> >+ </widget> >+ <widget class="GtkDialog" id="add_to_bookmarks_dialog"> >+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> >+ <property name="border_width">5</property> >+ <property name="title" translatable="yes">Saving to bookmarks</property> >+ <property name="resizable">False</property> >+ <property name="modal">True</property> >+ <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property> >+ <property name="destroy_with_parent">True</property> >+ <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property> >+ <property name="has_separator">False</property> >+ <child internal-child="vbox"> >+ <widget class="GtkVBox" id="dialog-vbox3"> >+ <property name="visible">True</property> >+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> >+ <property name="spacing">2</property> >+ <child> >+ <widget class="GtkVBox" id="vbox2"> >+ <property name="visible">True</property> >+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> >+ <child> >+ <widget class="GtkLabel" id="label8"> >+ <property name="visible">True</property> >+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> >+ <property name="label" translatable="yes"><b>Enter a name for this connection</b></property> >+ <property name="use_markup">True</property> >+ </widget> >+ <packing> >+ <property name="expand">False</property> >+ <property name="fill">False</property> >+ <property name="padding">6</property> >+ </packing> >+ </child> >+ <child> >+ <widget class="GtkHBox" id="hbox3"> >+ <property name="visible">True</property> >+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> >+ <property name="spacing">6</property> >+ <child> >+ <widget class="GtkLabel" id="label10"> >+ <property name="visible">True</property> >+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> >+ <property name="label"> </property> >+ </widget> >+ </child> >+ <child> >+ <widget class="GtkLabel" id="label9"> >+ <property name="visible">True</property> >+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> >+ <property name="label" translatable="yes">_Name:</property> >+ <property name="use_underline">True</property> >+ <property name="mnemonic_widget">bookmark_name_entry</property> >+ </widget> >+ <packing> >+ <property name="expand">False</property> >+ <property name="fill">False</property> >+ <property name="padding">3</property> >+ <property name="position">1</property> >+ </packing> >+ </child> >+ <child> >+ <widget class="GtkEntry" id="bookmark_name_entry"> >+ <property name="visible">True</property> >+ <property name="can_focus">True</property> >+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> >+ <property name="activates_default">True</property> >+ </widget> >+ <packing> >+ <property name="position">2</property> >+ </packing> >+ </child> >+ </widget> >+ <packing> >+ <property name="padding">6</property> >+ <property name="position">1</property> >+ </packing> >+ </child> >+ </widget> >+ <packing> >+ <property name="position">1</property> >+ </packing> >+ </child> >+ <child internal-child="action_area"> >+ <widget class="GtkHButtonBox" id="dialog-action_area3"> >+ <property name="visible">True</property> >+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> >+ <property name="layout_style">GTK_BUTTONBOX_END</property> >+ <child> >+ <widget class="GtkButton" id="button5"> >+ <property name="visible">True</property> >+ <property name="can_focus">True</property> >+ <property name="receives_default">True</property> >+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> >+ <property name="label">gtk-cancel</property> >+ <property name="use_stock">True</property> >+ <property name="response_id">0</property> >+ </widget> >+ </child> >+ <child> >+ <widget class="GtkButton" id="button6"> >+ <property name="visible">True</property> >+ <property name="can_focus">True</property> >+ <property name="can_default">True</property> >+ <property name="has_default">True</property> >+ <property name="receives_default">True</property> >+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> >+ <property name="label">gtk-ok</property> >+ <property name="use_stock">True</property> >+ <property name="response_id">-5</property> >+ </widget> >+ <packing> >+ <property name="position">1</property> >+ </packing> >+ </child> >+ </widget> >+ <packing> >+ <property name="expand">False</property> >+ <property name="pack_type">GTK_PACK_END</property> >+ </packing> >+ </child> >+ </widget> >+ </child> >+ </widget> >+ <widget class="GtkDialog" id="edit_bookmark_dialog"> >+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> >+ <property name="border_width">5</property> >+ <property name="title" translatable="yes">Editing a bookmark</property> >+ <property name="resizable">False</property> >+ <property name="modal">True</property> >+ <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property> >+ <property name="destroy_with_parent">True</property> >+ <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property> >+ <child internal-child="vbox"> >+ <widget class="GtkVBox" id="dialog-vbox4"> >+ <property name="visible">True</property> >+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> >+ <property name="spacing">2</property> >+ <child> >+ <widget class="GtkLabel" id="label15"> >+ <property name="visible">True</property> >+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> >+ <property name="xalign">0</property> >+ <property name="label" translatable="yes"><b>Editing a bookmark</b></property> >+ <property name="use_markup">True</property> >+ </widget> >+ <packing> >+ <property name="expand">False</property> >+ <property name="fill">False</property> >+ <property name="padding">6</property> >+ <property name="position">2</property> >+ </packing> >+ </child> >+ <child> >+ <widget class="GtkTable" id="table2"> >+ <property name="visible">True</property> >+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> >+ <property name="n_rows">2</property> >+ <property name="n_columns">3</property> >+ <property name="column_spacing">6</property> >+ <property name="row_spacing">6</property> >+ <child> >+ <placeholder/> >+ </child> >+ <child> >+ <widget class="GtkEntry" id="edit_bookmark_host_entry"> >+ <property name="visible">True</property> >+ <property name="can_focus">True</property> >+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> >+ <property name="tooltip" translatable="yes">host or host:display or host::port</property> >+ <property name="activates_default">True</property> >+ </widget> >+ <packing> >+ <property name="left_attach">2</property> >+ <property name="right_attach">3</property> >+ <property name="top_attach">1</property> >+ <property name="bottom_attach">2</property> >+ </packing> >+ </child> >+ <child> >+ <widget class="GtkEntry" id="edit_bookmark_name_entry"> >+ <property name="width_request">250</property> >+ <property name="visible">True</property> >+ <property name="can_focus">True</property> >+ <property name="is_focus">True</property> >+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> >+ <property name="activates_default">True</property> >+ </widget> >+ <packing> >+ <property name="left_attach">2</property> >+ <property name="right_attach">3</property> >+ </packing> >+ </child> >+ <child> >+ <widget class="GtkLabel" id="label13"> >+ <property name="visible">True</property> >+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> >+ <property name="xalign">0</property> >+ <property name="label" translatable="yes">_Host:</property> >+ <property name="use_underline">True</property> >+ <property name="mnemonic_widget">edit_bookmark_host_entry</property> >+ </widget> >+ <packing> >+ <property name="left_attach">1</property> >+ <property name="right_attach">2</property> >+ <property name="top_attach">1</property> >+ <property name="bottom_attach">2</property> >+ </packing> >+ </child> >+ <child> >+ <widget class="GtkLabel" id="label14"> >+ <property name="visible">True</property> >+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> >+ <property name="xalign">0</property> >+ <property name="label" translatable="yes">_Bookmark name:</property> >+ <property name="use_underline">True</property> >+ <property name="mnemonic_widget">edit_bookmark_name_entry</property> >+ </widget> >+ <packing> >+ <property name="left_attach">1</property> >+ <property name="right_attach">2</property> >+ </packing> >+ </child> >+ <child> >+ <widget class="GtkLabel" id="label16"> >+ <property name="visible">True</property> >+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> >+ <property name="label"> </property> >+ </widget> >+ </child> >+ </widget> >+ <packing> >+ <property name="position">3</property> >+ </packing> >+ </child> >+ <child> >+ <widget class="GtkLabel" id="label7"> >+ <property name="visible">True</property> >+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> >+ <property name="xalign">0</property> >+ <property name="label" translatable="yes"><b>Connection options</b></property> >+ <property name="use_markup">True</property> >+ </widget> >+ <packing> >+ <property name="expand">False</property> >+ <property name="fill">False</property> >+ <property name="padding">6</property> >+ <property name="position">4</property> >+ </packing> >+ </child> >+ <child> >+ <widget class="GtkTable" id="table5"> >+ <property name="visible">True</property> >+ <property name="n_rows">3</property> >+ <property name="n_columns">2</property> >+ <property name="column_spacing">6</property> >+ <property name="row_spacing">2</property> >+ <child> >+ <placeholder/> >+ </child> >+ <child> >+ <placeholder/> >+ </child> >+ <child> >+ <widget class="GtkCheckButton" id="edit_scaling_check"> >+ <property name="visible">True</property> >+ <property name="can_focus">True</property> >+ <property name="label" translatable="yes">_Scaling</property> >+ <property name="use_underline">True</property> >+ <property name="response_id">0</property> >+ <property name="draw_indicator">True</property> >+ </widget> >+ <packing> >+ <property name="left_attach">1</property> >+ <property name="right_attach">2</property> >+ <property name="top_attach">2</property> >+ <property name="bottom_attach">3</property> >+ </packing> >+ </child> >+ <child> >+ <widget class="GtkCheckButton" id="edit_viewonly_check"> >+ <property name="visible">True</property> >+ <property name="can_focus">True</property> >+ <property name="label" translatable="yes">_View only</property> >+ <property name="use_underline">True</property> >+ <property name="response_id">0</property> >+ <property name="draw_indicator">True</property> >+ </widget> >+ <packing> >+ <property name="left_attach">1</property> >+ <property name="right_attach">2</property> >+ <property name="top_attach">1</property> >+ <property name="bottom_attach">2</property> >+ </packing> >+ </child> >+ <child> >+ <widget class="GtkCheckButton" id="edit_fullscreen_check"> >+ <property name="visible">True</property> >+ <property name="can_focus">True</property> >+ <property name="label" translatable="yes">_Full screen</property> >+ <property name="use_underline">True</property> >+ <property name="response_id">0</property> >+ <property name="draw_indicator">True</property> >+ </widget> >+ <packing> >+ <property name="left_attach">1</property> >+ <property name="right_attach">2</property> >+ </packing> >+ </child> >+ <child> >+ <widget class="GtkLabel" id="label11"> >+ <property name="visible">True</property> >+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> >+ <property name="label"> </property> >+ </widget> >+ <packing> >+ <property name="x_options"></property> >+ <property name="y_options"></property> >+ </packing> >+ </child> >+ </widget> >+ <packing> >+ <property name="position">5</property> >+ </packing> >+ </child> >+ <child internal-child="action_area"> >+ <widget class="GtkHButtonBox" id="dialog-action_area4"> >+ <property name="visible">True</property> >+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> >+ <property name="layout_style">GTK_BUTTONBOX_END</property> >+ <child> >+ <widget class="GtkButton" id="button7"> >+ <property name="visible">True</property> >+ <property name="can_focus">True</property> >+ <property name="receives_default">True</property> >+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> >+ <property name="label">gtk-cancel</property> >+ <property name="use_stock">True</property> >+ <property name="response_id">-6</property> >+ </widget> >+ </child> >+ <child> >+ <widget class="GtkButton" id="button8"> >+ <property name="visible">True</property> >+ <property name="can_focus">True</property> >+ <property name="can_default">True</property> >+ <property name="has_default">True</property> >+ <property name="receives_default">True</property> >+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> >+ <property name="label">gtk-save</property> >+ <property name="use_stock">True</property> >+ <property name="response_id">-5</property> >+ </widget> >+ <packing> >+ <property name="position">1</property> >+ </packing> >+ </child> >+ </widget> >+ <packing> >+ <property name="expand">False</property> >+ <property name="pack_type">GTK_PACK_END</property> >+ </packing> >+ </child> >+ </widget> >+ </child> >+ </widget> >+</glade-interface> >diff -Naur vinagre-2.24.1/src/Makefile.am vinagrenew/src/Makefile.am >--- vinagre-2.24.1/src/Makefile.am 2008-10-20 16:59:09.000000000 +0200 >+++ vinagrenew/src/Makefile.am 2008-10-24 02:35:07.459091984 +0200 >@@ -15,6 +15,7 @@ > -DVINAGRE_DATADIR=\""$(datadir)/vinagre"\" \ > -DPACKAGE_LOCALE_DIR=\""$(datadir)/locale"\" \ > $(VINAGRE_CFLAGS) \ >+ $(AVAHI_CFLAGS) \ > $(NULL) > > bin_PROGRAMS = vinagre >@@ -33,16 +34,19 @@ > vinagre-ui.h vinagre-window-private.h \ > vinagre-enums.h vinagre-enums.c \ > gossip-cell-renderer-expander.c gossip-cell-renderer-expander.h \ >- vinagre-mdns.h vinagre-mdns.c \ > vinagre-prefs.h vinagre-prefs.c \ > bacon-message-connection.h bacon-message-connection.c \ > vinagre-app.h vinagre-app.c \ > vinagre-bacon.h vinagre-bacon.c \ > $(NULL) >+if AVAHI >+vinagre_SOURCES += vinagre-mdns.h vinagre-mdns.c >+endif > > vinagre_LDADD = \ > $(VINAGRE_LIBS) \ > $(GTKVNC_LIBS) \ >+ $(AVAHI_LIBS) \ > view/libview.la \ > $(NULL) > >@@ -70,6 +74,7 @@ > > vinagre_applet_CFLAGS = \ > $(APPLET_CFLAGS) \ >+ $(AVAHI_CFLAGS) \ > $(NULL) > > vinagre_applet_SOURCES = \ >@@ -78,12 +83,15 @@ > vinagre-connection.h vinagre-connection.c \ > vinagre-utils.h vinagre-utils.c \ > vinagre-enums.h vinagre-enums.c \ >- vinagre-mdns.h vinagre-mdns.c \ > $(NULL) >+if AVAHI >+vinagre_applet_SOURCES += vinagre-mdns.h vinagre-mdns.c >+endif > > vinagre_applet_LDADD = \ > $(APPLET_LIBS) \ > $(VINAGRE_LIBS) \ >+ $(AVAHI_LIBS) \ > $(NULL) > > >diff -Naur vinagre-2.24.1/src/vinagre-applet.c vinagrenew/src/vinagre-applet.c >--- vinagre-2.24.1/src/vinagre-applet.c 2008-10-20 16:59:09.000000000 +0200 >+++ vinagrenew/src/vinagre-applet.c 2008-10-24 04:59:32.022420720 +0200 >@@ -23,12 +23,13 @@ > #include <gtk/gtk.h> > #include <panel-applet.h> > #include "vinagre-bookmarks.h" >-#include "vinagre-mdns.h" > #include "vinagre-utils.h" > #include "vinagre-connection.h" > #include "vinagre-commands.h" > #include <config.h> >- >+#ifdef AVAHI >+ #include "vinagre-mdns.h" >+#endif > static void > menu_position (GtkMenu *menu, > gint *x, >@@ -173,8 +174,10 @@ > all = vinagre_bookmarks_get_all (vinagre_bookmarks_get_default ()); > fill_menu (all, menu); > >+#ifdef AVAHI > all = vinagre_mdns_get_all (vinagre_mdns_get_default ()); > fill_menu (all, menu); >+#endif > > gtk_widget_show_all (menu); > gtk_menu_popup (GTK_MENU (menu), NULL, NULL, (GtkMenuPositionFunc) menu_position, applet, >@@ -205,7 +208,9 @@ > { > GtkWidget *image, *button; > gchar *tmp; >+#ifdef AVAHI > VinagreMdns *mdns; >+#endif > static const BonoboUIVerb menu_verbs[] = { > BONOBO_UI_VERB ("VinagreHelp", help_cb), > BONOBO_UI_VERB ("VinagreAbout", about_cb), >@@ -237,9 +242,9 @@ > > gtk_container_add (GTK_CONTAINER (applet), image); > gtk_widget_show_all (GTK_WIDGET (applet)); >- >+#ifdef AVAHI > mdns = vinagre_mdns_get_default (); >- >+#endif > return TRUE; > } > >diff -Naur vinagre-2.24.1/src/vinagre-connect.c vinagrenew/src/vinagre-connect.c >--- vinagre-2.24.1/src/vinagre-connect.c 2008-10-20 16:59:09.000000000 +0200 >+++ vinagrenew/src/vinagre-connect.c 2008-10-24 05:02:45.301366186 +0200 >@@ -22,7 +22,10 @@ > #include <glib/gi18n.h> > #include <gtk/gtk.h> > #include <glade/glade.h> >-#include <avahi-ui/avahi-ui.h> >+#include <config.h> >+#ifdef AVAHI >+ #include <avahi-ui/avahi-ui.h> >+#endif > #include <string.h> > > #include "vinagre-connect.h" >@@ -34,7 +37,9 @@ > GladeXML *xml; > GtkWidget *dialog; > GtkWidget *host_entry; >+#ifdef AVAHI > GtkWidget *find_button; >+#endif > GtkWidget *fullscreen_check; > GtkWidget *scaling_check; > GtkWidget *viewonly_check; >@@ -174,6 +179,7 @@ > } > } > >+#ifdef AVAHI > static void > vinagre_connect_find_button_cb (GtkButton *button, > VinagreConnectDialog *dialog) >@@ -208,6 +214,7 @@ > > gtk_widget_destroy (d); > } >+#endif > > VinagreConnection *vinagre_connect (VinagreWindow *window) > { >@@ -220,18 +227,20 @@ > gtk_window_set_transient_for (GTK_WINDOW (dialog.dialog), GTK_WINDOW (window)); > > dialog.host_entry = glade_xml_get_widget (dialog.xml, "host_entry"); >+#ifdef AVAHI > dialog.find_button = glade_xml_get_widget (dialog.xml, "find_button"); >+#endif > dialog.fullscreen_check = glade_xml_get_widget (dialog.xml, "fullscreen_check"); > dialog.viewonly_check = glade_xml_get_widget (dialog.xml, "viewonly_check"); > dialog.scaling_check = glade_xml_get_widget (dialog.xml, "scaling_check"); > > setup_combo (dialog.host_entry); >- >+#ifdef AVAHI > g_signal_connect (dialog.find_button, > "clicked", > G_CALLBACK (vinagre_connect_find_button_cb), > &dialog); >- >+#endif > gtk_widget_show_all (dialog.dialog); > result = gtk_dialog_run (GTK_DIALOG (dialog.dialog)); > >diff -Naur vinagre-2.24.1/src/vinagre-fav.c vinagrenew/src/vinagre-fav.c >--- vinagre-2.24.1/src/vinagre-fav.c 2008-10-20 16:59:09.000000000 +0200 >+++ vinagrenew/src/vinagre-fav.c 2008-10-24 02:41:13.056854093 +0200 >@@ -26,7 +26,9 @@ > #include "vinagre-fav.h" > #include "vinagre-utils.h" > #include "vinagre-bookmarks.h" >-#include "vinagre-mdns.h" >+#ifdef AVAHI >+ #include "vinagre-mdns.h" >+#endif > #include "vinagre-window-private.h" > #include "gossip-cell-renderer-expander.h" > >@@ -724,10 +726,12 @@ > "changed", > G_CALLBACK (vinagre_fav_update_list), > fav); >+#ifdef AVAHI > g_signal_connect_swapped (vinagre_mdns_get_default (), > "changed", > G_CALLBACK (vinagre_fav_update_list), > fav); >+#endif > } > > GtkWidget * >@@ -798,6 +802,7 @@ > gtk_tree_path_free (path); > > /* avahi */ >+#ifdef AVAHI > list = vinagre_mdns_get_all (vinagre_mdns_get_default ()); > if (!list) > return FALSE; >@@ -841,7 +846,7 @@ > path = gtk_tree_path_new_from_string ("1"); > gtk_tree_view_expand_row (GTK_TREE_VIEW (fav->priv->tree), path, FALSE); > gtk_tree_path_free (path); >- >+#endif > return FALSE; > } > /* vim: set ts=8: */ >diff -Naur vinagre-2.24.1/src/vinagre-main.c vinagrenew/src/vinagre-main.c >--- vinagre-2.24.1/src/vinagre-main.c 2008-10-20 16:59:09.000000000 +0200 >+++ vinagrenew/src/vinagre-main.c 2008-10-24 02:42:24.912369135 +0200 >@@ -33,7 +33,9 @@ > #include "vinagre-app.h" > #include "vinagre-utils.h" > #include "vinagre-prefs.h" >-#include "vinagre-mdns.h" >+#ifdef AVAHI >+ #include "vinagre-mdns.h" >+#endif > #include "vinagre-bacon.h" > #include <vncdisplay.h> > >@@ -169,7 +171,9 @@ > gtk_main (); > > g_object_unref (vinagre_bookmarks_get_default ()); >+#ifdef AVAHI > g_object_unref (vinagre_mdns_get_default ()); >+#endif > g_object_unref (vinagre_prefs_get_default ()); > > return 0; >diff -Naur vinagre-2.24.1/src/vinagre-utils.c vinagrenew/src/vinagre-utils.c >--- vinagre-2.24.1/src/vinagre-utils.c 2008-10-20 16:59:09.000000000 +0200 >+++ vinagrenew/src/vinagre-utils.c 2008-10-24 05:03:56.868946802 +0200 >@@ -23,12 +23,16 @@ > #include <gtk/gtk.h> > #include "vinagre-utils.h" > >-#define VINAGRE_GLADE_FILE "vinagre.glade" > #define VINAGRE_UI_XML_FILE "vinagre-ui.xml" > > #ifdef HAVE_CONFIG_H > #include <config.h> > #endif >+#ifdef AVAHI >+ #define VINAGRE_GLADE_FILE "vinagre.glade" >+#else >+ #define VINAGRE_GLADE_FILE "vinagre-noavahi.glade" >+#endif > > /* For the workspace/viewport stuff */ > #ifdef GDK_WINDOWING_X11 >diff -Naur vinagre-2.24.1/src/vinagre-window.c vinagrenew/src/vinagre-window.c >--- vinagre-2.24.1/src/vinagre-window.c 2008-10-20 16:59:09.000000000 +0200 >+++ vinagrenew/src/vinagre-window.c 2008-10-24 02:47:28.627755703 +0200 >@@ -565,7 +565,10 @@ > { > VinagreWindowPrivate *p = window->priv; > GList *actions, *l; >- GSList *favs, *mdnss; >+ GSList *favs; >+#ifdef AVAHI >+ GSList *mdnss; >+#endif > gint n, m, i; > guint id; > >@@ -586,9 +589,11 @@ > g_list_free (actions); > > favs = vinagre_bookmarks_get_all (vinagre_bookmarks_get_default ()); >- mdnss = vinagre_mdns_get_all (vinagre_mdns_get_default ()); > n = g_slist_length (favs); >+#ifdef AVAHI >+ mdnss = vinagre_mdns_get_all (vinagre_mdns_get_default ()); > m = g_slist_length (mdnss); >+#endif > i = 0; > > id = (n > 0||m > 0) ? gtk_ui_manager_new_merge_id (p->manager) : 0; >@@ -642,6 +647,7 @@ > } > > /* avahi */ >+#ifdef AVAHI > i = 0; > while (mdnss) > { >@@ -690,7 +696,7 @@ > mdnss = mdnss->next; > i++; > } >- >+#endif > p->bookmarks_list_menu_ui_id = id; > } > >@@ -1017,10 +1023,12 @@ > "changed", > G_CALLBACK (vinagre_window_update_bookmarks_list_menu), > window); >- g_signal_connect_swapped (vinagre_mdns_get_default (), >+#ifdef AVAHI >+g_signal_connect_swapped (vinagre_mdns_get_default (), > "changed", > G_CALLBACK (vinagre_window_update_bookmarks_list_menu), > window); >+#endif > > vinagre_window_init_clipboard (window); > }
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=169666">View the attachment on a separate page</a>.</b>
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 243004
: 169666 |
169668
