Attachment #169666 for bug #243004




  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)
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)

Lines 1-7 Link Here

(-)vinagre-2.24.1/data/Makefile.am (+5 lines)
1	SUBDIRS = icons	1	SUBDIRS = icons
2		2
3	gladedir = $(datadir)/vinagre	3	gladedir = $(datadir)/vinagre
		4
		5	if AVAHI
4	glade_DATA = vinagre.glade	6	glade_DATA = vinagre.glade
		7	else
		8	glade_DATA = vinagre-noavahi.glade
		9	endif
5		10
6	man_MANS = vinagre.1	11	man_MANS = vinagre.1
7		12




<?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">&lt;b&gt;Which machine do you want to connect to?&lt;/b&gt;</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">&lt;b&gt;Connection options&lt;/b&gt;</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">&lt;b&gt;In order to connect on this machine, a password is required. Please supply it.&lt;/b&gt;</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">&lt;b&gt;Enter a name for this connection&lt;/b&gt;</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">&lt;b&gt;Editing a bookmark&lt;/b&gt;</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">&lt;b&gt;Connection options&lt;/b&gt;</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>




	-DVINAGRE_DATADIR=\""$(datadir)/vinagre"\"	\
	-DPACKAGE_LOCALE_DIR=\""$(datadir)/locale"\"	\
	$(VINAGRE_CFLAGS)				\
	$(AVAHI_CFLAGS)					\
	$(NULL)

bin_PROGRAMS = vinagre

	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)



vinagre_applet_CFLAGS =			\
	$(APPLET_CFLAGS)		\
	$(AVAHI_CFLAGS)			\
	$(NULL)

vinagre_applet_SOURCES =		\

	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)






#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,

  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, 

{
  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),


  gtk_container_add (GTK_CONTAINER (applet), image);
  gtk_widget_show_all (GTK_WIDGET (applet));
#ifdef AVAHI
  mdns = vinagre_mdns_get_default ();
#endif
  return TRUE;
}


Lines 22-28 Link Here

(-)vinagre-2.24.1/src/vinagre-connect.c (-3 / +12 lines)
22	#include <glib/gi18n.h>	22	#include <glib/gi18n.h>
23	#include <gtk/gtk.h>	23	#include <gtk/gtk.h>
24	#include <glade/glade.h>	24	#include <glade/glade.h>
25	#include <avahi-ui/avahi-ui.h>	25	#include <config.h>
		26	#ifdef AVAHI
		27	#include <avahi-ui/avahi-ui.h>
		28	#endif
26	#include <string.h>	29	#include <string.h>
27		30
28	#include "vinagre-connect.h"	31	#include "vinagre-connect.h"
Lines 34-40 Link Here
34	GladeXML *xml;	37	GladeXML *xml;
35	GtkWidget *dialog;	38	GtkWidget *dialog;
36	GtkWidget *host_entry;	39	GtkWidget *host_entry;
		40	#ifdef AVAHI
37	GtkWidget *find_button;	41	GtkWidget *find_button;
		42	#endif
38	GtkWidget *fullscreen_check;	43	GtkWidget *fullscreen_check;
39	GtkWidget *scaling_check;	44	GtkWidget *scaling_check;
40	GtkWidget *viewonly_check;	45	GtkWidget *viewonly_check;
Lines 174-179 Link Here
174	}	179	}
175	}	180	}
176		181
		182	#ifdef AVAHI
177	static void	183	static void
178	vinagre_connect_find_button_cb (GtkButton *button,	184	vinagre_connect_find_button_cb (GtkButton *button,
179	VinagreConnectDialog *dialog)	185	VinagreConnectDialog *dialog)
Lines 208-213 Link Here
208		214
209	gtk_widget_destroy (d);	215	gtk_widget_destroy (d);
210	}	216	}
		217	#endif
211		218
212	VinagreConnection vinagre_connect (VinagreWindow window)	219	VinagreConnection vinagre_connect (VinagreWindow window)
213	{	220	{
Lines 220-237 Link Here
220	gtk_window_set_transient_for (GTK_WINDOW (dialog.dialog), GTK_WINDOW (window));	227	gtk_window_set_transient_for (GTK_WINDOW (dialog.dialog), GTK_WINDOW (window));
221		228
222	dialog.host_entry = glade_xml_get_widget (dialog.xml, "host_entry");	229	dialog.host_entry = glade_xml_get_widget (dialog.xml, "host_entry");
		230	#ifdef AVAHI
223	dialog.find_button = glade_xml_get_widget (dialog.xml, "find_button");	231	dialog.find_button = glade_xml_get_widget (dialog.xml, "find_button");
		232	#endif
224	dialog.fullscreen_check = glade_xml_get_widget (dialog.xml, "fullscreen_check");	233	dialog.fullscreen_check = glade_xml_get_widget (dialog.xml, "fullscreen_check");
225	dialog.viewonly_check = glade_xml_get_widget (dialog.xml, "viewonly_check");	234	dialog.viewonly_check = glade_xml_get_widget (dialog.xml, "viewonly_check");
226	dialog.scaling_check = glade_xml_get_widget (dialog.xml, "scaling_check");	235	dialog.scaling_check = glade_xml_get_widget (dialog.xml, "scaling_check");
227		236
228	setup_combo (dialog.host_entry);	237	setup_combo (dialog.host_entry);
229		238	#ifdef AVAHI
230	g_signal_connect (dialog.find_button,	239	g_signal_connect (dialog.find_button,
231	"clicked",	240	"clicked",
232	G_CALLBACK (vinagre_connect_find_button_cb),	241	G_CALLBACK (vinagre_connect_find_button_cb),
233	&dialog);	242	&dialog);
234		243	#endif
235	gtk_widget_show_all (dialog.dialog);	244	gtk_widget_show_all (dialog.dialog);
236	result = gtk_dialog_run (GTK_DIALOG (dialog.dialog));	245	result = gtk_dialog_run (GTK_DIALOG (dialog.dialog));
237		246

Lines 26-32 Link Here

(-)vinagre-2.24.1/src/vinagre-fav.c (-2 / +7 lines)
26	#include "vinagre-fav.h"	26	#include "vinagre-fav.h"
27	#include "vinagre-utils.h"	27	#include "vinagre-utils.h"
28	#include "vinagre-bookmarks.h"	28	#include "vinagre-bookmarks.h"
29	#include "vinagre-mdns.h"	29	#ifdef AVAHI
		30	#include "vinagre-mdns.h"
		31	#endif
30	#include "vinagre-window-private.h"	32	#include "vinagre-window-private.h"
31	#include "gossip-cell-renderer-expander.h"	33	#include "gossip-cell-renderer-expander.h"
32		34
Lines 724-733 Link Here
724	"changed",	726	"changed",
725	G_CALLBACK (vinagre_fav_update_list),	727	G_CALLBACK (vinagre_fav_update_list),
726	fav);	728	fav);
		729	#ifdef AVAHI
727	g_signal_connect_swapped (vinagre_mdns_get_default (),	730	g_signal_connect_swapped (vinagre_mdns_get_default (),
728	"changed",	731	"changed",
729	G_CALLBACK (vinagre_fav_update_list),	732	G_CALLBACK (vinagre_fav_update_list),
730	fav);	733	fav);
		734	#endif
731	}	735	}
732		736
733	GtkWidget *	737	GtkWidget *
Lines 798-803 Link Here
798	gtk_tree_path_free (path);	802	gtk_tree_path_free (path);
799		803
800	/* avahi */	804	/* avahi */
		805	#ifdef AVAHI
801	list = vinagre_mdns_get_all (vinagre_mdns_get_default ());	806	list = vinagre_mdns_get_all (vinagre_mdns_get_default ());
802	if (!list)	807	if (!list)
803	return FALSE;	808	return FALSE;
Lines 841-847 Link Here
841	path = gtk_tree_path_new_from_string ("1");	846	path = gtk_tree_path_new_from_string ("1");
842	gtk_tree_view_expand_row (GTK_TREE_VIEW (fav->priv->tree), path, FALSE);	847	gtk_tree_view_expand_row (GTK_TREE_VIEW (fav->priv->tree), path, FALSE);
843	gtk_tree_path_free (path);	848	gtk_tree_path_free (path);
844		849	#endif
845	return FALSE;	850	return FALSE;
846	}	851	}
847	/* vim: set ts=8: */	852	/* vim: set ts=8: */

Lines 33-39 Link Here

(-)vinagre-2.24.1/src/vinagre-main.c (-1 / +5 lines)
33	#include "vinagre-app.h"	33	#include "vinagre-app.h"
34	#include "vinagre-utils.h"	34	#include "vinagre-utils.h"
35	#include "vinagre-prefs.h"	35	#include "vinagre-prefs.h"
36	#include "vinagre-mdns.h"	36	#ifdef AVAHI
		37	#include "vinagre-mdns.h"
		38	#endif
37	#include "vinagre-bacon.h"	39	#include "vinagre-bacon.h"
38	#include <vncdisplay.h>	40	#include <vncdisplay.h>
39		41
Lines 169-175 Link Here
169	gtk_main ();	171	gtk_main ();
170		172
171	g_object_unref (vinagre_bookmarks_get_default ());	173	g_object_unref (vinagre_bookmarks_get_default ());
		174	#ifdef AVAHI
172	g_object_unref (vinagre_mdns_get_default ());	175	g_object_unref (vinagre_mdns_get_default ());
		176	#endif
173	g_object_unref (vinagre_prefs_get_default ());	177	g_object_unref (vinagre_prefs_get_default ());
174		178
175	return 0;	179	return 0;




#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

Lines 565-571 Link Here

(-)vinagre-2.24.1/src/vinagre-window.c (-4 / +12 lines)
565	{	565	{
566	VinagreWindowPrivate *p = window->priv;	566	VinagreWindowPrivate *p = window->priv;
567	GList actions, l;	567	GList actions, l;
568	GSList favs, mdnss;	568	GSList *favs;
		569	#ifdef AVAHI
		570	GSList *mdnss;
		571	#endif
569	gint n, m, i;	572	gint n, m, i;
570	guint id;	573	guint id;
571		574
Lines 586-594 Link Here
586	g_list_free (actions);	589	g_list_free (actions);
587		590
588	favs = vinagre_bookmarks_get_all (vinagre_bookmarks_get_default ());	591	favs = vinagre_bookmarks_get_all (vinagre_bookmarks_get_default ());
589	mdnss = vinagre_mdns_get_all (vinagre_mdns_get_default ());
590	n = g_slist_length (favs);	592	n = g_slist_length (favs);
		593	#ifdef AVAHI
		594	mdnss = vinagre_mdns_get_all (vinagre_mdns_get_default ());
591	m = g_slist_length (mdnss);	595	m = g_slist_length (mdnss);
		596	#endif
592	i = 0;	597	i = 0;
593		598
594	id = (n > 0\|\|m > 0) ? gtk_ui_manager_new_merge_id (p->manager) : 0;	599	id = (n > 0\|\|m > 0) ? gtk_ui_manager_new_merge_id (p->manager) : 0;
Lines 642-647 Link Here
642	}	647	}
643		648
644	/* avahi */	649	/* avahi */
		650	#ifdef AVAHI
645	i = 0;	651	i = 0;
646	while (mdnss)	652	while (mdnss)
647	{	653	{
Lines 690-696 Link Here
690	mdnss = mdnss->next;	696	mdnss = mdnss->next;
691	i++;	697	i++;
692	}	698	}
693		699	#endif
694	p->bookmarks_list_menu_ui_id = id;	700	p->bookmarks_list_menu_ui_id = id;
695	}	701	}
696		702
Lines 1017-1026 Link Here
1017	"changed",	1023	"changed",
1018	G_CALLBACK (vinagre_window_update_bookmarks_list_menu),	1024	G_CALLBACK (vinagre_window_update_bookmarks_list_menu),
1019	window);	1025	window);
1020	g_signal_connect_swapped (vinagre_mdns_get_default (),	1026	#ifdef AVAHI
		1027	g_signal_connect_swapped (vinagre_mdns_get_default (),
1021	"changed",	1028	"changed",
1022	G_CALLBACK (vinagre_window_update_bookmarks_list_menu),	1029	G_CALLBACK (vinagre_window_update_bookmarks_list_menu),
1023	window);	1030	window);
		1031	#endif
1024		1032
1025	vinagre_window_init_clipboard (window);	1033	vinagre_window_init_clipboard (window);
1026	}	1034	}

Return to bug 243004

Lines 50-61 Link Here

(-)vinagre-2.24.1/configure.ac (-3 / +13 lines)
50	gconf-2.0 >= $GCONF_REQUIRED \	50	gconf-2.0 >= $GCONF_REQUIRED \
51	gthread-2.0 >= $GTHREAD_REQUIRED \	51	gthread-2.0 >= $GTHREAD_REQUIRED \
52	gnome-keyring-1 \	52	gnome-keyring-1 \
53	gtk-vnc-1.0 >= $GTK_VNC_REQUIRED \	53	gtk-vnc-1.0 >= $GTK_VNC_REQUIRED)
54	avahi-ui >= $AVAHI_REQUIRED \
55	avahi-gobject >= $AVAHI_REQUIRED)
56	AC_SUBST(VINAGRE_CFLAGS)	54	AC_SUBST(VINAGRE_CFLAGS)
57	AC_SUBST(VINAGRE_LIBS)	55	AC_SUBST(VINAGRE_LIBS)
58		56
		57	AC_ARG_ENABLE(avahi, [ --disable-avahi Disable avahi features],,enable_avahi=yes)
		58	if test "x$enable_avahi" = "xyes" ;
		59	then
		60	PKG_CHECK_MODULES(AVAHI,\
		61	avahi-ui >= $AVAHI_REQUIRED\
		62	avahi-gobject >= $AVAHI_REQUIRED)
		63	AC_SUBST(AVAHI_CFLAGS)
		64	AC_SUBST(AVAHI_LIBS)
		65	AC_DEFINE([AVAHI],[1],[We want avahi support])
		66	fi
		67	AM_CONDITIONAL(AVAHI, test "x$enable_avahi" = "xyes")
		68
59	PKG_CHECK_MODULES(APPLET, \	69	PKG_CHECK_MODULES(APPLET, \
60	libpanelapplet-2.0 >= $PANEL_REQUIRED_VERSION)	70	libpanelapplet-2.0 >= $PANEL_REQUIRED_VERSION)
61	AC_SUBST(APPLET_CFLAGS)	71	AC_SUBST(APPLET_CFLAGS)

Lines 15-20 Link Here

(-)vinagre-2.24.1/src/Makefile.am (-2 / +10 lines)
15	-DVINAGRE_DATADIR=\""$(datadir)/vinagre"\" \	15	-DVINAGRE_DATADIR=\""$(datadir)/vinagre"\" \
16	-DPACKAGE_LOCALE_DIR=\""$(datadir)/locale"\" \	16	-DPACKAGE_LOCALE_DIR=\""$(datadir)/locale"\" \
17	$(VINAGRE_CFLAGS) \	17	$(VINAGRE_CFLAGS) \
		18	$(AVAHI_CFLAGS) \
18	$(NULL)	19	$(NULL)
19		20
20	bin_PROGRAMS = vinagre	21	bin_PROGRAMS = vinagre
Lines 33-48 Link Here
33	vinagre-ui.h vinagre-window-private.h \	34	vinagre-ui.h vinagre-window-private.h \
34	vinagre-enums.h vinagre-enums.c \	35	vinagre-enums.h vinagre-enums.c \
35	gossip-cell-renderer-expander.c gossip-cell-renderer-expander.h \	36	gossip-cell-renderer-expander.c gossip-cell-renderer-expander.h \
36	vinagre-mdns.h vinagre-mdns.c \
37	vinagre-prefs.h vinagre-prefs.c \	37	vinagre-prefs.h vinagre-prefs.c \
38	bacon-message-connection.h bacon-message-connection.c \	38	bacon-message-connection.h bacon-message-connection.c \
39	vinagre-app.h vinagre-app.c \	39	vinagre-app.h vinagre-app.c \
40	vinagre-bacon.h vinagre-bacon.c \	40	vinagre-bacon.h vinagre-bacon.c \
41	$(NULL)	41	$(NULL)
		42	if AVAHI
		43	vinagre_SOURCES += vinagre-mdns.h vinagre-mdns.c
		44	endif
42		45
43	vinagre_LDADD = \	46	vinagre_LDADD = \
44	$(VINAGRE_LIBS) \	47	$(VINAGRE_LIBS) \
45	$(GTKVNC_LIBS) \	48	$(GTKVNC_LIBS) \
		49	$(AVAHI_LIBS) \
46	view/libview.la \	50	view/libview.la \
47	$(NULL)	51	$(NULL)
48		52
Lines 70-75 Link Here
70		74
71	vinagre_applet_CFLAGS = \	75	vinagre_applet_CFLAGS = \
72	$(APPLET_CFLAGS) \	76	$(APPLET_CFLAGS) \
		77	$(AVAHI_CFLAGS) \
73	$(NULL)	78	$(NULL)
74		79
75	vinagre_applet_SOURCES = \	80	vinagre_applet_SOURCES = \
Lines 78-89 Link Here
78	vinagre-connection.h vinagre-connection.c \	83	vinagre-connection.h vinagre-connection.c \
79	vinagre-utils.h vinagre-utils.c \	84	vinagre-utils.h vinagre-utils.c \
80	vinagre-enums.h vinagre-enums.c \	85	vinagre-enums.h vinagre-enums.c \
81	vinagre-mdns.h vinagre-mdns.c \
82	$(NULL)	86	$(NULL)
		87	if AVAHI
		88	vinagre_applet_SOURCES += vinagre-mdns.h vinagre-mdns.c
		89	endif
83		90
84	vinagre_applet_LDADD = \	91	vinagre_applet_LDADD = \
85	$(APPLET_LIBS) \	92	$(APPLET_LIBS) \
86	$(VINAGRE_LIBS) \	93	$(VINAGRE_LIBS) \
		94	$(AVAHI_LIBS) \
87	$(NULL)	95	$(NULL)
88		96
89		97

Lines 23-34 Link Here

(-)vinagre-2.24.1/src/vinagre-applet.c (-4 / +9 lines)
23	#include <gtk/gtk.h>	23	#include <gtk/gtk.h>
24	#include <panel-applet.h>	24	#include <panel-applet.h>
25	#include "vinagre-bookmarks.h"	25	#include "vinagre-bookmarks.h"
26	#include "vinagre-mdns.h"
27	#include "vinagre-utils.h"	26	#include "vinagre-utils.h"
28	#include "vinagre-connection.h"	27	#include "vinagre-connection.h"
29	#include "vinagre-commands.h"	28	#include "vinagre-commands.h"
30	#include <config.h>	29	#include <config.h>
31		30	#ifdef AVAHI
		31	#include "vinagre-mdns.h"
		32	#endif
32	static void	33	static void
33	menu_position (GtkMenu *menu,	34	menu_position (GtkMenu *menu,
34	gint *x,	35	gint *x,
Lines 173-180 Link Here
173	all = vinagre_bookmarks_get_all (vinagre_bookmarks_get_default ());	174	all = vinagre_bookmarks_get_all (vinagre_bookmarks_get_default ());
174	fill_menu (all, menu);	175	fill_menu (all, menu);
175		176
		177	#ifdef AVAHI
176	all = vinagre_mdns_get_all (vinagre_mdns_get_default ());	178	all = vinagre_mdns_get_all (vinagre_mdns_get_default ());
177	fill_menu (all, menu);	179	fill_menu (all, menu);
		180	#endif
178		181
179	gtk_widget_show_all (menu);	182	gtk_widget_show_all (menu);
180	gtk_menu_popup (GTK_MENU (menu), NULL, NULL, (GtkMenuPositionFunc) menu_position, applet,	183	gtk_menu_popup (GTK_MENU (menu), NULL, NULL, (GtkMenuPositionFunc) menu_position, applet,
Lines 205-211 Link Here
205	{	208	{
206	GtkWidget image, button;	209	GtkWidget image, button;
207	gchar *tmp;	210	gchar *tmp;
		211	#ifdef AVAHI
208	VinagreMdns *mdns;	212	VinagreMdns *mdns;
		213	#endif
209	static const BonoboUIVerb menu_verbs[] = {	214	static const BonoboUIVerb menu_verbs[] = {
210	BONOBO_UI_VERB ("VinagreHelp", help_cb),	215	BONOBO_UI_VERB ("VinagreHelp", help_cb),
211	BONOBO_UI_VERB ("VinagreAbout", about_cb),	216	BONOBO_UI_VERB ("VinagreAbout", about_cb),
Lines 237-245 Link Here
237		242
238	gtk_container_add (GTK_CONTAINER (applet), image);	243	gtk_container_add (GTK_CONTAINER (applet), image);
239	gtk_widget_show_all (GTK_WIDGET (applet));	244	gtk_widget_show_all (GTK_WIDGET (applet));
240		245	#ifdef AVAHI
241	mdns = vinagre_mdns_get_default ();	246	mdns = vinagre_mdns_get_default ();
242		247	#endif
243	return TRUE;	248	return TRUE;
244	}	249	}
245		250

Lines 23-34 Link Here

(-)vinagre-2.24.1/src/vinagre-utils.c (-1 / +5 lines)
23	#include <gtk/gtk.h>	23	#include <gtk/gtk.h>
24	#include "vinagre-utils.h"	24	#include "vinagre-utils.h"
25		25
26	#define VINAGRE_GLADE_FILE "vinagre.glade"
27	#define VINAGRE_UI_XML_FILE "vinagre-ui.xml"	26	#define VINAGRE_UI_XML_FILE "vinagre-ui.xml"
28		27
29	#ifdef HAVE_CONFIG_H	28	#ifdef HAVE_CONFIG_H
30	#include <config.h>	29	#include <config.h>
31	#endif	30	#endif
		31	#ifdef AVAHI
		32	#define VINAGRE_GLADE_FILE "vinagre.glade"
		33	#else
		34	#define VINAGRE_GLADE_FILE "vinagre-noavahi.glade"
		35	#endif
32		36
33	/* For the workspace/viewport stuff */	37	/* For the workspace/viewport stuff */
34	#ifdef GDK_WINDOWING_X11	38	#ifdef GDK_WINDOWING_X11