diff options
Diffstat (limited to 'projects/gvpndialer/trunk/src')
| -rw-r--r-- | projects/gvpndialer/trunk/src/.deps/callbacks.Po | 315 | ||||
| -rw-r--r-- | projects/gvpndialer/trunk/src/.deps/interface.Po | 281 | ||||
| -rw-r--r-- | projects/gvpndialer/trunk/src/.deps/main.Po | 299 | ||||
| -rw-r--r-- | projects/gvpndialer/trunk/src/.deps/support.Po | 247 | ||||
| -rw-r--r-- | projects/gvpndialer/trunk/src/callbacks.c | 2351 | ||||
| -rw-r--r-- | projects/gvpndialer/trunk/src/interface.c | 11 |
6 files changed, 2021 insertions, 1483 deletions
diff --git a/projects/gvpndialer/trunk/src/.deps/callbacks.Po b/projects/gvpndialer/trunk/src/.deps/callbacks.Po index dd97237..e719472 100644 --- a/projects/gvpndialer/trunk/src/.deps/callbacks.Po +++ b/projects/gvpndialer/trunk/src/.deps/callbacks.Po @@ -1,27 +1,33 @@ callbacks.o callbacks.o: callbacks.c ../config.h callbacks.h \ /usr/include/libgnomeui-2.0/gnome.h /usr/include/gtk-2.0/gtk/gtk.h \ - /usr/include/gtk-2.0/gdk/gdk.h /usr/include/gtk-2.0/gdk/gdkcolor.h \ - /usr/include/gtk-2.0/gdk/gdktypes.h /usr/include/glib-2.0/glib.h \ - /usr/include/glib-2.0/glib/galloca.h \ + /usr/include/gtk-2.0/gdk/gdk.h /usr/include/gtk-2.0/gdk/gdkcairo.h \ + /usr/include/gtk-2.0/gdk/gdkcolor.h /usr/include/cairo/cairo.h \ + /usr/include/cairo/cairo-features.h /usr/include/gtk-2.0/gdk/gdktypes.h \ + /usr/include/glib-2.0/glib.h /usr/include/glib-2.0/glib/galloca.h \ /usr/include/glib-2.0/glib/gtypes.h \ /usr/lib/glib-2.0/include/glibconfig.h \ /usr/include/glib-2.0/glib/gmacros.h \ - /usr/lib/gcc/i586-mandrake-linux-gnu/3.4.3/include/stddef.h \ - /usr/lib/gcc/i586-mandrake-linux-gnu/3.4.3/include/limits.h \ - /usr/lib/gcc/i586-mandrake-linux-gnu/3.4.3/include/syslimits.h \ + /usr/lib/gcc/i686-pc-linux-gnu/4.1.1/include/stddef.h \ + /usr/lib/gcc/i686-pc-linux-gnu/4.1.1/include/limits.h \ + /usr/lib/gcc/i686-pc-linux-gnu/4.1.1/include/syslimits.h \ /usr/include/limits.h /usr/include/features.h /usr/include/sys/cdefs.h \ - /usr/include/gnu/stubs.h /usr/include/bits/posix1_lim.h \ + /usr/include/bits/wordsize.h /usr/include/gnu/stubs.h \ + /usr/include/gnu/stubs-32.h /usr/include/bits/posix1_lim.h \ /usr/include/bits/local_lim.h /usr/include/linux/limits.h \ /usr/include/bits/posix2_lim.h \ - /usr/lib/gcc/i586-mandrake-linux-gnu/3.4.3/include/float.h \ + /usr/lib/gcc/i686-pc-linux-gnu/4.1.1/include/float.h \ /usr/include/glib-2.0/glib/garray.h \ /usr/include/glib-2.0/glib/gasyncqueue.h \ /usr/include/glib-2.0/glib/gthread.h \ /usr/include/glib-2.0/glib/gerror.h /usr/include/glib-2.0/glib/gquark.h \ /usr/include/glib-2.0/glib/gatomic.h \ /usr/include/glib-2.0/glib/gbacktrace.h \ - /usr/include/glib-2.0/glib/gcache.h /usr/include/glib-2.0/glib/glist.h \ - /usr/include/glib-2.0/glib/gmem.h \ + /usr/include/glib-2.0/glib/gbase64.h \ + /usr/include/glib-2.0/glib/gbookmarkfile.h /usr/include/time.h \ + /usr/include/bits/time.h /usr/include/bits/types.h \ + /usr/include/bits/typesizes.h /usr/include/glib-2.0/glib/gcache.h \ + /usr/include/glib-2.0/glib/glist.h /usr/include/glib-2.0/glib/gmem.h \ + /usr/include/glib-2.0/glib/gslice.h \ /usr/include/glib-2.0/glib/gcompletion.h \ /usr/include/glib-2.0/glib/gconvert.h \ /usr/include/glib-2.0/glib/gdataset.h \ @@ -33,8 +39,9 @@ callbacks.o callbacks.o: callbacks.c ../config.h callbacks.h \ /usr/include/glib-2.0/glib/gstring.h \ /usr/include/glib-2.0/glib/gunicode.h \ /usr/include/glib-2.0/glib/gutils.h \ - /usr/lib/gcc/i586-mandrake-linux-gnu/3.4.3/include/stdarg.h \ + /usr/lib/gcc/i686-pc-linux-gnu/4.1.1/include/stdarg.h \ /usr/include/glib-2.0/glib/gkeyfile.h \ + /usr/include/glib-2.0/glib/gmappedfile.h \ /usr/include/glib-2.0/glib/gmarkup.h \ /usr/include/glib-2.0/glib/gmessages.h \ /usr/include/glib-2.0/glib/gnode.h /usr/include/glib-2.0/glib/goption.h \ @@ -82,32 +89,31 @@ callbacks.o callbacks.o: callbacks.c ../config.h callbacks.h \ /usr/include/pango-1.0/pango/pango-tabs.h \ /usr/include/pango-1.0/pango/pango-renderer.h \ /usr/lib/gtk-2.0/include/gdkconfig.h \ - /usr/include/gtk-2.0/gdk/gdkcursor.h \ + /usr/include/gtk-2.0/gdk/gdkpixbuf.h /usr/include/gtk-2.0/gdk/gdkrgb.h \ /usr/include/gtk-2.0/gdk-pixbuf/gdk-pixbuf.h \ /usr/include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-features.h \ /usr/include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-core.h \ /usr/include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-transform.h \ /usr/include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-animation.h \ + /usr/include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-simple-anim.h \ /usr/include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-io.h /usr/include/stdio.h \ - /usr/include/bits/types.h /usr/include/bits/wordsize.h \ - /usr/include/bits/typesizes.h /usr/include/libio.h \ - /usr/include/_G_config.h /usr/include/wchar.h /usr/include/bits/wchar.h \ - /usr/include/gconv.h /usr/include/bits/stdio_lim.h \ - /usr/include/bits/sys_errlist.h /usr/include/bits/stdio.h \ - /usr/include/glib-2.0/gmodule.h \ + /usr/include/libio.h /usr/include/_G_config.h /usr/include/wchar.h \ + /usr/include/bits/wchar.h /usr/include/gconv.h \ + /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \ + /usr/include/bits/stdio.h /usr/include/glib-2.0/gmodule.h \ /usr/include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-loader.h \ /usr/include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-enum-types.h \ + /usr/include/pango-1.0/pango/pangocairo.h \ + /usr/include/gtk-2.0/gdk/gdkcursor.h \ /usr/include/gtk-2.0/gdk/gdkdisplay.h \ /usr/include/gtk-2.0/gdk/gdkevents.h /usr/include/gtk-2.0/gdk/gdkdnd.h \ /usr/include/gtk-2.0/gdk/gdkinput.h \ /usr/include/gtk-2.0/gdk/gdkdrawable.h /usr/include/gtk-2.0/gdk/gdkgc.h \ - /usr/include/gtk-2.0/gdk/gdkrgb.h \ /usr/include/gtk-2.0/gdk/gdkenumtypes.h \ /usr/include/gtk-2.0/gdk/gdkfont.h /usr/include/gtk-2.0/gdk/gdkimage.h \ /usr/include/gtk-2.0/gdk/gdkkeys.h \ /usr/include/gtk-2.0/gdk/gdkdisplaymanager.h \ /usr/include/gtk-2.0/gdk/gdkpango.h \ - /usr/include/gtk-2.0/gdk/gdkpixbuf.h \ /usr/include/gtk-2.0/gdk/gdkpixmap.h \ /usr/include/gtk-2.0/gdk/gdkproperty.h \ /usr/include/gtk-2.0/gdk/gdkregion.h \ @@ -147,6 +153,7 @@ callbacks.o callbacks.o: callbacks.c ../config.h callbacks.h \ /usr/include/atk-1.0/atk/atktext.h \ /usr/include/atk-1.0/atk/atkgobjectaccessible.h \ /usr/include/atk-1.0/atk/atkhyperlink.h \ + /usr/include/atk-1.0/atk/atkhyperlinkimpl.h \ /usr/include/atk-1.0/atk/atkhypertext.h \ /usr/include/atk-1.0/atk/atkimage.h \ /usr/include/atk-1.0/atk/atknoopobject.h \ @@ -166,8 +173,9 @@ callbacks.o callbacks.o: callbacks.c ../config.h callbacks.h \ /usr/include/gtk-2.0/gtk/gtkalignment.h \ /usr/include/gtk-2.0/gtk/gtkarrow.h \ /usr/include/gtk-2.0/gtk/gtkaspectframe.h \ - /usr/include/gtk-2.0/gtk/gtkframe.h /usr/include/gtk-2.0/gtk/gtkbbox.h \ - /usr/include/gtk-2.0/gtk/gtkbox.h \ + /usr/include/gtk-2.0/gtk/gtkframe.h \ + /usr/include/gtk-2.0/gtk/gtkassistant.h \ + /usr/include/gtk-2.0/gtk/gtkbbox.h /usr/include/gtk-2.0/gtk/gtkbox.h \ /usr/include/gtk-2.0/gtk/gtkbindings.h \ /usr/include/gtk-2.0/gtk/gtkbutton.h \ /usr/include/gtk-2.0/gtk/gtkimage.h \ @@ -180,10 +188,13 @@ callbacks.o callbacks.o: callbacks.c ../config.h callbacks.h \ /usr/include/gtk-2.0/gtk/gtktreeviewcolumn.h \ /usr/include/gtk-2.0/gtk/gtktreemodel.h \ /usr/include/gtk-2.0/gtk/gtktreesortable.h \ + /usr/include/gtk-2.0/gtk/gtkcellrendereraccel.h \ + /usr/include/gtk-2.0/gtk/gtkcellrenderertext.h \ /usr/include/gtk-2.0/gtk/gtkcellrenderercombo.h \ /usr/include/gtk-2.0/gtk/gtkcellrenderertext.h \ /usr/include/gtk-2.0/gtk/gtkcellrendererpixbuf.h \ /usr/include/gtk-2.0/gtk/gtkcellrendererprogress.h \ + /usr/include/gtk-2.0/gtk/gtkcellrendererspin.h \ /usr/include/gtk-2.0/gtk/gtkcellrenderertoggle.h \ /usr/include/gtk-2.0/gtk/gtkcellview.h \ /usr/include/gtk-2.0/gtk/gtkcheckbutton.h \ @@ -193,6 +204,9 @@ callbacks.o callbacks.o: callbacks.c ../config.h callbacks.h \ /usr/include/gtk-2.0/gtk/gtkitem.h \ /usr/include/gtk-2.0/gtk/gtkclipboard.h \ /usr/include/gtk-2.0/gtk/gtkselection.h \ + /usr/include/gtk-2.0/gtk/gtktextiter.h \ + /usr/include/gtk-2.0/gtk/gtktexttag.h \ + /usr/include/gtk-2.0/gtk/gtktextchild.h \ /usr/include/gtk-2.0/gtk/gtkclist.h \ /usr/include/gtk-2.0/gtk/gtkhscrollbar.h \ /usr/include/gtk-2.0/gtk/gtkscrollbar.h \ @@ -205,16 +219,15 @@ callbacks.o callbacks.o: callbacks.c ../config.h callbacks.h \ /usr/include/gtk-2.0/gtk/gtkcombo.h /usr/include/gtk-2.0/gtk/gtkhbox.h \ /usr/include/gtk-2.0/gtk/gtkcombobox.h \ /usr/include/gtk-2.0/gtk/gtktreeview.h \ - /usr/include/gtk-2.0/gtk/gtkdnd.h \ - /usr/include/gtk-2.0/gtk/gtkcomboboxentry.h \ - /usr/include/gtk-2.0/gtk/gtkctree.h /usr/include/gtk-2.0/gtk/gtkcurve.h \ - /usr/include/gtk-2.0/gtk/gtkdrawingarea.h \ + /usr/include/gtk-2.0/gtk/gtkdnd.h /usr/include/gtk-2.0/gtk/gtkentry.h \ /usr/include/gtk-2.0/gtk/gtkeditable.h \ - /usr/include/gtk-2.0/gtk/gtkentry.h \ /usr/include/gtk-2.0/gtk/gtkimcontext.h \ /usr/include/gtk-2.0/gtk/gtkentrycompletion.h \ /usr/include/gtk-2.0/gtk/gtkliststore.h \ /usr/include/gtk-2.0/gtk/gtktreemodelfilter.h \ + /usr/include/gtk-2.0/gtk/gtkcomboboxentry.h \ + /usr/include/gtk-2.0/gtk/gtkctree.h /usr/include/gtk-2.0/gtk/gtkcurve.h \ + /usr/include/gtk-2.0/gtk/gtkdrawingarea.h \ /usr/include/gtk-2.0/gtk/gtkeventbox.h \ /usr/include/gtk-2.0/gtk/gtkexpander.h \ /usr/include/gtk-2.0/gtk/gtkfilesel.h \ @@ -246,7 +259,9 @@ callbacks.o callbacks.o: callbacks.c ../config.h callbacks.h \ /usr/include/gtk-2.0/gtk/gtkimmulticontext.h \ /usr/include/gtk-2.0/gtk/gtkinputdialog.h \ /usr/include/gtk-2.0/gtk/gtkinvisible.h \ - /usr/include/gtk-2.0/gtk/gtklayout.h /usr/include/gtk-2.0/gtk/gtklist.h \ + /usr/include/gtk-2.0/gtk/gtklayout.h \ + /usr/include/gtk-2.0/gtk/gtklinkbutton.h \ + /usr/include/gtk-2.0/gtk/gtklist.h \ /usr/include/gtk-2.0/gtk/gtklistitem.h \ /usr/include/gtk-2.0/gtk/gtkmain.h \ /usr/include/gtk-2.0/gtk/gtkmenubar.h \ @@ -263,6 +278,14 @@ callbacks.o callbacks.o: callbacks.c ../config.h callbacks.h \ /usr/include/gtk-2.0/gtk/gtkpixmap.h /usr/include/gtk-2.0/gtk/gtkplug.h \ /usr/include/gtk-2.0/gtk/gtksocket.h \ /usr/include/gtk-2.0/gtk/gtkpreview.h \ + /usr/include/gtk-2.0/gtk/gtkprintoperation.h \ + /usr/include/gtk-2.0/gtk/gtkmain.h /usr/include/gtk-2.0/gtk/gtkenums.h \ + /usr/include/gtk-2.0/gtk/gtkwindow.h \ + /usr/include/gtk-2.0/gtk/gtkpagesetup.h \ + /usr/include/gtk-2.0/gtk/gtkpapersize.h \ + /usr/include/gtk-2.0/gtk/gtkprintsettings.h \ + /usr/include/gtk-2.0/gtk/gtkprintcontext.h \ + /usr/include/gtk-2.0/gtk/gtkprintoperationpreview.h \ /usr/include/gtk-2.0/gtk/gtkprogress.h \ /usr/include/gtk-2.0/gtk/gtkprogressbar.h \ /usr/include/gtk-2.0/gtk/gtkradioaction.h \ @@ -272,6 +295,15 @@ callbacks.o callbacks.o: callbacks.c ../config.h callbacks.h \ /usr/include/gtk-2.0/gtk/gtkradiotoolbutton.h \ /usr/include/gtk-2.0/gtk/gtktoggletoolbutton.h \ /usr/include/gtk-2.0/gtk/gtktoolbutton.h \ + /usr/include/gtk-2.0/gtk/gtkrecentchooser.h \ + /usr/include/gtk-2.0/gtk/gtkrecentmanager.h \ + /usr/include/gtk-2.0/gtk/gtkrecentfilter.h \ + /usr/include/gtk-2.0/gtk/gtkrecentchooserdialog.h \ + /usr/include/gtk-2.0/gtk/gtkrecentchooser.h \ + /usr/include/gtk-2.0/gtk/gtkrecentchoosermenu.h \ + /usr/include/gtk-2.0/gtk/gtkrecentchooserwidget.h \ + /usr/include/gtk-2.0/gtk/gtkrecentfilter.h \ + /usr/include/gtk-2.0/gtk/gtkrecentmanager.h \ /usr/include/gtk-2.0/gtk/gtkscrolledwindow.h \ /usr/include/gtk-2.0/gtk/gtkviewport.h \ /usr/include/gtk-2.0/gtk/gtkseparatormenuitem.h \ @@ -279,15 +311,14 @@ callbacks.o callbacks.o: callbacks.c ../config.h callbacks.h \ /usr/include/gtk-2.0/gtk/gtksizegroup.h \ /usr/include/gtk-2.0/gtk/gtkspinbutton.h \ /usr/include/gtk-2.0/gtk/gtkstatusbar.h \ + /usr/include/gtk-2.0/gtk/gtkstatusicon.h \ /usr/include/gtk-2.0/gtk/gtkstock.h /usr/include/gtk-2.0/gtk/gtktable.h \ /usr/include/gtk-2.0/gtk/gtktearoffmenuitem.h \ /usr/include/gtk-2.0/gtk/gtktext.h \ /usr/include/gtk-2.0/gtk/gtktextbuffer.h \ /usr/include/gtk-2.0/gtk/gtktexttagtable.h \ - /usr/include/gtk-2.0/gtk/gtktexttag.h \ - /usr/include/gtk-2.0/gtk/gtktextiter.h \ - /usr/include/gtk-2.0/gtk/gtktextchild.h \ /usr/include/gtk-2.0/gtk/gtktextmark.h \ + /usr/include/gtk-2.0/gtk/gtktextbufferrichtext.h \ /usr/include/gtk-2.0/gtk/gtktextview.h \ /usr/include/gtk-2.0/gtk/gtktipsquery.h \ /usr/include/gtk-2.0/gtk/gtktoggletoolbutton.h \ @@ -308,10 +339,10 @@ callbacks.o callbacks.o: callbacks.c ../config.h callbacks.h \ /usr/include/gtk-2.0/gtk/gtkvscale.h \ /usr/include/gtk-2.0/gtk/gtkvseparator.h \ /usr/include/libgnome-2.0/libgnome/libgnome.h \ - /usr/include/libgnome-2.0/libgnome/gnome-program.h /usr/include/popt.h \ - /usr/include/errno.h /usr/include/bits/errno.h \ - /usr/include/linux/errno.h /usr/include/asm/errno.h \ - /usr/include/asm-generic/errno.h /usr/include/asm-generic/errno-base.h \ + /usr/include/libgnome-2.0/libgnome/gnome-program.h /usr/include/errno.h \ + /usr/include/bits/errno.h /usr/include/linux/errno.h \ + /usr/include/asm/errno.h /usr/include/asm-generic/errno.h \ + /usr/include/asm-generic/errno-base.h /usr/include/popt.h \ /usr/include/libgnome-2.0/libgnome/gnome-i18n.h \ /usr/include/libbonobo-2.0/bonobo/bonobo-i18n.h /usr/include/libintl.h \ /usr/include/locale.h /usr/include/bits/locale.h \ @@ -323,22 +354,18 @@ callbacks.o callbacks.o: callbacks.c ../config.h callbacks.h \ /usr/include/libbonobo-2.0/bonobo/bonobo-macros.h \ /usr/include/libgnome-2.0/libgnome/gnome-triggers.h \ /usr/include/libgnome-2.0/libgnome/gnome-sound.h \ - /usr/include/libgnome-2.0/libgnome/gnome-score.h /usr/include/time.h \ - /usr/include/bits/time.h \ + /usr/include/libgnome-2.0/libgnome/gnome-score.h \ /usr/include/libgnome-2.0/libgnome/gnome-exec.h \ /usr/include/libgnome-2.0/libgnome/gnome-util.h /usr/include/stdlib.h \ /usr/include/sys/types.h /usr/include/endian.h \ /usr/include/bits/endian.h /usr/include/sys/select.h \ /usr/include/bits/select.h /usr/include/bits/sigset.h \ /usr/include/sys/sysmacros.h /usr/include/bits/pthreadtypes.h \ - /usr/include/bits/sched.h /usr/include/alloca.h \ - /usr/include/libgnome-2.0/libgnome/gnome-url.h \ + /usr/include/alloca.h /usr/include/libgnome-2.0/libgnome/gnome-url.h \ /usr/include/libgnomecanvas-2.0/libgnomecanvas/libgnomecanvas.h \ /usr/include/libgnomecanvas-2.0/libgnomecanvas/gnome-canvas.h \ /usr/include/libart-2.0/libart_lgpl/art_misc.h \ /usr/include/libart-2.0/libart_lgpl/art_config.h \ - /usr/include/multiarch-dispatch.h \ - /usr/include/multiarch-i386-linux/libart-2.0/libart_lgpl/art_config.h \ /usr/include/libart-2.0/libart_lgpl/art_rect.h \ /usr/include/libart-2.0/libart_lgpl/art_svp.h \ /usr/include/libart-2.0/libart_lgpl/art_point.h \ @@ -359,6 +386,9 @@ callbacks.o callbacks.o: callbacks.c ../config.h callbacks.h \ /usr/include/libgnomecanvas-2.0/libgnomecanvas/gnome-canvas-util.h \ /usr/include/libart-2.0/libart_lgpl/art_vpath.h \ /usr/include/libart-2.0/libart_lgpl/art_svp_vpath_stroke.h \ + /usr/include/libgnomecanvas-2.0/libgnomecanvas/gnome-canvas-clipgroup.h \ + /usr/include/libart-2.0/libart_lgpl/art_svp_wind.h \ + /usr/include/libart-2.0/libart_lgpl/art_vpath_dash.h \ /usr/include/libgnomeui-2.0/libgnomeui/libgnomeui.h \ /usr/include/libgnomeui-2.0/libgnomeui/gnome-uidefs.h \ /usr/include/gtk-2.0/gdk/gdkkeysyms.h \ @@ -389,9 +419,10 @@ callbacks.o callbacks.o: callbacks.c ../config.h callbacks.h \ /usr/include/libgnomeui-2.0/libgnomeui/gnome-icon-lookup.h \ /usr/include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-file-info.h \ /usr/include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-file-size.h \ - /usr/include/multiarch-i386-linux/gnome-vfs-2.0/libgnomevfs/gnome-vfs-file-size.h \ /usr/include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-result.h \ /usr/include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-uri.h \ + /usr/include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-acl.h \ + /usr/include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-ace.h \ /usr/include/sys/stat.h /usr/include/bits/stat.h \ /usr/include/libgnomeui-2.0/libgnomeui/gnome-stock-icons.h \ /usr/include/libgnomeui-2.0/libgnomeui/gnome-scores.h \ @@ -441,15 +472,15 @@ callbacks.o callbacks.o: callbacks.c ../config.h callbacks.h \ /usr/include/bits/fcntl.h /usr/include/sys/wait.h /usr/include/signal.h \ /usr/include/bits/signum.h /usr/include/bits/siginfo.h \ /usr/include/bits/sigaction.h /usr/include/bits/sigcontext.h \ - /usr/include/asm/sigcontext.h /usr/include/linux/compiler.h \ - /usr/include/bits/sigstack.h /usr/include/bits/sigthread.h \ - /usr/include/sys/resource.h /usr/include/bits/resource.h \ - /usr/include/bits/waitflags.h /usr/include/bits/waitstatus.h \ - /usr/include/pcre/pcre.h eggtrayicon.h /usr/include/gtk-2.0/gdk/gdkx.h \ - /usr/include/gtk-2.0/gdk/gdkprivate.h /usr/X11R6/include/X11/Xlib.h \ - /usr/X11R6/include/X11/X.h /usr/X11R6/include/X11/Xfuncproto.h \ - /usr/X11R6/include/X11/Xosdefs.h /usr/X11R6/include/X11/Xutil.h \ - interface.h support.h + /usr/include/asm/sigcontext.h /usr/include/bits/sigstack.h \ + /usr/include/bits/sigthread.h /usr/include/sys/resource.h \ + /usr/include/bits/resource.h /usr/include/bits/waitflags.h \ + /usr/include/bits/waitstatus.h /usr/include/pcre.h eggtrayicon.h \ + /usr/include/gtk-2.0/gdk/gdkx.h /usr/include/gtk-2.0/gdk/gdkprivate.h \ + /usr/include/X11/Xlib.h /usr/include/X11/X.h \ + /usr/include/X11/Xfuncproto.h /usr/include/X11/Xosdefs.h \ + /usr/include/X11/Xutil.h /usr/include/X11/keysym.h \ + /usr/include/X11/keysymdef.h interface.h support.h ../config.h: @@ -461,8 +492,14 @@ callbacks.h: /usr/include/gtk-2.0/gdk/gdk.h: +/usr/include/gtk-2.0/gdk/gdkcairo.h: + /usr/include/gtk-2.0/gdk/gdkcolor.h: +/usr/include/cairo/cairo.h: + +/usr/include/cairo/cairo-features.h: + /usr/include/gtk-2.0/gdk/gdktypes.h: /usr/include/glib-2.0/glib.h: @@ -475,11 +512,11 @@ callbacks.h: /usr/include/glib-2.0/glib/gmacros.h: -/usr/lib/gcc/i586-mandrake-linux-gnu/3.4.3/include/stddef.h: +/usr/lib/gcc/i686-pc-linux-gnu/4.1.1/include/stddef.h: -/usr/lib/gcc/i586-mandrake-linux-gnu/3.4.3/include/limits.h: +/usr/lib/gcc/i686-pc-linux-gnu/4.1.1/include/limits.h: -/usr/lib/gcc/i586-mandrake-linux-gnu/3.4.3/include/syslimits.h: +/usr/lib/gcc/i686-pc-linux-gnu/4.1.1/include/syslimits.h: /usr/include/limits.h: @@ -487,8 +524,12 @@ callbacks.h: /usr/include/sys/cdefs.h: +/usr/include/bits/wordsize.h: + /usr/include/gnu/stubs.h: +/usr/include/gnu/stubs-32.h: + /usr/include/bits/posix1_lim.h: /usr/include/bits/local_lim.h: @@ -497,7 +538,7 @@ callbacks.h: /usr/include/bits/posix2_lim.h: -/usr/lib/gcc/i586-mandrake-linux-gnu/3.4.3/include/float.h: +/usr/lib/gcc/i686-pc-linux-gnu/4.1.1/include/float.h: /usr/include/glib-2.0/glib/garray.h: @@ -513,12 +554,26 @@ callbacks.h: /usr/include/glib-2.0/glib/gbacktrace.h: +/usr/include/glib-2.0/glib/gbase64.h: + +/usr/include/glib-2.0/glib/gbookmarkfile.h: + +/usr/include/time.h: + +/usr/include/bits/time.h: + +/usr/include/bits/types.h: + +/usr/include/bits/typesizes.h: + /usr/include/glib-2.0/glib/gcache.h: /usr/include/glib-2.0/glib/glist.h: /usr/include/glib-2.0/glib/gmem.h: +/usr/include/glib-2.0/glib/gslice.h: + /usr/include/glib-2.0/glib/gcompletion.h: /usr/include/glib-2.0/glib/gconvert.h: @@ -547,10 +602,12 @@ callbacks.h: /usr/include/glib-2.0/glib/gutils.h: -/usr/lib/gcc/i586-mandrake-linux-gnu/3.4.3/include/stdarg.h: +/usr/lib/gcc/i686-pc-linux-gnu/4.1.1/include/stdarg.h: /usr/include/glib-2.0/glib/gkeyfile.h: +/usr/include/glib-2.0/glib/gmappedfile.h: + /usr/include/glib-2.0/glib/gmarkup.h: /usr/include/glib-2.0/glib/gmessages.h: @@ -655,7 +712,9 @@ callbacks.h: /usr/lib/gtk-2.0/include/gdkconfig.h: -/usr/include/gtk-2.0/gdk/gdkcursor.h: +/usr/include/gtk-2.0/gdk/gdkpixbuf.h: + +/usr/include/gtk-2.0/gdk/gdkrgb.h: /usr/include/gtk-2.0/gdk-pixbuf/gdk-pixbuf.h: @@ -667,16 +726,12 @@ callbacks.h: /usr/include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-animation.h: +/usr/include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-simple-anim.h: + /usr/include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-io.h: /usr/include/stdio.h: -/usr/include/bits/types.h: - -/usr/include/bits/wordsize.h: - -/usr/include/bits/typesizes.h: - /usr/include/libio.h: /usr/include/_G_config.h: @@ -699,6 +754,10 @@ callbacks.h: /usr/include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-enum-types.h: +/usr/include/pango-1.0/pango/pangocairo.h: + +/usr/include/gtk-2.0/gdk/gdkcursor.h: + /usr/include/gtk-2.0/gdk/gdkdisplay.h: /usr/include/gtk-2.0/gdk/gdkevents.h: @@ -711,8 +770,6 @@ callbacks.h: /usr/include/gtk-2.0/gdk/gdkgc.h: -/usr/include/gtk-2.0/gdk/gdkrgb.h: - /usr/include/gtk-2.0/gdk/gdkenumtypes.h: /usr/include/gtk-2.0/gdk/gdkfont.h: @@ -725,8 +782,6 @@ callbacks.h: /usr/include/gtk-2.0/gdk/gdkpango.h: -/usr/include/gtk-2.0/gdk/gdkpixbuf.h: - /usr/include/gtk-2.0/gdk/gdkpixmap.h: /usr/include/gtk-2.0/gdk/gdkproperty.h: @@ -813,6 +868,8 @@ callbacks.h: /usr/include/atk-1.0/atk/atkhyperlink.h: +/usr/include/atk-1.0/atk/atkhyperlinkimpl.h: + /usr/include/atk-1.0/atk/atkhypertext.h: /usr/include/atk-1.0/atk/atkimage.h: @@ -855,6 +912,8 @@ callbacks.h: /usr/include/gtk-2.0/gtk/gtkframe.h: +/usr/include/gtk-2.0/gtk/gtkassistant.h: + /usr/include/gtk-2.0/gtk/gtkbbox.h: /usr/include/gtk-2.0/gtk/gtkbox.h: @@ -883,6 +942,10 @@ callbacks.h: /usr/include/gtk-2.0/gtk/gtktreesortable.h: +/usr/include/gtk-2.0/gtk/gtkcellrendereraccel.h: + +/usr/include/gtk-2.0/gtk/gtkcellrenderertext.h: + /usr/include/gtk-2.0/gtk/gtkcellrenderercombo.h: /usr/include/gtk-2.0/gtk/gtkcellrenderertext.h: @@ -891,6 +954,8 @@ callbacks.h: /usr/include/gtk-2.0/gtk/gtkcellrendererprogress.h: +/usr/include/gtk-2.0/gtk/gtkcellrendererspin.h: + /usr/include/gtk-2.0/gtk/gtkcellrenderertoggle.h: /usr/include/gtk-2.0/gtk/gtkcellview.h: @@ -909,6 +974,12 @@ callbacks.h: /usr/include/gtk-2.0/gtk/gtkselection.h: +/usr/include/gtk-2.0/gtk/gtktextiter.h: + +/usr/include/gtk-2.0/gtk/gtktexttag.h: + +/usr/include/gtk-2.0/gtk/gtktextchild.h: + /usr/include/gtk-2.0/gtk/gtkclist.h: /usr/include/gtk-2.0/gtk/gtkhscrollbar.h: @@ -937,18 +1008,10 @@ callbacks.h: /usr/include/gtk-2.0/gtk/gtkdnd.h: -/usr/include/gtk-2.0/gtk/gtkcomboboxentry.h: - -/usr/include/gtk-2.0/gtk/gtkctree.h: - -/usr/include/gtk-2.0/gtk/gtkcurve.h: - -/usr/include/gtk-2.0/gtk/gtkdrawingarea.h: +/usr/include/gtk-2.0/gtk/gtkentry.h: /usr/include/gtk-2.0/gtk/gtkeditable.h: -/usr/include/gtk-2.0/gtk/gtkentry.h: - /usr/include/gtk-2.0/gtk/gtkimcontext.h: /usr/include/gtk-2.0/gtk/gtkentrycompletion.h: @@ -957,6 +1020,14 @@ callbacks.h: /usr/include/gtk-2.0/gtk/gtktreemodelfilter.h: +/usr/include/gtk-2.0/gtk/gtkcomboboxentry.h: + +/usr/include/gtk-2.0/gtk/gtkctree.h: + +/usr/include/gtk-2.0/gtk/gtkcurve.h: + +/usr/include/gtk-2.0/gtk/gtkdrawingarea.h: + /usr/include/gtk-2.0/gtk/gtkeventbox.h: /usr/include/gtk-2.0/gtk/gtkexpander.h: @@ -1023,6 +1094,8 @@ callbacks.h: /usr/include/gtk-2.0/gtk/gtklayout.h: +/usr/include/gtk-2.0/gtk/gtklinkbutton.h: + /usr/include/gtk-2.0/gtk/gtklist.h: /usr/include/gtk-2.0/gtk/gtklistitem.h: @@ -1059,6 +1132,24 @@ callbacks.h: /usr/include/gtk-2.0/gtk/gtkpreview.h: +/usr/include/gtk-2.0/gtk/gtkprintoperation.h: + +/usr/include/gtk-2.0/gtk/gtkmain.h: + +/usr/include/gtk-2.0/gtk/gtkenums.h: + +/usr/include/gtk-2.0/gtk/gtkwindow.h: + +/usr/include/gtk-2.0/gtk/gtkpagesetup.h: + +/usr/include/gtk-2.0/gtk/gtkpapersize.h: + +/usr/include/gtk-2.0/gtk/gtkprintsettings.h: + +/usr/include/gtk-2.0/gtk/gtkprintcontext.h: + +/usr/include/gtk-2.0/gtk/gtkprintoperationpreview.h: + /usr/include/gtk-2.0/gtk/gtkprogress.h: /usr/include/gtk-2.0/gtk/gtkprogressbar.h: @@ -1077,6 +1168,24 @@ callbacks.h: /usr/include/gtk-2.0/gtk/gtktoolbutton.h: +/usr/include/gtk-2.0/gtk/gtkrecentchooser.h: + +/usr/include/gtk-2.0/gtk/gtkrecentmanager.h: + +/usr/include/gtk-2.0/gtk/gtkrecentfilter.h: + +/usr/include/gtk-2.0/gtk/gtkrecentchooserdialog.h: + +/usr/include/gtk-2.0/gtk/gtkrecentchooser.h: + +/usr/include/gtk-2.0/gtk/gtkrecentchoosermenu.h: + +/usr/include/gtk-2.0/gtk/gtkrecentchooserwidget.h: + +/usr/include/gtk-2.0/gtk/gtkrecentfilter.h: + +/usr/include/gtk-2.0/gtk/gtkrecentmanager.h: + /usr/include/gtk-2.0/gtk/gtkscrolledwindow.h: /usr/include/gtk-2.0/gtk/gtkviewport.h: @@ -1091,6 +1200,8 @@ callbacks.h: /usr/include/gtk-2.0/gtk/gtkstatusbar.h: +/usr/include/gtk-2.0/gtk/gtkstatusicon.h: + /usr/include/gtk-2.0/gtk/gtkstock.h: /usr/include/gtk-2.0/gtk/gtktable.h: @@ -1103,14 +1214,10 @@ callbacks.h: /usr/include/gtk-2.0/gtk/gtktexttagtable.h: -/usr/include/gtk-2.0/gtk/gtktexttag.h: - -/usr/include/gtk-2.0/gtk/gtktextiter.h: - -/usr/include/gtk-2.0/gtk/gtktextchild.h: - /usr/include/gtk-2.0/gtk/gtktextmark.h: +/usr/include/gtk-2.0/gtk/gtktextbufferrichtext.h: + /usr/include/gtk-2.0/gtk/gtktextview.h: /usr/include/gtk-2.0/gtk/gtktipsquery.h: @@ -1153,8 +1260,6 @@ callbacks.h: /usr/include/libgnome-2.0/libgnome/gnome-program.h: -/usr/include/popt.h: - /usr/include/errno.h: /usr/include/bits/errno.h: @@ -1167,6 +1272,8 @@ callbacks.h: /usr/include/asm-generic/errno-base.h: +/usr/include/popt.h: + /usr/include/libgnome-2.0/libgnome/gnome-i18n.h: /usr/include/libbonobo-2.0/bonobo/bonobo-i18n.h: @@ -1195,10 +1302,6 @@ callbacks.h: /usr/include/libgnome-2.0/libgnome/gnome-score.h: -/usr/include/time.h: - -/usr/include/bits/time.h: - /usr/include/libgnome-2.0/libgnome/gnome-exec.h: /usr/include/libgnome-2.0/libgnome/gnome-util.h: @@ -1221,8 +1324,6 @@ callbacks.h: /usr/include/bits/pthreadtypes.h: -/usr/include/bits/sched.h: - /usr/include/alloca.h: /usr/include/libgnome-2.0/libgnome/gnome-url.h: @@ -1235,10 +1336,6 @@ callbacks.h: /usr/include/libart-2.0/libart_lgpl/art_config.h: -/usr/include/multiarch-dispatch.h: - -/usr/include/multiarch-i386-linux/libart-2.0/libart_lgpl/art_config.h: - /usr/include/libart-2.0/libart_lgpl/art_rect.h: /usr/include/libart-2.0/libart_lgpl/art_svp.h: @@ -1279,6 +1376,12 @@ callbacks.h: /usr/include/libart-2.0/libart_lgpl/art_svp_vpath_stroke.h: +/usr/include/libgnomecanvas-2.0/libgnomecanvas/gnome-canvas-clipgroup.h: + +/usr/include/libart-2.0/libart_lgpl/art_svp_wind.h: + +/usr/include/libart-2.0/libart_lgpl/art_vpath_dash.h: + /usr/include/libgnomeui-2.0/libgnomeui/libgnomeui.h: /usr/include/libgnomeui-2.0/libgnomeui/gnome-uidefs.h: @@ -1339,12 +1442,14 @@ callbacks.h: /usr/include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-file-size.h: -/usr/include/multiarch-i386-linux/gnome-vfs-2.0/libgnomevfs/gnome-vfs-file-size.h: - /usr/include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-result.h: /usr/include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-uri.h: +/usr/include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-acl.h: + +/usr/include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-ace.h: + /usr/include/sys/stat.h: /usr/include/bits/stat.h: @@ -1463,8 +1568,6 @@ callbacks.h: /usr/include/asm/sigcontext.h: -/usr/include/linux/compiler.h: - /usr/include/bits/sigstack.h: /usr/include/bits/sigthread.h: @@ -1477,7 +1580,7 @@ callbacks.h: /usr/include/bits/waitstatus.h: -/usr/include/pcre/pcre.h: +/usr/include/pcre.h: eggtrayicon.h: @@ -1485,15 +1588,19 @@ eggtrayicon.h: /usr/include/gtk-2.0/gdk/gdkprivate.h: -/usr/X11R6/include/X11/Xlib.h: +/usr/include/X11/Xlib.h: + +/usr/include/X11/X.h: + +/usr/include/X11/Xfuncproto.h: -/usr/X11R6/include/X11/X.h: +/usr/include/X11/Xosdefs.h: -/usr/X11R6/include/X11/Xfuncproto.h: +/usr/include/X11/Xutil.h: -/usr/X11R6/include/X11/Xosdefs.h: +/usr/include/X11/keysym.h: -/usr/X11R6/include/X11/Xutil.h: +/usr/include/X11/keysymdef.h: interface.h: diff --git a/projects/gvpndialer/trunk/src/.deps/interface.Po b/projects/gvpndialer/trunk/src/.deps/interface.Po index 1845bb4..d96ff90 100644 --- a/projects/gvpndialer/trunk/src/.deps/interface.Po +++ b/projects/gvpndialer/trunk/src/.deps/interface.Po @@ -1,20 +1,20 @@ interface.o interface.o: interface.c ../config.h /usr/include/sys/types.h \ /usr/include/features.h /usr/include/sys/cdefs.h \ - /usr/include/gnu/stubs.h /usr/include/bits/types.h \ - /usr/include/bits/wordsize.h \ - /usr/lib/gcc/i586-mandrake-linux-gnu/3.4.3/include/stddef.h \ + /usr/include/bits/wordsize.h /usr/include/gnu/stubs.h \ + /usr/include/gnu/stubs-32.h /usr/include/bits/types.h \ + /usr/lib/gcc/i686-pc-linux-gnu/4.1.1/include/stddef.h \ /usr/include/bits/typesizes.h /usr/include/time.h /usr/include/endian.h \ /usr/include/bits/endian.h /usr/include/sys/select.h \ /usr/include/bits/select.h /usr/include/bits/sigset.h \ /usr/include/bits/time.h /usr/include/sys/sysmacros.h \ - /usr/include/bits/pthreadtypes.h /usr/include/bits/sched.h \ - /usr/include/sys/stat.h /usr/include/bits/stat.h /usr/include/unistd.h \ + /usr/include/bits/pthreadtypes.h /usr/include/sys/stat.h \ + /usr/include/bits/stat.h /usr/include/unistd.h \ /usr/include/bits/posix_opt.h /usr/include/bits/confname.h \ /usr/include/getopt.h /usr/include/string.h /usr/include/bits/string.h \ /usr/include/bits/string2.h /usr/include/stdlib.h /usr/include/stdio.h \ /usr/include/libio.h /usr/include/_G_config.h /usr/include/wchar.h \ /usr/include/bits/wchar.h /usr/include/gconv.h \ - /usr/lib/gcc/i586-mandrake-linux-gnu/3.4.3/include/stdarg.h \ + /usr/lib/gcc/i686-pc-linux-gnu/4.1.1/include/stdarg.h \ /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \ /usr/include/bits/stdio.h /usr/include/libbonoboui-2.0/bonobo.h \ /usr/include/libbonoboui-2.0/libbonoboui.h \ @@ -28,20 +28,22 @@ interface.o interface.o: interface.c ../config.h /usr/include/sys/types.h \ /usr/include/glib-2.0/glib/galloca.h \ /usr/include/glib-2.0/glib/gtypes.h \ /usr/lib/glib-2.0/include/glibconfig.h \ - /usr/lib/gcc/i586-mandrake-linux-gnu/3.4.3/include/limits.h \ - /usr/lib/gcc/i586-mandrake-linux-gnu/3.4.3/include/syslimits.h \ + /usr/lib/gcc/i686-pc-linux-gnu/4.1.1/include/limits.h \ + /usr/lib/gcc/i686-pc-linux-gnu/4.1.1/include/syslimits.h \ /usr/include/limits.h /usr/include/bits/posix1_lim.h \ /usr/include/bits/local_lim.h /usr/include/linux/limits.h \ /usr/include/bits/posix2_lim.h \ - /usr/lib/gcc/i586-mandrake-linux-gnu/3.4.3/include/float.h \ + /usr/lib/gcc/i686-pc-linux-gnu/4.1.1/include/float.h \ /usr/include/glib-2.0/glib/garray.h \ /usr/include/glib-2.0/glib/gasyncqueue.h \ /usr/include/glib-2.0/glib/gthread.h \ /usr/include/glib-2.0/glib/gerror.h /usr/include/glib-2.0/glib/gquark.h \ /usr/include/glib-2.0/glib/gatomic.h \ /usr/include/glib-2.0/glib/gbacktrace.h \ + /usr/include/glib-2.0/glib/gbase64.h \ + /usr/include/glib-2.0/glib/gbookmarkfile.h \ /usr/include/glib-2.0/glib/gcache.h /usr/include/glib-2.0/glib/glist.h \ - /usr/include/glib-2.0/glib/gmem.h \ + /usr/include/glib-2.0/glib/gmem.h /usr/include/glib-2.0/glib/gslice.h \ /usr/include/glib-2.0/glib/gcompletion.h \ /usr/include/glib-2.0/glib/gconvert.h \ /usr/include/glib-2.0/glib/gdataset.h \ @@ -54,6 +56,7 @@ interface.o interface.o: interface.c ../config.h /usr/include/sys/types.h \ /usr/include/glib-2.0/glib/gunicode.h \ /usr/include/glib-2.0/glib/gutils.h \ /usr/include/glib-2.0/glib/gkeyfile.h \ + /usr/include/glib-2.0/glib/gmappedfile.h \ /usr/include/glib-2.0/glib/gmarkup.h \ /usr/include/glib-2.0/glib/gmessages.h \ /usr/include/glib-2.0/glib/gnode.h /usr/include/glib-2.0/glib/goption.h \ @@ -85,8 +88,6 @@ interface.o interface.o: interface.c ../config.h /usr/include/sys/types.h \ /usr/include/orbit-2.0/orbit/orbit-types.h \ /usr/include/orbit-2.0/orbit/util/orbit-util.h \ /usr/include/orbit-2.0/orbit/orbit-config.h \ - /usr/include/multiarch-dispatch.h \ - /usr/include/multiarch-i386-linux/orbit-2.0/orbit/orbit-config.h \ /usr/include/orbit-2.0/orbit/util/basic_types.h \ /usr/include/orbit-2.0/orbit/util/orbit-genrand.h \ /usr/include/orbit-2.0/orbit/orb-core/orb-core-types.h \ @@ -140,7 +141,9 @@ interface.o interface.o: interface.c ../config.h /usr/include/sys/types.h \ /usr/include/libbonobo-2.0/bonobo/bonobo-context.h \ /usr/include/libbonobo-2.0/bonobo/bonobo-exception.h \ /usr/include/libbonobo-2.0/bonobo/bonobo-item-container.h \ + /usr/include/libbonobo-2.0/bonobo/bonobo-item-handler.h \ /usr/include/libbonobo-2.0/bonobo/bonobo-moniker-util.h \ + /usr/include/libbonobo-2.0/bonobo/bonobo-moniker-extender.h \ /usr/include/libbonobo-2.0/bonobo/bonobo-property-bag.h \ /usr/include/libbonobo-2.0/bonobo/bonobo-event-source.h \ /usr/include/libbonobo-2.0/bonobo/bonobo-listener.h \ @@ -148,6 +151,7 @@ interface.o interface.o: interface.c ../config.h /usr/include/sys/types.h \ /usr/include/libbonobo-2.0/bonobo/bonobo-generic-factory.h \ /usr/include/libbonobo-2.0/bonobo/bonobo-i18n.h /usr/include/libintl.h \ /usr/include/locale.h /usr/include/bits/locale.h \ + /usr/include/libbonobo-2.0/bonobo/bonobo-shlib-factory.h \ /usr/include/libbonobo-2.0/bonobo/bonobo-main.h \ /usr/include/libbonobo-2.0/bonobo/bonobo-stream.h \ /usr/include/libbonobo-2.0/bonobo/bonobo-storage.h \ @@ -161,7 +165,9 @@ interface.o interface.o: interface.c ../config.h /usr/include/sys/types.h \ /usr/include/libbonobo-2.0/bonobo/bonobo-app-client.h \ /usr/include/libbonoboui-2.0/bonobo/bonobo-widget.h \ /usr/include/gtk-2.0/gtk/gtkbin.h /usr/include/gtk-2.0/gdk/gdk.h \ - /usr/include/gtk-2.0/gdk/gdkcolor.h /usr/include/gtk-2.0/gdk/gdktypes.h \ + /usr/include/gtk-2.0/gdk/gdkcairo.h /usr/include/gtk-2.0/gdk/gdkcolor.h \ + /usr/include/cairo/cairo.h /usr/include/cairo/cairo-features.h \ + /usr/include/gtk-2.0/gdk/gdktypes.h \ /usr/include/pango-1.0/pango/pango.h \ /usr/include/pango-1.0/pango/pango-attributes.h \ /usr/include/pango-1.0/pango/pango-font.h \ @@ -181,27 +187,28 @@ interface.o interface.o: interface.c ../config.h /usr/include/sys/types.h \ /usr/include/pango-1.0/pango/pango-tabs.h \ /usr/include/pango-1.0/pango/pango-renderer.h \ /usr/lib/gtk-2.0/include/gdkconfig.h \ - /usr/include/gtk-2.0/gdk/gdkcursor.h \ + /usr/include/gtk-2.0/gdk/gdkpixbuf.h /usr/include/gtk-2.0/gdk/gdkrgb.h \ /usr/include/gtk-2.0/gdk-pixbuf/gdk-pixbuf.h \ /usr/include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-features.h \ /usr/include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-core.h \ /usr/include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-transform.h \ /usr/include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-animation.h \ + /usr/include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-simple-anim.h \ /usr/include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-io.h \ /usr/include/glib-2.0/gmodule.h \ /usr/include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-loader.h \ /usr/include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-enum-types.h \ + /usr/include/pango-1.0/pango/pangocairo.h \ + /usr/include/gtk-2.0/gdk/gdkcursor.h \ /usr/include/gtk-2.0/gdk/gdkdisplay.h \ /usr/include/gtk-2.0/gdk/gdkevents.h /usr/include/gtk-2.0/gdk/gdkdnd.h \ /usr/include/gtk-2.0/gdk/gdkinput.h \ /usr/include/gtk-2.0/gdk/gdkdrawable.h /usr/include/gtk-2.0/gdk/gdkgc.h \ - /usr/include/gtk-2.0/gdk/gdkrgb.h \ /usr/include/gtk-2.0/gdk/gdkenumtypes.h \ /usr/include/gtk-2.0/gdk/gdkfont.h /usr/include/gtk-2.0/gdk/gdkimage.h \ /usr/include/gtk-2.0/gdk/gdkkeys.h \ /usr/include/gtk-2.0/gdk/gdkdisplaymanager.h \ /usr/include/gtk-2.0/gdk/gdkpango.h \ - /usr/include/gtk-2.0/gdk/gdkpixbuf.h \ /usr/include/gtk-2.0/gdk/gdkpixmap.h \ /usr/include/gtk-2.0/gdk/gdkproperty.h \ /usr/include/gtk-2.0/gdk/gdkregion.h \ @@ -261,6 +268,7 @@ interface.o interface.o: interface.c ../config.h /usr/include/sys/types.h \ /usr/include/atk-1.0/atk/atktext.h \ /usr/include/atk-1.0/atk/atkgobjectaccessible.h \ /usr/include/atk-1.0/atk/atkhyperlink.h \ + /usr/include/atk-1.0/atk/atkhyperlinkimpl.h \ /usr/include/atk-1.0/atk/atkhypertext.h \ /usr/include/atk-1.0/atk/atkimage.h \ /usr/include/atk-1.0/atk/atknoopobject.h \ @@ -280,8 +288,9 @@ interface.o interface.o: interface.c ../config.h /usr/include/sys/types.h \ /usr/include/gtk-2.0/gtk/gtkalignment.h \ /usr/include/gtk-2.0/gtk/gtkarrow.h \ /usr/include/gtk-2.0/gtk/gtkaspectframe.h \ - /usr/include/gtk-2.0/gtk/gtkframe.h /usr/include/gtk-2.0/gtk/gtkbbox.h \ - /usr/include/gtk-2.0/gtk/gtkbox.h \ + /usr/include/gtk-2.0/gtk/gtkframe.h \ + /usr/include/gtk-2.0/gtk/gtkassistant.h \ + /usr/include/gtk-2.0/gtk/gtkbbox.h /usr/include/gtk-2.0/gtk/gtkbox.h \ /usr/include/gtk-2.0/gtk/gtkbindings.h \ /usr/include/gtk-2.0/gtk/gtkbutton.h \ /usr/include/gtk-2.0/gtk/gtkimage.h \ @@ -294,10 +303,13 @@ interface.o interface.o: interface.c ../config.h /usr/include/sys/types.h \ /usr/include/gtk-2.0/gtk/gtktreeviewcolumn.h \ /usr/include/gtk-2.0/gtk/gtktreemodel.h \ /usr/include/gtk-2.0/gtk/gtktreesortable.h \ + /usr/include/gtk-2.0/gtk/gtkcellrendereraccel.h \ + /usr/include/gtk-2.0/gtk/gtkcellrenderertext.h \ /usr/include/gtk-2.0/gtk/gtkcellrenderercombo.h \ /usr/include/gtk-2.0/gtk/gtkcellrenderertext.h \ /usr/include/gtk-2.0/gtk/gtkcellrendererpixbuf.h \ /usr/include/gtk-2.0/gtk/gtkcellrendererprogress.h \ + /usr/include/gtk-2.0/gtk/gtkcellrendererspin.h \ /usr/include/gtk-2.0/gtk/gtkcellrenderertoggle.h \ /usr/include/gtk-2.0/gtk/gtkcellview.h \ /usr/include/gtk-2.0/gtk/gtkcheckbutton.h \ @@ -307,6 +319,9 @@ interface.o interface.o: interface.c ../config.h /usr/include/sys/types.h \ /usr/include/gtk-2.0/gtk/gtkitem.h \ /usr/include/gtk-2.0/gtk/gtkclipboard.h \ /usr/include/gtk-2.0/gtk/gtkselection.h \ + /usr/include/gtk-2.0/gtk/gtktextiter.h \ + /usr/include/gtk-2.0/gtk/gtktexttag.h \ + /usr/include/gtk-2.0/gtk/gtktextchild.h \ /usr/include/gtk-2.0/gtk/gtkclist.h \ /usr/include/gtk-2.0/gtk/gtkhscrollbar.h \ /usr/include/gtk-2.0/gtk/gtkscrollbar.h \ @@ -319,16 +334,15 @@ interface.o interface.o: interface.c ../config.h /usr/include/sys/types.h \ /usr/include/gtk-2.0/gtk/gtkcombo.h /usr/include/gtk-2.0/gtk/gtkhbox.h \ /usr/include/gtk-2.0/gtk/gtkcombobox.h \ /usr/include/gtk-2.0/gtk/gtktreeview.h \ - /usr/include/gtk-2.0/gtk/gtkdnd.h \ - /usr/include/gtk-2.0/gtk/gtkcomboboxentry.h \ - /usr/include/gtk-2.0/gtk/gtkctree.h /usr/include/gtk-2.0/gtk/gtkcurve.h \ - /usr/include/gtk-2.0/gtk/gtkdrawingarea.h \ + /usr/include/gtk-2.0/gtk/gtkdnd.h /usr/include/gtk-2.0/gtk/gtkentry.h \ /usr/include/gtk-2.0/gtk/gtkeditable.h \ - /usr/include/gtk-2.0/gtk/gtkentry.h \ /usr/include/gtk-2.0/gtk/gtkimcontext.h \ /usr/include/gtk-2.0/gtk/gtkentrycompletion.h \ /usr/include/gtk-2.0/gtk/gtkliststore.h \ /usr/include/gtk-2.0/gtk/gtktreemodelfilter.h \ + /usr/include/gtk-2.0/gtk/gtkcomboboxentry.h \ + /usr/include/gtk-2.0/gtk/gtkctree.h /usr/include/gtk-2.0/gtk/gtkcurve.h \ + /usr/include/gtk-2.0/gtk/gtkdrawingarea.h \ /usr/include/gtk-2.0/gtk/gtkeventbox.h \ /usr/include/gtk-2.0/gtk/gtkexpander.h \ /usr/include/gtk-2.0/gtk/gtkfilesel.h \ @@ -360,7 +374,9 @@ interface.o interface.o: interface.c ../config.h /usr/include/sys/types.h \ /usr/include/gtk-2.0/gtk/gtkimmulticontext.h \ /usr/include/gtk-2.0/gtk/gtkinputdialog.h \ /usr/include/gtk-2.0/gtk/gtkinvisible.h \ - /usr/include/gtk-2.0/gtk/gtklayout.h /usr/include/gtk-2.0/gtk/gtklist.h \ + /usr/include/gtk-2.0/gtk/gtklayout.h \ + /usr/include/gtk-2.0/gtk/gtklinkbutton.h \ + /usr/include/gtk-2.0/gtk/gtklist.h \ /usr/include/gtk-2.0/gtk/gtklistitem.h \ /usr/include/gtk-2.0/gtk/gtkmain.h \ /usr/include/gtk-2.0/gtk/gtkmenubar.h \ @@ -376,6 +392,14 @@ interface.o interface.o: interface.c ../config.h /usr/include/sys/types.h \ /usr/include/gtk-2.0/gtk/gtkoptionmenu.h \ /usr/include/gtk-2.0/gtk/gtkpixmap.h \ /usr/include/gtk-2.0/gtk/gtkpreview.h \ + /usr/include/gtk-2.0/gtk/gtkprintoperation.h \ + /usr/include/gtk-2.0/gtk/gtkmain.h /usr/include/gtk-2.0/gtk/gtkenums.h \ + /usr/include/gtk-2.0/gtk/gtkwindow.h \ + /usr/include/gtk-2.0/gtk/gtkpagesetup.h \ + /usr/include/gtk-2.0/gtk/gtkpapersize.h \ + /usr/include/gtk-2.0/gtk/gtkprintsettings.h \ + /usr/include/gtk-2.0/gtk/gtkprintcontext.h \ + /usr/include/gtk-2.0/gtk/gtkprintoperationpreview.h \ /usr/include/gtk-2.0/gtk/gtkprogress.h \ /usr/include/gtk-2.0/gtk/gtkprogressbar.h \ /usr/include/gtk-2.0/gtk/gtkradioaction.h \ @@ -385,6 +409,15 @@ interface.o interface.o: interface.c ../config.h /usr/include/sys/types.h \ /usr/include/gtk-2.0/gtk/gtkradiotoolbutton.h \ /usr/include/gtk-2.0/gtk/gtktoggletoolbutton.h \ /usr/include/gtk-2.0/gtk/gtktoolbutton.h \ + /usr/include/gtk-2.0/gtk/gtkrecentchooser.h \ + /usr/include/gtk-2.0/gtk/gtkrecentmanager.h \ + /usr/include/gtk-2.0/gtk/gtkrecentfilter.h \ + /usr/include/gtk-2.0/gtk/gtkrecentchooserdialog.h \ + /usr/include/gtk-2.0/gtk/gtkrecentchooser.h \ + /usr/include/gtk-2.0/gtk/gtkrecentchoosermenu.h \ + /usr/include/gtk-2.0/gtk/gtkrecentchooserwidget.h \ + /usr/include/gtk-2.0/gtk/gtkrecentfilter.h \ + /usr/include/gtk-2.0/gtk/gtkrecentmanager.h \ /usr/include/gtk-2.0/gtk/gtkscrolledwindow.h \ /usr/include/gtk-2.0/gtk/gtkviewport.h \ /usr/include/gtk-2.0/gtk/gtkseparatormenuitem.h \ @@ -392,15 +425,14 @@ interface.o interface.o: interface.c ../config.h /usr/include/sys/types.h \ /usr/include/gtk-2.0/gtk/gtksizegroup.h \ /usr/include/gtk-2.0/gtk/gtkspinbutton.h \ /usr/include/gtk-2.0/gtk/gtkstatusbar.h \ + /usr/include/gtk-2.0/gtk/gtkstatusicon.h \ /usr/include/gtk-2.0/gtk/gtkstock.h /usr/include/gtk-2.0/gtk/gtktable.h \ /usr/include/gtk-2.0/gtk/gtktearoffmenuitem.h \ /usr/include/gtk-2.0/gtk/gtktext.h \ /usr/include/gtk-2.0/gtk/gtktextbuffer.h \ /usr/include/gtk-2.0/gtk/gtktexttagtable.h \ - /usr/include/gtk-2.0/gtk/gtktexttag.h \ - /usr/include/gtk-2.0/gtk/gtktextiter.h \ - /usr/include/gtk-2.0/gtk/gtktextchild.h \ /usr/include/gtk-2.0/gtk/gtktextmark.h \ + /usr/include/gtk-2.0/gtk/gtktextbufferrichtext.h \ /usr/include/gtk-2.0/gtk/gtktextview.h \ /usr/include/gtk-2.0/gtk/gtktipsquery.h \ /usr/include/gtk-2.0/gtk/gtktoggletoolbutton.h \ @@ -425,7 +457,6 @@ interface.o interface.o: interface.c ../config.h /usr/include/sys/types.h \ /usr/include/libgnomecanvas-2.0/libgnomecanvas/gnome-canvas.h \ /usr/include/libart-2.0/libart_lgpl/art_misc.h /usr/include/alloca.h \ /usr/include/libart-2.0/libart_lgpl/art_config.h \ - /usr/include/multiarch-i386-linux/libart-2.0/libart_lgpl/art_config.h \ /usr/include/libart-2.0/libart_lgpl/art_rect.h \ /usr/include/libart-2.0/libart_lgpl/art_svp.h \ /usr/include/libart-2.0/libart_lgpl/art_point.h \ @@ -472,6 +503,9 @@ interface.o interface.o: interface.c ../config.h /usr/include/sys/types.h \ /usr/include/libgnomecanvas-2.0/libgnomecanvas/gnome-canvas-util.h \ /usr/include/libart-2.0/libart_lgpl/art_vpath.h \ /usr/include/libart-2.0/libart_lgpl/art_svp_vpath_stroke.h \ + /usr/include/libgnomecanvas-2.0/libgnomecanvas/gnome-canvas-clipgroup.h \ + /usr/include/libart-2.0/libart_lgpl/art_svp_wind.h \ + /usr/include/libart-2.0/libart_lgpl/art_vpath_dash.h \ /usr/include/libgnomeui-2.0/libgnomeui/libgnomeui.h \ /usr/include/libgnomeui-2.0/libgnomeui/gnome-uidefs.h \ /usr/include/gtk-2.0/gdk/gdkkeysyms.h \ @@ -498,9 +532,10 @@ interface.o interface.o: interface.c ../config.h /usr/include/sys/types.h \ /usr/include/libgnomeui-2.0/libgnomeui/gnome-icon-lookup.h \ /usr/include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-file-info.h \ /usr/include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-file-size.h \ - /usr/include/multiarch-i386-linux/gnome-vfs-2.0/libgnomevfs/gnome-vfs-file-size.h \ /usr/include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-result.h \ /usr/include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-uri.h \ + /usr/include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-acl.h \ + /usr/include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-ace.h \ /usr/include/libgnomeui-2.0/libgnomeui/gnome-stock-icons.h \ /usr/include/libgnomeui-2.0/libgnomeui/gnome-scores.h \ /usr/include/libgnomeui-2.0/libgnomeui/gnome-client.h \ @@ -545,15 +580,15 @@ interface.o interface.o: interface.c ../config.h /usr/include/sys/types.h \ /usr/include/bits/fcntl.h /usr/include/sys/wait.h /usr/include/signal.h \ /usr/include/bits/signum.h /usr/include/bits/siginfo.h \ /usr/include/bits/sigaction.h /usr/include/bits/sigcontext.h \ - /usr/include/asm/sigcontext.h /usr/include/linux/compiler.h \ - /usr/include/bits/sigstack.h /usr/include/bits/sigthread.h \ - /usr/include/sys/resource.h /usr/include/bits/resource.h \ - /usr/include/bits/waitflags.h /usr/include/bits/waitstatus.h \ - /usr/include/pcre/pcre.h eggtrayicon.h /usr/include/gtk-2.0/gdk/gdkx.h \ - /usr/include/gtk-2.0/gdk/gdkprivate.h /usr/X11R6/include/X11/Xlib.h \ - /usr/X11R6/include/X11/X.h /usr/X11R6/include/X11/Xfuncproto.h \ - /usr/X11R6/include/X11/Xosdefs.h /usr/X11R6/include/X11/Xutil.h \ - interface.h support.h + /usr/include/asm/sigcontext.h /usr/include/bits/sigstack.h \ + /usr/include/bits/sigthread.h /usr/include/sys/resource.h \ + /usr/include/bits/resource.h /usr/include/bits/waitflags.h \ + /usr/include/bits/waitstatus.h /usr/include/pcre.h eggtrayicon.h \ + /usr/include/gtk-2.0/gdk/gdkx.h /usr/include/gtk-2.0/gdk/gdkprivate.h \ + /usr/include/X11/Xlib.h /usr/include/X11/X.h \ + /usr/include/X11/Xfuncproto.h /usr/include/X11/Xosdefs.h \ + /usr/include/X11/Xutil.h /usr/include/X11/keysym.h \ + /usr/include/X11/keysymdef.h interface.h support.h ../config.h: @@ -563,13 +598,15 @@ interface.o interface.o: interface.c ../config.h /usr/include/sys/types.h \ /usr/include/sys/cdefs.h: +/usr/include/bits/wordsize.h: + /usr/include/gnu/stubs.h: -/usr/include/bits/types.h: +/usr/include/gnu/stubs-32.h: -/usr/include/bits/wordsize.h: +/usr/include/bits/types.h: -/usr/lib/gcc/i586-mandrake-linux-gnu/3.4.3/include/stddef.h: +/usr/lib/gcc/i686-pc-linux-gnu/4.1.1/include/stddef.h: /usr/include/bits/typesizes.h: @@ -591,8 +628,6 @@ interface.o interface.o: interface.c ../config.h /usr/include/sys/types.h \ /usr/include/bits/pthreadtypes.h: -/usr/include/bits/sched.h: - /usr/include/sys/stat.h: /usr/include/bits/stat.h: @@ -625,7 +660,7 @@ interface.o interface.o: interface.c ../config.h /usr/include/sys/types.h \ /usr/include/gconv.h: -/usr/lib/gcc/i586-mandrake-linux-gnu/3.4.3/include/stdarg.h: +/usr/lib/gcc/i686-pc-linux-gnu/4.1.1/include/stdarg.h: /usr/include/bits/stdio_lim.h: @@ -659,9 +694,9 @@ interface.o interface.o: interface.c ../config.h /usr/include/sys/types.h \ /usr/lib/glib-2.0/include/glibconfig.h: -/usr/lib/gcc/i586-mandrake-linux-gnu/3.4.3/include/limits.h: +/usr/lib/gcc/i686-pc-linux-gnu/4.1.1/include/limits.h: -/usr/lib/gcc/i586-mandrake-linux-gnu/3.4.3/include/syslimits.h: +/usr/lib/gcc/i686-pc-linux-gnu/4.1.1/include/syslimits.h: /usr/include/limits.h: @@ -673,7 +708,7 @@ interface.o interface.o: interface.c ../config.h /usr/include/sys/types.h \ /usr/include/bits/posix2_lim.h: -/usr/lib/gcc/i586-mandrake-linux-gnu/3.4.3/include/float.h: +/usr/lib/gcc/i686-pc-linux-gnu/4.1.1/include/float.h: /usr/include/glib-2.0/glib/garray.h: @@ -689,12 +724,18 @@ interface.o interface.o: interface.c ../config.h /usr/include/sys/types.h \ /usr/include/glib-2.0/glib/gbacktrace.h: +/usr/include/glib-2.0/glib/gbase64.h: + +/usr/include/glib-2.0/glib/gbookmarkfile.h: + /usr/include/glib-2.0/glib/gcache.h: /usr/include/glib-2.0/glib/glist.h: /usr/include/glib-2.0/glib/gmem.h: +/usr/include/glib-2.0/glib/gslice.h: + /usr/include/glib-2.0/glib/gcompletion.h: /usr/include/glib-2.0/glib/gconvert.h: @@ -725,6 +766,8 @@ interface.o interface.o: interface.c ../config.h /usr/include/sys/types.h \ /usr/include/glib-2.0/glib/gkeyfile.h: +/usr/include/glib-2.0/glib/gmappedfile.h: + /usr/include/glib-2.0/glib/gmarkup.h: /usr/include/glib-2.0/glib/gmessages.h: @@ -797,10 +840,6 @@ interface.o interface.o: interface.c ../config.h /usr/include/sys/types.h \ /usr/include/orbit-2.0/orbit/orbit-config.h: -/usr/include/multiarch-dispatch.h: - -/usr/include/multiarch-i386-linux/orbit-2.0/orbit/orbit-config.h: - /usr/include/orbit-2.0/orbit/util/basic_types.h: /usr/include/orbit-2.0/orbit/util/orbit-genrand.h: @@ -907,8 +946,12 @@ interface.o interface.o: interface.c ../config.h /usr/include/sys/types.h \ /usr/include/libbonobo-2.0/bonobo/bonobo-item-container.h: +/usr/include/libbonobo-2.0/bonobo/bonobo-item-handler.h: + /usr/include/libbonobo-2.0/bonobo/bonobo-moniker-util.h: +/usr/include/libbonobo-2.0/bonobo/bonobo-moniker-extender.h: + /usr/include/libbonobo-2.0/bonobo/bonobo-property-bag.h: /usr/include/libbonobo-2.0/bonobo/bonobo-event-source.h: @@ -927,6 +970,8 @@ interface.o interface.o: interface.c ../config.h /usr/include/sys/types.h \ /usr/include/bits/locale.h: +/usr/include/libbonobo-2.0/bonobo/bonobo-shlib-factory.h: + /usr/include/libbonobo-2.0/bonobo/bonobo-main.h: /usr/include/libbonobo-2.0/bonobo/bonobo-stream.h: @@ -955,8 +1000,14 @@ interface.o interface.o: interface.c ../config.h /usr/include/sys/types.h \ /usr/include/gtk-2.0/gdk/gdk.h: +/usr/include/gtk-2.0/gdk/gdkcairo.h: + /usr/include/gtk-2.0/gdk/gdkcolor.h: +/usr/include/cairo/cairo.h: + +/usr/include/cairo/cairo-features.h: + /usr/include/gtk-2.0/gdk/gdktypes.h: /usr/include/pango-1.0/pango/pango.h: @@ -997,7 +1048,9 @@ interface.o interface.o: interface.c ../config.h /usr/include/sys/types.h \ /usr/lib/gtk-2.0/include/gdkconfig.h: -/usr/include/gtk-2.0/gdk/gdkcursor.h: +/usr/include/gtk-2.0/gdk/gdkpixbuf.h: + +/usr/include/gtk-2.0/gdk/gdkrgb.h: /usr/include/gtk-2.0/gdk-pixbuf/gdk-pixbuf.h: @@ -1009,6 +1062,8 @@ interface.o interface.o: interface.c ../config.h /usr/include/sys/types.h \ /usr/include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-animation.h: +/usr/include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-simple-anim.h: + /usr/include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-io.h: /usr/include/glib-2.0/gmodule.h: @@ -1017,6 +1072,10 @@ interface.o interface.o: interface.c ../config.h /usr/include/sys/types.h \ /usr/include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-enum-types.h: +/usr/include/pango-1.0/pango/pangocairo.h: + +/usr/include/gtk-2.0/gdk/gdkcursor.h: + /usr/include/gtk-2.0/gdk/gdkdisplay.h: /usr/include/gtk-2.0/gdk/gdkevents.h: @@ -1029,8 +1088,6 @@ interface.o interface.o: interface.c ../config.h /usr/include/sys/types.h \ /usr/include/gtk-2.0/gdk/gdkgc.h: -/usr/include/gtk-2.0/gdk/gdkrgb.h: - /usr/include/gtk-2.0/gdk/gdkenumtypes.h: /usr/include/gtk-2.0/gdk/gdkfont.h: @@ -1043,8 +1100,6 @@ interface.o interface.o: interface.c ../config.h /usr/include/sys/types.h \ /usr/include/gtk-2.0/gdk/gdkpango.h: -/usr/include/gtk-2.0/gdk/gdkpixbuf.h: - /usr/include/gtk-2.0/gdk/gdkpixmap.h: /usr/include/gtk-2.0/gdk/gdkproperty.h: @@ -1177,6 +1232,8 @@ interface.o interface.o: interface.c ../config.h /usr/include/sys/types.h \ /usr/include/atk-1.0/atk/atkhyperlink.h: +/usr/include/atk-1.0/atk/atkhyperlinkimpl.h: + /usr/include/atk-1.0/atk/atkhypertext.h: /usr/include/atk-1.0/atk/atkimage.h: @@ -1219,6 +1276,8 @@ interface.o interface.o: interface.c ../config.h /usr/include/sys/types.h \ /usr/include/gtk-2.0/gtk/gtkframe.h: +/usr/include/gtk-2.0/gtk/gtkassistant.h: + /usr/include/gtk-2.0/gtk/gtkbbox.h: /usr/include/gtk-2.0/gtk/gtkbox.h: @@ -1247,6 +1306,10 @@ interface.o interface.o: interface.c ../config.h /usr/include/sys/types.h \ /usr/include/gtk-2.0/gtk/gtktreesortable.h: +/usr/include/gtk-2.0/gtk/gtkcellrendereraccel.h: + +/usr/include/gtk-2.0/gtk/gtkcellrenderertext.h: + /usr/include/gtk-2.0/gtk/gtkcellrenderercombo.h: /usr/include/gtk-2.0/gtk/gtkcellrenderertext.h: @@ -1255,6 +1318,8 @@ interface.o interface.o: interface.c ../config.h /usr/include/sys/types.h \ /usr/include/gtk-2.0/gtk/gtkcellrendererprogress.h: +/usr/include/gtk-2.0/gtk/gtkcellrendererspin.h: + /usr/include/gtk-2.0/gtk/gtkcellrenderertoggle.h: /usr/include/gtk-2.0/gtk/gtkcellview.h: @@ -1273,6 +1338,12 @@ interface.o interface.o: interface.c ../config.h /usr/include/sys/types.h \ /usr/include/gtk-2.0/gtk/gtkselection.h: +/usr/include/gtk-2.0/gtk/gtktextiter.h: + +/usr/include/gtk-2.0/gtk/gtktexttag.h: + +/usr/include/gtk-2.0/gtk/gtktextchild.h: + /usr/include/gtk-2.0/gtk/gtkclist.h: /usr/include/gtk-2.0/gtk/gtkhscrollbar.h: @@ -1301,18 +1372,10 @@ interface.o interface.o: interface.c ../config.h /usr/include/sys/types.h \ /usr/include/gtk-2.0/gtk/gtkdnd.h: -/usr/include/gtk-2.0/gtk/gtkcomboboxentry.h: - -/usr/include/gtk-2.0/gtk/gtkctree.h: - -/usr/include/gtk-2.0/gtk/gtkcurve.h: - -/usr/include/gtk-2.0/gtk/gtkdrawingarea.h: +/usr/include/gtk-2.0/gtk/gtkentry.h: /usr/include/gtk-2.0/gtk/gtkeditable.h: -/usr/include/gtk-2.0/gtk/gtkentry.h: - /usr/include/gtk-2.0/gtk/gtkimcontext.h: /usr/include/gtk-2.0/gtk/gtkentrycompletion.h: @@ -1321,6 +1384,14 @@ interface.o interface.o: interface.c ../config.h /usr/include/sys/types.h \ /usr/include/gtk-2.0/gtk/gtktreemodelfilter.h: +/usr/include/gtk-2.0/gtk/gtkcomboboxentry.h: + +/usr/include/gtk-2.0/gtk/gtkctree.h: + +/usr/include/gtk-2.0/gtk/gtkcurve.h: + +/usr/include/gtk-2.0/gtk/gtkdrawingarea.h: + /usr/include/gtk-2.0/gtk/gtkeventbox.h: /usr/include/gtk-2.0/gtk/gtkexpander.h: @@ -1387,6 +1458,8 @@ interface.o interface.o: interface.c ../config.h /usr/include/sys/types.h \ /usr/include/gtk-2.0/gtk/gtklayout.h: +/usr/include/gtk-2.0/gtk/gtklinkbutton.h: + /usr/include/gtk-2.0/gtk/gtklist.h: /usr/include/gtk-2.0/gtk/gtklistitem.h: @@ -1419,6 +1492,24 @@ interface.o interface.o: interface.c ../config.h /usr/include/sys/types.h \ /usr/include/gtk-2.0/gtk/gtkpreview.h: +/usr/include/gtk-2.0/gtk/gtkprintoperation.h: + +/usr/include/gtk-2.0/gtk/gtkmain.h: + +/usr/include/gtk-2.0/gtk/gtkenums.h: + +/usr/include/gtk-2.0/gtk/gtkwindow.h: + +/usr/include/gtk-2.0/gtk/gtkpagesetup.h: + +/usr/include/gtk-2.0/gtk/gtkpapersize.h: + +/usr/include/gtk-2.0/gtk/gtkprintsettings.h: + +/usr/include/gtk-2.0/gtk/gtkprintcontext.h: + +/usr/include/gtk-2.0/gtk/gtkprintoperationpreview.h: + /usr/include/gtk-2.0/gtk/gtkprogress.h: /usr/include/gtk-2.0/gtk/gtkprogressbar.h: @@ -1437,6 +1528,24 @@ interface.o interface.o: interface.c ../config.h /usr/include/sys/types.h \ /usr/include/gtk-2.0/gtk/gtktoolbutton.h: +/usr/include/gtk-2.0/gtk/gtkrecentchooser.h: + +/usr/include/gtk-2.0/gtk/gtkrecentmanager.h: + +/usr/include/gtk-2.0/gtk/gtkrecentfilter.h: + +/usr/include/gtk-2.0/gtk/gtkrecentchooserdialog.h: + +/usr/include/gtk-2.0/gtk/gtkrecentchooser.h: + +/usr/include/gtk-2.0/gtk/gtkrecentchoosermenu.h: + +/usr/include/gtk-2.0/gtk/gtkrecentchooserwidget.h: + +/usr/include/gtk-2.0/gtk/gtkrecentfilter.h: + +/usr/include/gtk-2.0/gtk/gtkrecentmanager.h: + /usr/include/gtk-2.0/gtk/gtkscrolledwindow.h: /usr/include/gtk-2.0/gtk/gtkviewport.h: @@ -1451,6 +1560,8 @@ interface.o interface.o: interface.c ../config.h /usr/include/sys/types.h \ /usr/include/gtk-2.0/gtk/gtkstatusbar.h: +/usr/include/gtk-2.0/gtk/gtkstatusicon.h: + /usr/include/gtk-2.0/gtk/gtkstock.h: /usr/include/gtk-2.0/gtk/gtktable.h: @@ -1463,14 +1574,10 @@ interface.o interface.o: interface.c ../config.h /usr/include/sys/types.h \ /usr/include/gtk-2.0/gtk/gtktexttagtable.h: -/usr/include/gtk-2.0/gtk/gtktexttag.h: - -/usr/include/gtk-2.0/gtk/gtktextiter.h: - -/usr/include/gtk-2.0/gtk/gtktextchild.h: - /usr/include/gtk-2.0/gtk/gtktextmark.h: +/usr/include/gtk-2.0/gtk/gtktextbufferrichtext.h: + /usr/include/gtk-2.0/gtk/gtktextview.h: /usr/include/gtk-2.0/gtk/gtktipsquery.h: @@ -1521,8 +1628,6 @@ interface.o interface.o: interface.c ../config.h /usr/include/sys/types.h \ /usr/include/libart-2.0/libart_lgpl/art_config.h: -/usr/include/multiarch-i386-linux/libart-2.0/libart_lgpl/art_config.h: - /usr/include/libart-2.0/libart_lgpl/art_rect.h: /usr/include/libart-2.0/libart_lgpl/art_svp.h: @@ -1615,6 +1720,12 @@ interface.o interface.o: interface.c ../config.h /usr/include/sys/types.h \ /usr/include/libart-2.0/libart_lgpl/art_svp_vpath_stroke.h: +/usr/include/libgnomecanvas-2.0/libgnomecanvas/gnome-canvas-clipgroup.h: + +/usr/include/libart-2.0/libart_lgpl/art_svp_wind.h: + +/usr/include/libart-2.0/libart_lgpl/art_vpath_dash.h: + /usr/include/libgnomeui-2.0/libgnomeui/libgnomeui.h: /usr/include/libgnomeui-2.0/libgnomeui/gnome-uidefs.h: @@ -1667,12 +1778,14 @@ interface.o interface.o: interface.c ../config.h /usr/include/sys/types.h \ /usr/include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-file-size.h: -/usr/include/multiarch-i386-linux/gnome-vfs-2.0/libgnomevfs/gnome-vfs-file-size.h: - /usr/include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-result.h: /usr/include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-uri.h: +/usr/include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-acl.h: + +/usr/include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-ace.h: + /usr/include/libgnomeui-2.0/libgnomeui/gnome-stock-icons.h: /usr/include/libgnomeui-2.0/libgnomeui/gnome-scores.h: @@ -1775,8 +1888,6 @@ callbacks.h: /usr/include/asm/sigcontext.h: -/usr/include/linux/compiler.h: - /usr/include/bits/sigstack.h: /usr/include/bits/sigthread.h: @@ -1789,7 +1900,7 @@ callbacks.h: /usr/include/bits/waitstatus.h: -/usr/include/pcre/pcre.h: +/usr/include/pcre.h: eggtrayicon.h: @@ -1797,15 +1908,19 @@ eggtrayicon.h: /usr/include/gtk-2.0/gdk/gdkprivate.h: -/usr/X11R6/include/X11/Xlib.h: +/usr/include/X11/Xlib.h: + +/usr/include/X11/X.h: + +/usr/include/X11/Xfuncproto.h: -/usr/X11R6/include/X11/X.h: +/usr/include/X11/Xosdefs.h: -/usr/X11R6/include/X11/Xfuncproto.h: +/usr/include/X11/Xutil.h: -/usr/X11R6/include/X11/Xosdefs.h: +/usr/include/X11/keysym.h: -/usr/X11R6/include/X11/Xutil.h: +/usr/include/X11/keysymdef.h: interface.h: diff --git a/projects/gvpndialer/trunk/src/.deps/main.Po b/projects/gvpndialer/trunk/src/.deps/main.Po index 92d12c9..be43da8 100644 --- a/projects/gvpndialer/trunk/src/.deps/main.Po +++ b/projects/gvpndialer/trunk/src/.deps/main.Po @@ -1,26 +1,33 @@ main.o main.o: main.c ../config.h /usr/include/libgnomeui-2.0/gnome.h \ /usr/include/gtk-2.0/gtk/gtk.h /usr/include/gtk-2.0/gdk/gdk.h \ - /usr/include/gtk-2.0/gdk/gdkcolor.h /usr/include/gtk-2.0/gdk/gdktypes.h \ - /usr/include/glib-2.0/glib.h /usr/include/glib-2.0/glib/galloca.h \ + /usr/include/gtk-2.0/gdk/gdkcairo.h /usr/include/gtk-2.0/gdk/gdkcolor.h \ + /usr/include/cairo/cairo.h /usr/include/cairo/cairo-features.h \ + /usr/include/gtk-2.0/gdk/gdktypes.h /usr/include/glib-2.0/glib.h \ + /usr/include/glib-2.0/glib/galloca.h \ /usr/include/glib-2.0/glib/gtypes.h \ /usr/lib/glib-2.0/include/glibconfig.h \ /usr/include/glib-2.0/glib/gmacros.h \ - /usr/lib/gcc/i586-mandrake-linux-gnu/3.4.3/include/stddef.h \ - /usr/lib/gcc/i586-mandrake-linux-gnu/3.4.3/include/limits.h \ - /usr/lib/gcc/i586-mandrake-linux-gnu/3.4.3/include/syslimits.h \ + /usr/lib/gcc/i686-pc-linux-gnu/4.1.1/include/stddef.h \ + /usr/lib/gcc/i686-pc-linux-gnu/4.1.1/include/limits.h \ + /usr/lib/gcc/i686-pc-linux-gnu/4.1.1/include/syslimits.h \ /usr/include/limits.h /usr/include/features.h /usr/include/sys/cdefs.h \ - /usr/include/gnu/stubs.h /usr/include/bits/posix1_lim.h \ + /usr/include/bits/wordsize.h /usr/include/gnu/stubs.h \ + /usr/include/gnu/stubs-32.h /usr/include/bits/posix1_lim.h \ /usr/include/bits/local_lim.h /usr/include/linux/limits.h \ /usr/include/bits/posix2_lim.h \ - /usr/lib/gcc/i586-mandrake-linux-gnu/3.4.3/include/float.h \ + /usr/lib/gcc/i686-pc-linux-gnu/4.1.1/include/float.h \ /usr/include/glib-2.0/glib/garray.h \ /usr/include/glib-2.0/glib/gasyncqueue.h \ /usr/include/glib-2.0/glib/gthread.h \ /usr/include/glib-2.0/glib/gerror.h /usr/include/glib-2.0/glib/gquark.h \ /usr/include/glib-2.0/glib/gatomic.h \ /usr/include/glib-2.0/glib/gbacktrace.h \ - /usr/include/glib-2.0/glib/gcache.h /usr/include/glib-2.0/glib/glist.h \ - /usr/include/glib-2.0/glib/gmem.h \ + /usr/include/glib-2.0/glib/gbase64.h \ + /usr/include/glib-2.0/glib/gbookmarkfile.h /usr/include/time.h \ + /usr/include/bits/time.h /usr/include/bits/types.h \ + /usr/include/bits/typesizes.h /usr/include/glib-2.0/glib/gcache.h \ + /usr/include/glib-2.0/glib/glist.h /usr/include/glib-2.0/glib/gmem.h \ + /usr/include/glib-2.0/glib/gslice.h \ /usr/include/glib-2.0/glib/gcompletion.h \ /usr/include/glib-2.0/glib/gconvert.h \ /usr/include/glib-2.0/glib/gdataset.h \ @@ -32,8 +39,9 @@ main.o main.o: main.c ../config.h /usr/include/libgnomeui-2.0/gnome.h \ /usr/include/glib-2.0/glib/gstring.h \ /usr/include/glib-2.0/glib/gunicode.h \ /usr/include/glib-2.0/glib/gutils.h \ - /usr/lib/gcc/i586-mandrake-linux-gnu/3.4.3/include/stdarg.h \ + /usr/lib/gcc/i686-pc-linux-gnu/4.1.1/include/stdarg.h \ /usr/include/glib-2.0/glib/gkeyfile.h \ + /usr/include/glib-2.0/glib/gmappedfile.h \ /usr/include/glib-2.0/glib/gmarkup.h \ /usr/include/glib-2.0/glib/gmessages.h \ /usr/include/glib-2.0/glib/gnode.h /usr/include/glib-2.0/glib/goption.h \ @@ -81,32 +89,31 @@ main.o main.o: main.c ../config.h /usr/include/libgnomeui-2.0/gnome.h \ /usr/include/pango-1.0/pango/pango-tabs.h \ /usr/include/pango-1.0/pango/pango-renderer.h \ /usr/lib/gtk-2.0/include/gdkconfig.h \ - /usr/include/gtk-2.0/gdk/gdkcursor.h \ + /usr/include/gtk-2.0/gdk/gdkpixbuf.h /usr/include/gtk-2.0/gdk/gdkrgb.h \ /usr/include/gtk-2.0/gdk-pixbuf/gdk-pixbuf.h \ /usr/include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-features.h \ /usr/include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-core.h \ /usr/include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-transform.h \ /usr/include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-animation.h \ + /usr/include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-simple-anim.h \ /usr/include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-io.h /usr/include/stdio.h \ - /usr/include/bits/types.h /usr/include/bits/wordsize.h \ - /usr/include/bits/typesizes.h /usr/include/libio.h \ - /usr/include/_G_config.h /usr/include/wchar.h /usr/include/bits/wchar.h \ - /usr/include/gconv.h /usr/include/bits/stdio_lim.h \ - /usr/include/bits/sys_errlist.h /usr/include/bits/stdio.h \ - /usr/include/glib-2.0/gmodule.h \ + /usr/include/libio.h /usr/include/_G_config.h /usr/include/wchar.h \ + /usr/include/bits/wchar.h /usr/include/gconv.h \ + /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \ + /usr/include/bits/stdio.h /usr/include/glib-2.0/gmodule.h \ /usr/include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-loader.h \ /usr/include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-enum-types.h \ + /usr/include/pango-1.0/pango/pangocairo.h \ + /usr/include/gtk-2.0/gdk/gdkcursor.h \ /usr/include/gtk-2.0/gdk/gdkdisplay.h \ /usr/include/gtk-2.0/gdk/gdkevents.h /usr/include/gtk-2.0/gdk/gdkdnd.h \ /usr/include/gtk-2.0/gdk/gdkinput.h \ /usr/include/gtk-2.0/gdk/gdkdrawable.h /usr/include/gtk-2.0/gdk/gdkgc.h \ - /usr/include/gtk-2.0/gdk/gdkrgb.h \ /usr/include/gtk-2.0/gdk/gdkenumtypes.h \ /usr/include/gtk-2.0/gdk/gdkfont.h /usr/include/gtk-2.0/gdk/gdkimage.h \ /usr/include/gtk-2.0/gdk/gdkkeys.h \ /usr/include/gtk-2.0/gdk/gdkdisplaymanager.h \ /usr/include/gtk-2.0/gdk/gdkpango.h \ - /usr/include/gtk-2.0/gdk/gdkpixbuf.h \ /usr/include/gtk-2.0/gdk/gdkpixmap.h \ /usr/include/gtk-2.0/gdk/gdkproperty.h \ /usr/include/gtk-2.0/gdk/gdkregion.h \ @@ -146,6 +153,7 @@ main.o main.o: main.c ../config.h /usr/include/libgnomeui-2.0/gnome.h \ /usr/include/atk-1.0/atk/atktext.h \ /usr/include/atk-1.0/atk/atkgobjectaccessible.h \ /usr/include/atk-1.0/atk/atkhyperlink.h \ + /usr/include/atk-1.0/atk/atkhyperlinkimpl.h \ /usr/include/atk-1.0/atk/atkhypertext.h \ /usr/include/atk-1.0/atk/atkimage.h \ /usr/include/atk-1.0/atk/atknoopobject.h \ @@ -165,8 +173,9 @@ main.o main.o: main.c ../config.h /usr/include/libgnomeui-2.0/gnome.h \ /usr/include/gtk-2.0/gtk/gtkalignment.h \ /usr/include/gtk-2.0/gtk/gtkarrow.h \ /usr/include/gtk-2.0/gtk/gtkaspectframe.h \ - /usr/include/gtk-2.0/gtk/gtkframe.h /usr/include/gtk-2.0/gtk/gtkbbox.h \ - /usr/include/gtk-2.0/gtk/gtkbox.h \ + /usr/include/gtk-2.0/gtk/gtkframe.h \ + /usr/include/gtk-2.0/gtk/gtkassistant.h \ + /usr/include/gtk-2.0/gtk/gtkbbox.h /usr/include/gtk-2.0/gtk/gtkbox.h \ /usr/include/gtk-2.0/gtk/gtkbindings.h \ /usr/include/gtk-2.0/gtk/gtkbutton.h \ /usr/include/gtk-2.0/gtk/gtkimage.h \ @@ -179,10 +188,13 @@ main.o main.o: main.c ../config.h /usr/include/libgnomeui-2.0/gnome.h \ /usr/include/gtk-2.0/gtk/gtktreeviewcolumn.h \ /usr/include/gtk-2.0/gtk/gtktreemodel.h \ /usr/include/gtk-2.0/gtk/gtktreesortable.h \ + /usr/include/gtk-2.0/gtk/gtkcellrendereraccel.h \ + /usr/include/gtk-2.0/gtk/gtkcellrenderertext.h \ /usr/include/gtk-2.0/gtk/gtkcellrenderercombo.h \ /usr/include/gtk-2.0/gtk/gtkcellrenderertext.h \ /usr/include/gtk-2.0/gtk/gtkcellrendererpixbuf.h \ /usr/include/gtk-2.0/gtk/gtkcellrendererprogress.h \ + /usr/include/gtk-2.0/gtk/gtkcellrendererspin.h \ /usr/include/gtk-2.0/gtk/gtkcellrenderertoggle.h \ /usr/include/gtk-2.0/gtk/gtkcellview.h \ /usr/include/gtk-2.0/gtk/gtkcheckbutton.h \ @@ -192,6 +204,9 @@ main.o main.o: main.c ../config.h /usr/include/libgnomeui-2.0/gnome.h \ /usr/include/gtk-2.0/gtk/gtkitem.h \ /usr/include/gtk-2.0/gtk/gtkclipboard.h \ /usr/include/gtk-2.0/gtk/gtkselection.h \ + /usr/include/gtk-2.0/gtk/gtktextiter.h \ + /usr/include/gtk-2.0/gtk/gtktexttag.h \ + /usr/include/gtk-2.0/gtk/gtktextchild.h \ /usr/include/gtk-2.0/gtk/gtkclist.h \ /usr/include/gtk-2.0/gtk/gtkhscrollbar.h \ /usr/include/gtk-2.0/gtk/gtkscrollbar.h \ @@ -204,16 +219,15 @@ main.o main.o: main.c ../config.h /usr/include/libgnomeui-2.0/gnome.h \ /usr/include/gtk-2.0/gtk/gtkcombo.h /usr/include/gtk-2.0/gtk/gtkhbox.h \ /usr/include/gtk-2.0/gtk/gtkcombobox.h \ /usr/include/gtk-2.0/gtk/gtktreeview.h \ - /usr/include/gtk-2.0/gtk/gtkdnd.h \ - /usr/include/gtk-2.0/gtk/gtkcomboboxentry.h \ - /usr/include/gtk-2.0/gtk/gtkctree.h /usr/include/gtk-2.0/gtk/gtkcurve.h \ - /usr/include/gtk-2.0/gtk/gtkdrawingarea.h \ + /usr/include/gtk-2.0/gtk/gtkdnd.h /usr/include/gtk-2.0/gtk/gtkentry.h \ /usr/include/gtk-2.0/gtk/gtkeditable.h \ - /usr/include/gtk-2.0/gtk/gtkentry.h \ /usr/include/gtk-2.0/gtk/gtkimcontext.h \ /usr/include/gtk-2.0/gtk/gtkentrycompletion.h \ /usr/include/gtk-2.0/gtk/gtkliststore.h \ /usr/include/gtk-2.0/gtk/gtktreemodelfilter.h \ + /usr/include/gtk-2.0/gtk/gtkcomboboxentry.h \ + /usr/include/gtk-2.0/gtk/gtkctree.h /usr/include/gtk-2.0/gtk/gtkcurve.h \ + /usr/include/gtk-2.0/gtk/gtkdrawingarea.h \ /usr/include/gtk-2.0/gtk/gtkeventbox.h \ /usr/include/gtk-2.0/gtk/gtkexpander.h \ /usr/include/gtk-2.0/gtk/gtkfilesel.h \ @@ -245,7 +259,9 @@ main.o main.o: main.c ../config.h /usr/include/libgnomeui-2.0/gnome.h \ /usr/include/gtk-2.0/gtk/gtkimmulticontext.h \ /usr/include/gtk-2.0/gtk/gtkinputdialog.h \ /usr/include/gtk-2.0/gtk/gtkinvisible.h \ - /usr/include/gtk-2.0/gtk/gtklayout.h /usr/include/gtk-2.0/gtk/gtklist.h \ + /usr/include/gtk-2.0/gtk/gtklayout.h \ + /usr/include/gtk-2.0/gtk/gtklinkbutton.h \ + /usr/include/gtk-2.0/gtk/gtklist.h \ /usr/include/gtk-2.0/gtk/gtklistitem.h \ /usr/include/gtk-2.0/gtk/gtkmain.h \ /usr/include/gtk-2.0/gtk/gtkmenubar.h \ @@ -262,6 +278,14 @@ main.o main.o: main.c ../config.h /usr/include/libgnomeui-2.0/gnome.h \ /usr/include/gtk-2.0/gtk/gtkpixmap.h /usr/include/gtk-2.0/gtk/gtkplug.h \ /usr/include/gtk-2.0/gtk/gtksocket.h \ /usr/include/gtk-2.0/gtk/gtkpreview.h \ + /usr/include/gtk-2.0/gtk/gtkprintoperation.h \ + /usr/include/gtk-2.0/gtk/gtkmain.h /usr/include/gtk-2.0/gtk/gtkenums.h \ + /usr/include/gtk-2.0/gtk/gtkwindow.h \ + /usr/include/gtk-2.0/gtk/gtkpagesetup.h \ + /usr/include/gtk-2.0/gtk/gtkpapersize.h \ + /usr/include/gtk-2.0/gtk/gtkprintsettings.h \ + /usr/include/gtk-2.0/gtk/gtkprintcontext.h \ + /usr/include/gtk-2.0/gtk/gtkprintoperationpreview.h \ /usr/include/gtk-2.0/gtk/gtkprogress.h \ /usr/include/gtk-2.0/gtk/gtkprogressbar.h \ /usr/include/gtk-2.0/gtk/gtkradioaction.h \ @@ -271,6 +295,15 @@ main.o main.o: main.c ../config.h /usr/include/libgnomeui-2.0/gnome.h \ /usr/include/gtk-2.0/gtk/gtkradiotoolbutton.h \ /usr/include/gtk-2.0/gtk/gtktoggletoolbutton.h \ /usr/include/gtk-2.0/gtk/gtktoolbutton.h \ + /usr/include/gtk-2.0/gtk/gtkrecentchooser.h \ + /usr/include/gtk-2.0/gtk/gtkrecentmanager.h \ + /usr/include/gtk-2.0/gtk/gtkrecentfilter.h \ + /usr/include/gtk-2.0/gtk/gtkrecentchooserdialog.h \ + /usr/include/gtk-2.0/gtk/gtkrecentchooser.h \ + /usr/include/gtk-2.0/gtk/gtkrecentchoosermenu.h \ + /usr/include/gtk-2.0/gtk/gtkrecentchooserwidget.h \ + /usr/include/gtk-2.0/gtk/gtkrecentfilter.h \ + /usr/include/gtk-2.0/gtk/gtkrecentmanager.h \ /usr/include/gtk-2.0/gtk/gtkscrolledwindow.h \ /usr/include/gtk-2.0/gtk/gtkviewport.h \ /usr/include/gtk-2.0/gtk/gtkseparatormenuitem.h \ @@ -278,15 +311,14 @@ main.o main.o: main.c ../config.h /usr/include/libgnomeui-2.0/gnome.h \ /usr/include/gtk-2.0/gtk/gtksizegroup.h \ /usr/include/gtk-2.0/gtk/gtkspinbutton.h \ /usr/include/gtk-2.0/gtk/gtkstatusbar.h \ + /usr/include/gtk-2.0/gtk/gtkstatusicon.h \ /usr/include/gtk-2.0/gtk/gtkstock.h /usr/include/gtk-2.0/gtk/gtktable.h \ /usr/include/gtk-2.0/gtk/gtktearoffmenuitem.h \ /usr/include/gtk-2.0/gtk/gtktext.h \ /usr/include/gtk-2.0/gtk/gtktextbuffer.h \ /usr/include/gtk-2.0/gtk/gtktexttagtable.h \ - /usr/include/gtk-2.0/gtk/gtktexttag.h \ - /usr/include/gtk-2.0/gtk/gtktextiter.h \ - /usr/include/gtk-2.0/gtk/gtktextchild.h \ /usr/include/gtk-2.0/gtk/gtktextmark.h \ + /usr/include/gtk-2.0/gtk/gtktextbufferrichtext.h \ /usr/include/gtk-2.0/gtk/gtktextview.h \ /usr/include/gtk-2.0/gtk/gtktipsquery.h \ /usr/include/gtk-2.0/gtk/gtktoggletoolbutton.h \ @@ -307,10 +339,10 @@ main.o main.o: main.c ../config.h /usr/include/libgnomeui-2.0/gnome.h \ /usr/include/gtk-2.0/gtk/gtkvscale.h \ /usr/include/gtk-2.0/gtk/gtkvseparator.h \ /usr/include/libgnome-2.0/libgnome/libgnome.h \ - /usr/include/libgnome-2.0/libgnome/gnome-program.h /usr/include/popt.h \ - /usr/include/errno.h /usr/include/bits/errno.h \ - /usr/include/linux/errno.h /usr/include/asm/errno.h \ - /usr/include/asm-generic/errno.h /usr/include/asm-generic/errno-base.h \ + /usr/include/libgnome-2.0/libgnome/gnome-program.h /usr/include/errno.h \ + /usr/include/bits/errno.h /usr/include/linux/errno.h \ + /usr/include/asm/errno.h /usr/include/asm-generic/errno.h \ + /usr/include/asm-generic/errno-base.h /usr/include/popt.h \ /usr/include/libgnome-2.0/libgnome/gnome-i18n.h \ /usr/include/libbonobo-2.0/bonobo/bonobo-i18n.h /usr/include/libintl.h \ /usr/include/locale.h /usr/include/bits/locale.h \ @@ -322,22 +354,18 @@ main.o main.o: main.c ../config.h /usr/include/libgnomeui-2.0/gnome.h \ /usr/include/libbonobo-2.0/bonobo/bonobo-macros.h \ /usr/include/libgnome-2.0/libgnome/gnome-triggers.h \ /usr/include/libgnome-2.0/libgnome/gnome-sound.h \ - /usr/include/libgnome-2.0/libgnome/gnome-score.h /usr/include/time.h \ - /usr/include/bits/time.h \ + /usr/include/libgnome-2.0/libgnome/gnome-score.h \ /usr/include/libgnome-2.0/libgnome/gnome-exec.h \ /usr/include/libgnome-2.0/libgnome/gnome-util.h /usr/include/stdlib.h \ /usr/include/sys/types.h /usr/include/endian.h \ /usr/include/bits/endian.h /usr/include/sys/select.h \ /usr/include/bits/select.h /usr/include/bits/sigset.h \ /usr/include/sys/sysmacros.h /usr/include/bits/pthreadtypes.h \ - /usr/include/bits/sched.h /usr/include/alloca.h \ - /usr/include/libgnome-2.0/libgnome/gnome-url.h \ + /usr/include/alloca.h /usr/include/libgnome-2.0/libgnome/gnome-url.h \ /usr/include/libgnomecanvas-2.0/libgnomecanvas/libgnomecanvas.h \ /usr/include/libgnomecanvas-2.0/libgnomecanvas/gnome-canvas.h \ /usr/include/libart-2.0/libart_lgpl/art_misc.h \ /usr/include/libart-2.0/libart_lgpl/art_config.h \ - /usr/include/multiarch-dispatch.h \ - /usr/include/multiarch-i386-linux/libart-2.0/libart_lgpl/art_config.h \ /usr/include/libart-2.0/libart_lgpl/art_rect.h \ /usr/include/libart-2.0/libart_lgpl/art_svp.h \ /usr/include/libart-2.0/libart_lgpl/art_point.h \ @@ -358,6 +386,9 @@ main.o main.o: main.c ../config.h /usr/include/libgnomeui-2.0/gnome.h \ /usr/include/libgnomecanvas-2.0/libgnomecanvas/gnome-canvas-util.h \ /usr/include/libart-2.0/libart_lgpl/art_vpath.h \ /usr/include/libart-2.0/libart_lgpl/art_svp_vpath_stroke.h \ + /usr/include/libgnomecanvas-2.0/libgnomecanvas/gnome-canvas-clipgroup.h \ + /usr/include/libart-2.0/libart_lgpl/art_svp_wind.h \ + /usr/include/libart-2.0/libart_lgpl/art_vpath_dash.h \ /usr/include/libgnomeui-2.0/libgnomeui/libgnomeui.h \ /usr/include/libgnomeui-2.0/libgnomeui/gnome-uidefs.h \ /usr/include/gtk-2.0/gdk/gdkkeysyms.h \ @@ -388,9 +419,10 @@ main.o main.o: main.c ../config.h /usr/include/libgnomeui-2.0/gnome.h \ /usr/include/libgnomeui-2.0/libgnomeui/gnome-icon-lookup.h \ /usr/include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-file-info.h \ /usr/include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-file-size.h \ - /usr/include/multiarch-i386-linux/gnome-vfs-2.0/libgnomevfs/gnome-vfs-file-size.h \ /usr/include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-result.h \ /usr/include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-uri.h \ + /usr/include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-acl.h \ + /usr/include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-ace.h \ /usr/include/sys/stat.h /usr/include/bits/stat.h \ /usr/include/libgnomeui-2.0/libgnomeui/gnome-stock-icons.h \ /usr/include/libgnomeui-2.0/libgnomeui/gnome-scores.h \ @@ -428,9 +460,10 @@ main.o main.o: main.c ../config.h /usr/include/libgnomeui-2.0/gnome.h \ /usr/include/libgnomeui-2.0/libgnomeui/gnome-help.h \ /usr/include/libgnomeui-2.0/libgnomeui/gnome-url.h interface.h \ support.h eggtrayicon.h /usr/include/gtk-2.0/gdk/gdkx.h \ - /usr/include/gtk-2.0/gdk/gdkprivate.h /usr/X11R6/include/X11/Xlib.h \ - /usr/X11R6/include/X11/X.h /usr/X11R6/include/X11/Xfuncproto.h \ - /usr/X11R6/include/X11/Xosdefs.h /usr/X11R6/include/X11/Xutil.h \ + /usr/include/gtk-2.0/gdk/gdkprivate.h /usr/include/X11/Xlib.h \ + /usr/include/X11/X.h /usr/include/X11/Xfuncproto.h \ + /usr/include/X11/Xosdefs.h /usr/include/X11/Xutil.h \ + /usr/include/X11/keysym.h /usr/include/X11/keysymdef.h \ /usr/include/gconf/2/gconf/gconf-client.h \ /usr/include/gconf/2/gconf/gconf.h \ /usr/include/gconf/2/gconf/gconf-schema.h \ @@ -450,8 +483,14 @@ main.o main.o: main.c ../config.h /usr/include/libgnomeui-2.0/gnome.h \ /usr/include/gtk-2.0/gdk/gdk.h: +/usr/include/gtk-2.0/gdk/gdkcairo.h: + /usr/include/gtk-2.0/gdk/gdkcolor.h: +/usr/include/cairo/cairo.h: + +/usr/include/cairo/cairo-features.h: + /usr/include/gtk-2.0/gdk/gdktypes.h: /usr/include/glib-2.0/glib.h: @@ -464,11 +503,11 @@ main.o main.o: main.c ../config.h /usr/include/libgnomeui-2.0/gnome.h \ /usr/include/glib-2.0/glib/gmacros.h: -/usr/lib/gcc/i586-mandrake-linux-gnu/3.4.3/include/stddef.h: +/usr/lib/gcc/i686-pc-linux-gnu/4.1.1/include/stddef.h: -/usr/lib/gcc/i586-mandrake-linux-gnu/3.4.3/include/limits.h: +/usr/lib/gcc/i686-pc-linux-gnu/4.1.1/include/limits.h: -/usr/lib/gcc/i586-mandrake-linux-gnu/3.4.3/include/syslimits.h: +/usr/lib/gcc/i686-pc-linux-gnu/4.1.1/include/syslimits.h: /usr/include/limits.h: @@ -476,8 +515,12 @@ main.o main.o: main.c ../config.h /usr/include/libgnomeui-2.0/gnome.h \ /usr/include/sys/cdefs.h: +/usr/include/bits/wordsize.h: + /usr/include/gnu/stubs.h: +/usr/include/gnu/stubs-32.h: + /usr/include/bits/posix1_lim.h: /usr/include/bits/local_lim.h: @@ -486,7 +529,7 @@ main.o main.o: main.c ../config.h /usr/include/libgnomeui-2.0/gnome.h \ /usr/include/bits/posix2_lim.h: -/usr/lib/gcc/i586-mandrake-linux-gnu/3.4.3/include/float.h: +/usr/lib/gcc/i686-pc-linux-gnu/4.1.1/include/float.h: /usr/include/glib-2.0/glib/garray.h: @@ -502,12 +545,26 @@ main.o main.o: main.c ../config.h /usr/include/libgnomeui-2.0/gnome.h \ /usr/include/glib-2.0/glib/gbacktrace.h: +/usr/include/glib-2.0/glib/gbase64.h: + +/usr/include/glib-2.0/glib/gbookmarkfile.h: + +/usr/include/time.h: + +/usr/include/bits/time.h: + +/usr/include/bits/types.h: + +/usr/include/bits/typesizes.h: + /usr/include/glib-2.0/glib/gcache.h: /usr/include/glib-2.0/glib/glist.h: /usr/include/glib-2.0/glib/gmem.h: +/usr/include/glib-2.0/glib/gslice.h: + /usr/include/glib-2.0/glib/gcompletion.h: /usr/include/glib-2.0/glib/gconvert.h: @@ -536,10 +593,12 @@ main.o main.o: main.c ../config.h /usr/include/libgnomeui-2.0/gnome.h \ /usr/include/glib-2.0/glib/gutils.h: -/usr/lib/gcc/i586-mandrake-linux-gnu/3.4.3/include/stdarg.h: +/usr/lib/gcc/i686-pc-linux-gnu/4.1.1/include/stdarg.h: /usr/include/glib-2.0/glib/gkeyfile.h: +/usr/include/glib-2.0/glib/gmappedfile.h: + /usr/include/glib-2.0/glib/gmarkup.h: /usr/include/glib-2.0/glib/gmessages.h: @@ -644,7 +703,9 @@ main.o main.o: main.c ../config.h /usr/include/libgnomeui-2.0/gnome.h \ /usr/lib/gtk-2.0/include/gdkconfig.h: -/usr/include/gtk-2.0/gdk/gdkcursor.h: +/usr/include/gtk-2.0/gdk/gdkpixbuf.h: + +/usr/include/gtk-2.0/gdk/gdkrgb.h: /usr/include/gtk-2.0/gdk-pixbuf/gdk-pixbuf.h: @@ -656,16 +717,12 @@ main.o main.o: main.c ../config.h /usr/include/libgnomeui-2.0/gnome.h \ /usr/include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-animation.h: +/usr/include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-simple-anim.h: + /usr/include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-io.h: /usr/include/stdio.h: -/usr/include/bits/types.h: - -/usr/include/bits/wordsize.h: - -/usr/include/bits/typesizes.h: - /usr/include/libio.h: /usr/include/_G_config.h: @@ -688,6 +745,10 @@ main.o main.o: main.c ../config.h /usr/include/libgnomeui-2.0/gnome.h \ /usr/include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-enum-types.h: +/usr/include/pango-1.0/pango/pangocairo.h: + +/usr/include/gtk-2.0/gdk/gdkcursor.h: + /usr/include/gtk-2.0/gdk/gdkdisplay.h: /usr/include/gtk-2.0/gdk/gdkevents.h: @@ -700,8 +761,6 @@ main.o main.o: main.c ../config.h /usr/include/libgnomeui-2.0/gnome.h \ /usr/include/gtk-2.0/gdk/gdkgc.h: -/usr/include/gtk-2.0/gdk/gdkrgb.h: - /usr/include/gtk-2.0/gdk/gdkenumtypes.h: /usr/include/gtk-2.0/gdk/gdkfont.h: @@ -714,8 +773,6 @@ main.o main.o: main.c ../config.h /usr/include/libgnomeui-2.0/gnome.h \ /usr/include/gtk-2.0/gdk/gdkpango.h: -/usr/include/gtk-2.0/gdk/gdkpixbuf.h: - /usr/include/gtk-2.0/gdk/gdkpixmap.h: /usr/include/gtk-2.0/gdk/gdkproperty.h: @@ -802,6 +859,8 @@ main.o main.o: main.c ../config.h /usr/include/libgnomeui-2.0/gnome.h \ /usr/include/atk-1.0/atk/atkhyperlink.h: +/usr/include/atk-1.0/atk/atkhyperlinkimpl.h: + /usr/include/atk-1.0/atk/atkhypertext.h: /usr/include/atk-1.0/atk/atkimage.h: @@ -844,6 +903,8 @@ main.o main.o: main.c ../config.h /usr/include/libgnomeui-2.0/gnome.h \ /usr/include/gtk-2.0/gtk/gtkframe.h: +/usr/include/gtk-2.0/gtk/gtkassistant.h: + /usr/include/gtk-2.0/gtk/gtkbbox.h: /usr/include/gtk-2.0/gtk/gtkbox.h: @@ -872,6 +933,10 @@ main.o main.o: main.c ../config.h /usr/include/libgnomeui-2.0/gnome.h \ /usr/include/gtk-2.0/gtk/gtktreesortable.h: +/usr/include/gtk-2.0/gtk/gtkcellrendereraccel.h: + +/usr/include/gtk-2.0/gtk/gtkcellrenderertext.h: + /usr/include/gtk-2.0/gtk/gtkcellrenderercombo.h: /usr/include/gtk-2.0/gtk/gtkcellrenderertext.h: @@ -880,6 +945,8 @@ main.o main.o: main.c ../config.h /usr/include/libgnomeui-2.0/gnome.h \ /usr/include/gtk-2.0/gtk/gtkcellrendererprogress.h: +/usr/include/gtk-2.0/gtk/gtkcellrendererspin.h: + /usr/include/gtk-2.0/gtk/gtkcellrenderertoggle.h: /usr/include/gtk-2.0/gtk/gtkcellview.h: @@ -898,6 +965,12 @@ main.o main.o: main.c ../config.h /usr/include/libgnomeui-2.0/gnome.h \ /usr/include/gtk-2.0/gtk/gtkselection.h: +/usr/include/gtk-2.0/gtk/gtktextiter.h: + +/usr/include/gtk-2.0/gtk/gtktexttag.h: + +/usr/include/gtk-2.0/gtk/gtktextchild.h: + /usr/include/gtk-2.0/gtk/gtkclist.h: /usr/include/gtk-2.0/gtk/gtkhscrollbar.h: @@ -926,18 +999,10 @@ main.o main.o: main.c ../config.h /usr/include/libgnomeui-2.0/gnome.h \ /usr/include/gtk-2.0/gtk/gtkdnd.h: -/usr/include/gtk-2.0/gtk/gtkcomboboxentry.h: - -/usr/include/gtk-2.0/gtk/gtkctree.h: - -/usr/include/gtk-2.0/gtk/gtkcurve.h: - -/usr/include/gtk-2.0/gtk/gtkdrawingarea.h: +/usr/include/gtk-2.0/gtk/gtkentry.h: /usr/include/gtk-2.0/gtk/gtkeditable.h: -/usr/include/gtk-2.0/gtk/gtkentry.h: - /usr/include/gtk-2.0/gtk/gtkimcontext.h: /usr/include/gtk-2.0/gtk/gtkentrycompletion.h: @@ -946,6 +1011,14 @@ main.o main.o: main.c ../config.h /usr/include/libgnomeui-2.0/gnome.h \ /usr/include/gtk-2.0/gtk/gtktreemodelfilter.h: +/usr/include/gtk-2.0/gtk/gtkcomboboxentry.h: + +/usr/include/gtk-2.0/gtk/gtkctree.h: + +/usr/include/gtk-2.0/gtk/gtkcurve.h: + +/usr/include/gtk-2.0/gtk/gtkdrawingarea.h: + /usr/include/gtk-2.0/gtk/gtkeventbox.h: /usr/include/gtk-2.0/gtk/gtkexpander.h: @@ -1012,6 +1085,8 @@ main.o main.o: main.c ../config.h /usr/include/libgnomeui-2.0/gnome.h \ /usr/include/gtk-2.0/gtk/gtklayout.h: +/usr/include/gtk-2.0/gtk/gtklinkbutton.h: + /usr/include/gtk-2.0/gtk/gtklist.h: /usr/include/gtk-2.0/gtk/gtklistitem.h: @@ -1048,6 +1123,24 @@ main.o main.o: main.c ../config.h /usr/include/libgnomeui-2.0/gnome.h \ /usr/include/gtk-2.0/gtk/gtkpreview.h: +/usr/include/gtk-2.0/gtk/gtkprintoperation.h: + +/usr/include/gtk-2.0/gtk/gtkmain.h: + +/usr/include/gtk-2.0/gtk/gtkenums.h: + +/usr/include/gtk-2.0/gtk/gtkwindow.h: + +/usr/include/gtk-2.0/gtk/gtkpagesetup.h: + +/usr/include/gtk-2.0/gtk/gtkpapersize.h: + +/usr/include/gtk-2.0/gtk/gtkprintsettings.h: + +/usr/include/gtk-2.0/gtk/gtkprintcontext.h: + +/usr/include/gtk-2.0/gtk/gtkprintoperationpreview.h: + /usr/include/gtk-2.0/gtk/gtkprogress.h: /usr/include/gtk-2.0/gtk/gtkprogressbar.h: @@ -1066,6 +1159,24 @@ main.o main.o: main.c ../config.h /usr/include/libgnomeui-2.0/gnome.h \ /usr/include/gtk-2.0/gtk/gtktoolbutton.h: +/usr/include/gtk-2.0/gtk/gtkrecentchooser.h: + +/usr/include/gtk-2.0/gtk/gtkrecentmanager.h: + +/usr/include/gtk-2.0/gtk/gtkrecentfilter.h: + +/usr/include/gtk-2.0/gtk/gtkrecentchooserdialog.h: + +/usr/include/gtk-2.0/gtk/gtkrecentchooser.h: + +/usr/include/gtk-2.0/gtk/gtkrecentchoosermenu.h: + +/usr/include/gtk-2.0/gtk/gtkrecentchooserwidget.h: + +/usr/include/gtk-2.0/gtk/gtkrecentfilter.h: + +/usr/include/gtk-2.0/gtk/gtkrecentmanager.h: + /usr/include/gtk-2.0/gtk/gtkscrolledwindow.h: /usr/include/gtk-2.0/gtk/gtkviewport.h: @@ -1080,6 +1191,8 @@ main.o main.o: main.c ../config.h /usr/include/libgnomeui-2.0/gnome.h \ /usr/include/gtk-2.0/gtk/gtkstatusbar.h: +/usr/include/gtk-2.0/gtk/gtkstatusicon.h: + /usr/include/gtk-2.0/gtk/gtkstock.h: /usr/include/gtk-2.0/gtk/gtktable.h: @@ -1092,14 +1205,10 @@ main.o main.o: main.c ../config.h /usr/include/libgnomeui-2.0/gnome.h \ /usr/include/gtk-2.0/gtk/gtktexttagtable.h: -/usr/include/gtk-2.0/gtk/gtktexttag.h: - -/usr/include/gtk-2.0/gtk/gtktextiter.h: - -/usr/include/gtk-2.0/gtk/gtktextchild.h: - /usr/include/gtk-2.0/gtk/gtktextmark.h: +/usr/include/gtk-2.0/gtk/gtktextbufferrichtext.h: + /usr/include/gtk-2.0/gtk/gtktextview.h: /usr/include/gtk-2.0/gtk/gtktipsquery.h: @@ -1142,8 +1251,6 @@ main.o main.o: main.c ../config.h /usr/include/libgnomeui-2.0/gnome.h \ /usr/include/libgnome-2.0/libgnome/gnome-program.h: -/usr/include/popt.h: - /usr/include/errno.h: /usr/include/bits/errno.h: @@ -1156,6 +1263,8 @@ main.o main.o: main.c ../config.h /usr/include/libgnomeui-2.0/gnome.h \ /usr/include/asm-generic/errno-base.h: +/usr/include/popt.h: + /usr/include/libgnome-2.0/libgnome/gnome-i18n.h: /usr/include/libbonobo-2.0/bonobo/bonobo-i18n.h: @@ -1184,10 +1293,6 @@ main.o main.o: main.c ../config.h /usr/include/libgnomeui-2.0/gnome.h \ /usr/include/libgnome-2.0/libgnome/gnome-score.h: -/usr/include/time.h: - -/usr/include/bits/time.h: - /usr/include/libgnome-2.0/libgnome/gnome-exec.h: /usr/include/libgnome-2.0/libgnome/gnome-util.h: @@ -1210,8 +1315,6 @@ main.o main.o: main.c ../config.h /usr/include/libgnomeui-2.0/gnome.h \ /usr/include/bits/pthreadtypes.h: -/usr/include/bits/sched.h: - /usr/include/alloca.h: /usr/include/libgnome-2.0/libgnome/gnome-url.h: @@ -1224,10 +1327,6 @@ main.o main.o: main.c ../config.h /usr/include/libgnomeui-2.0/gnome.h \ /usr/include/libart-2.0/libart_lgpl/art_config.h: -/usr/include/multiarch-dispatch.h: - -/usr/include/multiarch-i386-linux/libart-2.0/libart_lgpl/art_config.h: - /usr/include/libart-2.0/libart_lgpl/art_rect.h: /usr/include/libart-2.0/libart_lgpl/art_svp.h: @@ -1268,6 +1367,12 @@ main.o main.o: main.c ../config.h /usr/include/libgnomeui-2.0/gnome.h \ /usr/include/libart-2.0/libart_lgpl/art_svp_vpath_stroke.h: +/usr/include/libgnomecanvas-2.0/libgnomecanvas/gnome-canvas-clipgroup.h: + +/usr/include/libart-2.0/libart_lgpl/art_svp_wind.h: + +/usr/include/libart-2.0/libart_lgpl/art_vpath_dash.h: + /usr/include/libgnomeui-2.0/libgnomeui/libgnomeui.h: /usr/include/libgnomeui-2.0/libgnomeui/gnome-uidefs.h: @@ -1328,12 +1433,14 @@ main.o main.o: main.c ../config.h /usr/include/libgnomeui-2.0/gnome.h \ /usr/include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-file-size.h: -/usr/include/multiarch-i386-linux/gnome-vfs-2.0/libgnomevfs/gnome-vfs-file-size.h: - /usr/include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-result.h: /usr/include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-uri.h: +/usr/include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-acl.h: + +/usr/include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-ace.h: + /usr/include/sys/stat.h: /usr/include/bits/stat.h: @@ -1424,15 +1531,19 @@ eggtrayicon.h: /usr/include/gtk-2.0/gdk/gdkprivate.h: -/usr/X11R6/include/X11/Xlib.h: +/usr/include/X11/Xlib.h: + +/usr/include/X11/X.h: + +/usr/include/X11/Xfuncproto.h: -/usr/X11R6/include/X11/X.h: +/usr/include/X11/Xosdefs.h: -/usr/X11R6/include/X11/Xfuncproto.h: +/usr/include/X11/Xutil.h: -/usr/X11R6/include/X11/Xosdefs.h: +/usr/include/X11/keysym.h: -/usr/X11R6/include/X11/Xutil.h: +/usr/include/X11/keysymdef.h: /usr/include/gconf/2/gconf/gconf-client.h: diff --git a/projects/gvpndialer/trunk/src/.deps/support.Po b/projects/gvpndialer/trunk/src/.deps/support.Po index cc9eb10..8384299 100644 --- a/projects/gvpndialer/trunk/src/.deps/support.Po +++ b/projects/gvpndialer/trunk/src/.deps/support.Po @@ -1,42 +1,46 @@ support.o support.o: support.c ../config.h /usr/include/sys/types.h \ /usr/include/features.h /usr/include/sys/cdefs.h \ - /usr/include/gnu/stubs.h /usr/include/bits/types.h \ - /usr/include/bits/wordsize.h \ - /usr/lib/gcc/i586-mandrake-linux-gnu/3.4.3/include/stddef.h \ + /usr/include/bits/wordsize.h /usr/include/gnu/stubs.h \ + /usr/include/gnu/stubs-32.h /usr/include/bits/types.h \ + /usr/lib/gcc/i686-pc-linux-gnu/4.1.1/include/stddef.h \ /usr/include/bits/typesizes.h /usr/include/time.h /usr/include/endian.h \ /usr/include/bits/endian.h /usr/include/sys/select.h \ /usr/include/bits/select.h /usr/include/bits/sigset.h \ /usr/include/bits/time.h /usr/include/sys/sysmacros.h \ - /usr/include/bits/pthreadtypes.h /usr/include/bits/sched.h \ - /usr/include/sys/stat.h /usr/include/bits/stat.h /usr/include/unistd.h \ + /usr/include/bits/pthreadtypes.h /usr/include/sys/stat.h \ + /usr/include/bits/stat.h /usr/include/unistd.h \ /usr/include/bits/posix_opt.h /usr/include/bits/confname.h \ /usr/include/getopt.h /usr/include/string.h /usr/include/bits/string.h \ /usr/include/bits/string2.h /usr/include/stdlib.h /usr/include/stdio.h \ /usr/include/libio.h /usr/include/_G_config.h /usr/include/wchar.h \ /usr/include/bits/wchar.h /usr/include/gconv.h \ - /usr/lib/gcc/i586-mandrake-linux-gnu/3.4.3/include/stdarg.h \ + /usr/lib/gcc/i686-pc-linux-gnu/4.1.1/include/stdarg.h \ /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \ /usr/include/bits/stdio.h /usr/include/libgnomeui-2.0/gnome.h \ /usr/include/gtk-2.0/gtk/gtk.h /usr/include/gtk-2.0/gdk/gdk.h \ - /usr/include/gtk-2.0/gdk/gdkcolor.h /usr/include/gtk-2.0/gdk/gdktypes.h \ - /usr/include/glib-2.0/glib.h /usr/include/glib-2.0/glib/galloca.h \ + /usr/include/gtk-2.0/gdk/gdkcairo.h /usr/include/gtk-2.0/gdk/gdkcolor.h \ + /usr/include/cairo/cairo.h /usr/include/cairo/cairo-features.h \ + /usr/include/gtk-2.0/gdk/gdktypes.h /usr/include/glib-2.0/glib.h \ + /usr/include/glib-2.0/glib/galloca.h \ /usr/include/glib-2.0/glib/gtypes.h \ /usr/lib/glib-2.0/include/glibconfig.h \ /usr/include/glib-2.0/glib/gmacros.h \ - /usr/lib/gcc/i586-mandrake-linux-gnu/3.4.3/include/limits.h \ - /usr/lib/gcc/i586-mandrake-linux-gnu/3.4.3/include/syslimits.h \ + /usr/lib/gcc/i686-pc-linux-gnu/4.1.1/include/limits.h \ + /usr/lib/gcc/i686-pc-linux-gnu/4.1.1/include/syslimits.h \ /usr/include/limits.h /usr/include/bits/posix1_lim.h \ /usr/include/bits/local_lim.h /usr/include/linux/limits.h \ /usr/include/bits/posix2_lim.h \ - /usr/lib/gcc/i586-mandrake-linux-gnu/3.4.3/include/float.h \ + /usr/lib/gcc/i686-pc-linux-gnu/4.1.1/include/float.h \ /usr/include/glib-2.0/glib/garray.h \ /usr/include/glib-2.0/glib/gasyncqueue.h \ /usr/include/glib-2.0/glib/gthread.h \ /usr/include/glib-2.0/glib/gerror.h /usr/include/glib-2.0/glib/gquark.h \ /usr/include/glib-2.0/glib/gatomic.h \ /usr/include/glib-2.0/glib/gbacktrace.h \ + /usr/include/glib-2.0/glib/gbase64.h \ + /usr/include/glib-2.0/glib/gbookmarkfile.h \ /usr/include/glib-2.0/glib/gcache.h /usr/include/glib-2.0/glib/glist.h \ - /usr/include/glib-2.0/glib/gmem.h \ + /usr/include/glib-2.0/glib/gmem.h /usr/include/glib-2.0/glib/gslice.h \ /usr/include/glib-2.0/glib/gcompletion.h \ /usr/include/glib-2.0/glib/gconvert.h \ /usr/include/glib-2.0/glib/gdataset.h \ @@ -49,6 +53,7 @@ support.o support.o: support.c ../config.h /usr/include/sys/types.h \ /usr/include/glib-2.0/glib/gunicode.h \ /usr/include/glib-2.0/glib/gutils.h \ /usr/include/glib-2.0/glib/gkeyfile.h \ + /usr/include/glib-2.0/glib/gmappedfile.h \ /usr/include/glib-2.0/glib/gmarkup.h \ /usr/include/glib-2.0/glib/gmessages.h \ /usr/include/glib-2.0/glib/gnode.h /usr/include/glib-2.0/glib/goption.h \ @@ -96,27 +101,28 @@ support.o support.o: support.c ../config.h /usr/include/sys/types.h \ /usr/include/pango-1.0/pango/pango-tabs.h \ /usr/include/pango-1.0/pango/pango-renderer.h \ /usr/lib/gtk-2.0/include/gdkconfig.h \ - /usr/include/gtk-2.0/gdk/gdkcursor.h \ + /usr/include/gtk-2.0/gdk/gdkpixbuf.h /usr/include/gtk-2.0/gdk/gdkrgb.h \ /usr/include/gtk-2.0/gdk-pixbuf/gdk-pixbuf.h \ /usr/include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-features.h \ /usr/include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-core.h \ /usr/include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-transform.h \ /usr/include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-animation.h \ + /usr/include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-simple-anim.h \ /usr/include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-io.h \ /usr/include/glib-2.0/gmodule.h \ /usr/include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-loader.h \ /usr/include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-enum-types.h \ + /usr/include/pango-1.0/pango/pangocairo.h \ + /usr/include/gtk-2.0/gdk/gdkcursor.h \ /usr/include/gtk-2.0/gdk/gdkdisplay.h \ /usr/include/gtk-2.0/gdk/gdkevents.h /usr/include/gtk-2.0/gdk/gdkdnd.h \ /usr/include/gtk-2.0/gdk/gdkinput.h \ /usr/include/gtk-2.0/gdk/gdkdrawable.h /usr/include/gtk-2.0/gdk/gdkgc.h \ - /usr/include/gtk-2.0/gdk/gdkrgb.h \ /usr/include/gtk-2.0/gdk/gdkenumtypes.h \ /usr/include/gtk-2.0/gdk/gdkfont.h /usr/include/gtk-2.0/gdk/gdkimage.h \ /usr/include/gtk-2.0/gdk/gdkkeys.h \ /usr/include/gtk-2.0/gdk/gdkdisplaymanager.h \ /usr/include/gtk-2.0/gdk/gdkpango.h \ - /usr/include/gtk-2.0/gdk/gdkpixbuf.h \ /usr/include/gtk-2.0/gdk/gdkpixmap.h \ /usr/include/gtk-2.0/gdk/gdkproperty.h \ /usr/include/gtk-2.0/gdk/gdkregion.h \ @@ -156,6 +162,7 @@ support.o support.o: support.c ../config.h /usr/include/sys/types.h \ /usr/include/atk-1.0/atk/atktext.h \ /usr/include/atk-1.0/atk/atkgobjectaccessible.h \ /usr/include/atk-1.0/atk/atkhyperlink.h \ + /usr/include/atk-1.0/atk/atkhyperlinkimpl.h \ /usr/include/atk-1.0/atk/atkhypertext.h \ /usr/include/atk-1.0/atk/atkimage.h \ /usr/include/atk-1.0/atk/atknoopobject.h \ @@ -175,8 +182,9 @@ support.o support.o: support.c ../config.h /usr/include/sys/types.h \ /usr/include/gtk-2.0/gtk/gtkalignment.h \ /usr/include/gtk-2.0/gtk/gtkarrow.h \ /usr/include/gtk-2.0/gtk/gtkaspectframe.h \ - /usr/include/gtk-2.0/gtk/gtkframe.h /usr/include/gtk-2.0/gtk/gtkbbox.h \ - /usr/include/gtk-2.0/gtk/gtkbox.h \ + /usr/include/gtk-2.0/gtk/gtkframe.h \ + /usr/include/gtk-2.0/gtk/gtkassistant.h \ + /usr/include/gtk-2.0/gtk/gtkbbox.h /usr/include/gtk-2.0/gtk/gtkbox.h \ /usr/include/gtk-2.0/gtk/gtkbindings.h \ /usr/include/gtk-2.0/gtk/gtkbutton.h \ /usr/include/gtk-2.0/gtk/gtkimage.h \ @@ -189,10 +197,13 @@ support.o support.o: support.c ../config.h /usr/include/sys/types.h \ /usr/include/gtk-2.0/gtk/gtktreeviewcolumn.h \ /usr/include/gtk-2.0/gtk/gtktreemodel.h \ /usr/include/gtk-2.0/gtk/gtktreesortable.h \ + /usr/include/gtk-2.0/gtk/gtkcellrendereraccel.h \ + /usr/include/gtk-2.0/gtk/gtkcellrenderertext.h \ /usr/include/gtk-2.0/gtk/gtkcellrenderercombo.h \ /usr/include/gtk-2.0/gtk/gtkcellrenderertext.h \ /usr/include/gtk-2.0/gtk/gtkcellrendererpixbuf.h \ /usr/include/gtk-2.0/gtk/gtkcellrendererprogress.h \ + /usr/include/gtk-2.0/gtk/gtkcellrendererspin.h \ /usr/include/gtk-2.0/gtk/gtkcellrenderertoggle.h \ /usr/include/gtk-2.0/gtk/gtkcellview.h \ /usr/include/gtk-2.0/gtk/gtkcheckbutton.h \ @@ -202,6 +213,9 @@ support.o support.o: support.c ../config.h /usr/include/sys/types.h \ /usr/include/gtk-2.0/gtk/gtkitem.h \ /usr/include/gtk-2.0/gtk/gtkclipboard.h \ /usr/include/gtk-2.0/gtk/gtkselection.h \ + /usr/include/gtk-2.0/gtk/gtktextiter.h \ + /usr/include/gtk-2.0/gtk/gtktexttag.h \ + /usr/include/gtk-2.0/gtk/gtktextchild.h \ /usr/include/gtk-2.0/gtk/gtkclist.h \ /usr/include/gtk-2.0/gtk/gtkhscrollbar.h \ /usr/include/gtk-2.0/gtk/gtkscrollbar.h \ @@ -214,16 +228,15 @@ support.o support.o: support.c ../config.h /usr/include/sys/types.h \ /usr/include/gtk-2.0/gtk/gtkcombo.h /usr/include/gtk-2.0/gtk/gtkhbox.h \ /usr/include/gtk-2.0/gtk/gtkcombobox.h \ /usr/include/gtk-2.0/gtk/gtktreeview.h \ - /usr/include/gtk-2.0/gtk/gtkdnd.h \ - /usr/include/gtk-2.0/gtk/gtkcomboboxentry.h \ - /usr/include/gtk-2.0/gtk/gtkctree.h /usr/include/gtk-2.0/gtk/gtkcurve.h \ - /usr/include/gtk-2.0/gtk/gtkdrawingarea.h \ + /usr/include/gtk-2.0/gtk/gtkdnd.h /usr/include/gtk-2.0/gtk/gtkentry.h \ /usr/include/gtk-2.0/gtk/gtkeditable.h \ - /usr/include/gtk-2.0/gtk/gtkentry.h \ /usr/include/gtk-2.0/gtk/gtkimcontext.h \ /usr/include/gtk-2.0/gtk/gtkentrycompletion.h \ /usr/include/gtk-2.0/gtk/gtkliststore.h \ /usr/include/gtk-2.0/gtk/gtktreemodelfilter.h \ + /usr/include/gtk-2.0/gtk/gtkcomboboxentry.h \ + /usr/include/gtk-2.0/gtk/gtkctree.h /usr/include/gtk-2.0/gtk/gtkcurve.h \ + /usr/include/gtk-2.0/gtk/gtkdrawingarea.h \ /usr/include/gtk-2.0/gtk/gtkeventbox.h \ /usr/include/gtk-2.0/gtk/gtkexpander.h \ /usr/include/gtk-2.0/gtk/gtkfilesel.h \ @@ -255,7 +268,9 @@ support.o support.o: support.c ../config.h /usr/include/sys/types.h \ /usr/include/gtk-2.0/gtk/gtkimmulticontext.h \ /usr/include/gtk-2.0/gtk/gtkinputdialog.h \ /usr/include/gtk-2.0/gtk/gtkinvisible.h \ - /usr/include/gtk-2.0/gtk/gtklayout.h /usr/include/gtk-2.0/gtk/gtklist.h \ + /usr/include/gtk-2.0/gtk/gtklayout.h \ + /usr/include/gtk-2.0/gtk/gtklinkbutton.h \ + /usr/include/gtk-2.0/gtk/gtklist.h \ /usr/include/gtk-2.0/gtk/gtklistitem.h \ /usr/include/gtk-2.0/gtk/gtkmain.h \ /usr/include/gtk-2.0/gtk/gtkmenubar.h \ @@ -272,6 +287,14 @@ support.o support.o: support.c ../config.h /usr/include/sys/types.h \ /usr/include/gtk-2.0/gtk/gtkpixmap.h /usr/include/gtk-2.0/gtk/gtkplug.h \ /usr/include/gtk-2.0/gtk/gtksocket.h \ /usr/include/gtk-2.0/gtk/gtkpreview.h \ + /usr/include/gtk-2.0/gtk/gtkprintoperation.h \ + /usr/include/gtk-2.0/gtk/gtkmain.h /usr/include/gtk-2.0/gtk/gtkenums.h \ + /usr/include/gtk-2.0/gtk/gtkwindow.h \ + /usr/include/gtk-2.0/gtk/gtkpagesetup.h \ + /usr/include/gtk-2.0/gtk/gtkpapersize.h \ + /usr/include/gtk-2.0/gtk/gtkprintsettings.h \ + /usr/include/gtk-2.0/gtk/gtkprintcontext.h \ + /usr/include/gtk-2.0/gtk/gtkprintoperationpreview.h \ /usr/include/gtk-2.0/gtk/gtkprogress.h \ /usr/include/gtk-2.0/gtk/gtkprogressbar.h \ /usr/include/gtk-2.0/gtk/gtkradioaction.h \ @@ -281,6 +304,15 @@ support.o support.o: support.c ../config.h /usr/include/sys/types.h \ /usr/include/gtk-2.0/gtk/gtkradiotoolbutton.h \ /usr/include/gtk-2.0/gtk/gtktoggletoolbutton.h \ /usr/include/gtk-2.0/gtk/gtktoolbutton.h \ + /usr/include/gtk-2.0/gtk/gtkrecentchooser.h \ + /usr/include/gtk-2.0/gtk/gtkrecentmanager.h \ + /usr/include/gtk-2.0/gtk/gtkrecentfilter.h \ + /usr/include/gtk-2.0/gtk/gtkrecentchooserdialog.h \ + /usr/include/gtk-2.0/gtk/gtkrecentchooser.h \ + /usr/include/gtk-2.0/gtk/gtkrecentchoosermenu.h \ + /usr/include/gtk-2.0/gtk/gtkrecentchooserwidget.h \ + /usr/include/gtk-2.0/gtk/gtkrecentfilter.h \ + /usr/include/gtk-2.0/gtk/gtkrecentmanager.h \ /usr/include/gtk-2.0/gtk/gtkscrolledwindow.h \ /usr/include/gtk-2.0/gtk/gtkviewport.h \ /usr/include/gtk-2.0/gtk/gtkseparatormenuitem.h \ @@ -288,15 +320,14 @@ support.o support.o: support.c ../config.h /usr/include/sys/types.h \ /usr/include/gtk-2.0/gtk/gtksizegroup.h \ /usr/include/gtk-2.0/gtk/gtkspinbutton.h \ /usr/include/gtk-2.0/gtk/gtkstatusbar.h \ + /usr/include/gtk-2.0/gtk/gtkstatusicon.h \ /usr/include/gtk-2.0/gtk/gtkstock.h /usr/include/gtk-2.0/gtk/gtktable.h \ /usr/include/gtk-2.0/gtk/gtktearoffmenuitem.h \ /usr/include/gtk-2.0/gtk/gtktext.h \ /usr/include/gtk-2.0/gtk/gtktextbuffer.h \ /usr/include/gtk-2.0/gtk/gtktexttagtable.h \ - /usr/include/gtk-2.0/gtk/gtktexttag.h \ - /usr/include/gtk-2.0/gtk/gtktextiter.h \ - /usr/include/gtk-2.0/gtk/gtktextchild.h \ /usr/include/gtk-2.0/gtk/gtktextmark.h \ + /usr/include/gtk-2.0/gtk/gtktextbufferrichtext.h \ /usr/include/gtk-2.0/gtk/gtktextview.h \ /usr/include/gtk-2.0/gtk/gtktipsquery.h \ /usr/include/gtk-2.0/gtk/gtktoggletoolbutton.h \ @@ -317,10 +348,10 @@ support.o support.o: support.c ../config.h /usr/include/sys/types.h \ /usr/include/gtk-2.0/gtk/gtkvscale.h \ /usr/include/gtk-2.0/gtk/gtkvseparator.h \ /usr/include/libgnome-2.0/libgnome/libgnome.h \ - /usr/include/libgnome-2.0/libgnome/gnome-program.h /usr/include/popt.h \ - /usr/include/errno.h /usr/include/bits/errno.h \ - /usr/include/linux/errno.h /usr/include/asm/errno.h \ - /usr/include/asm-generic/errno.h /usr/include/asm-generic/errno-base.h \ + /usr/include/libgnome-2.0/libgnome/gnome-program.h /usr/include/errno.h \ + /usr/include/bits/errno.h /usr/include/linux/errno.h \ + /usr/include/asm/errno.h /usr/include/asm-generic/errno.h \ + /usr/include/asm-generic/errno-base.h /usr/include/popt.h \ /usr/include/libgnome-2.0/libgnome/gnome-i18n.h \ /usr/include/libbonobo-2.0/bonobo/bonobo-i18n.h /usr/include/libintl.h \ /usr/include/locale.h /usr/include/bits/locale.h \ @@ -340,8 +371,6 @@ support.o support.o: support.c ../config.h /usr/include/sys/types.h \ /usr/include/libgnomecanvas-2.0/libgnomecanvas/gnome-canvas.h \ /usr/include/libart-2.0/libart_lgpl/art_misc.h \ /usr/include/libart-2.0/libart_lgpl/art_config.h \ - /usr/include/multiarch-dispatch.h \ - /usr/include/multiarch-i386-linux/libart-2.0/libart_lgpl/art_config.h \ /usr/include/libart-2.0/libart_lgpl/art_rect.h \ /usr/include/libart-2.0/libart_lgpl/art_svp.h \ /usr/include/libart-2.0/libart_lgpl/art_point.h \ @@ -362,6 +391,9 @@ support.o support.o: support.c ../config.h /usr/include/sys/types.h \ /usr/include/libgnomecanvas-2.0/libgnomecanvas/gnome-canvas-util.h \ /usr/include/libart-2.0/libart_lgpl/art_vpath.h \ /usr/include/libart-2.0/libart_lgpl/art_svp_vpath_stroke.h \ + /usr/include/libgnomecanvas-2.0/libgnomecanvas/gnome-canvas-clipgroup.h \ + /usr/include/libart-2.0/libart_lgpl/art_svp_wind.h \ + /usr/include/libart-2.0/libart_lgpl/art_vpath_dash.h \ /usr/include/libgnomeui-2.0/libgnomeui/libgnomeui.h \ /usr/include/libgnomeui-2.0/libgnomeui/gnome-uidefs.h \ /usr/include/gtk-2.0/gdk/gdkkeysyms.h \ @@ -392,9 +424,10 @@ support.o support.o: support.c ../config.h /usr/include/sys/types.h \ /usr/include/libgnomeui-2.0/libgnomeui/gnome-icon-lookup.h \ /usr/include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-file-info.h \ /usr/include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-file-size.h \ - /usr/include/multiarch-i386-linux/gnome-vfs-2.0/libgnomevfs/gnome-vfs-file-size.h \ /usr/include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-result.h \ /usr/include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-uri.h \ + /usr/include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-acl.h \ + /usr/include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-ace.h \ /usr/include/libgnomeui-2.0/libgnomeui/gnome-stock-icons.h \ /usr/include/libgnomeui-2.0/libgnomeui/gnome-scores.h \ /usr/include/libgnomeui-2.0/libgnomeui/gnome-client.h \ @@ -435,13 +468,15 @@ support.o support.o: support.c ../config.h /usr/include/sys/types.h \ /usr/include/sys/cdefs.h: +/usr/include/bits/wordsize.h: + /usr/include/gnu/stubs.h: -/usr/include/bits/types.h: +/usr/include/gnu/stubs-32.h: -/usr/include/bits/wordsize.h: +/usr/include/bits/types.h: -/usr/lib/gcc/i586-mandrake-linux-gnu/3.4.3/include/stddef.h: +/usr/lib/gcc/i686-pc-linux-gnu/4.1.1/include/stddef.h: /usr/include/bits/typesizes.h: @@ -463,8 +498,6 @@ support.o support.o: support.c ../config.h /usr/include/sys/types.h \ /usr/include/bits/pthreadtypes.h: -/usr/include/bits/sched.h: - /usr/include/sys/stat.h: /usr/include/bits/stat.h: @@ -497,7 +530,7 @@ support.o support.o: support.c ../config.h /usr/include/sys/types.h \ /usr/include/gconv.h: -/usr/lib/gcc/i586-mandrake-linux-gnu/3.4.3/include/stdarg.h: +/usr/lib/gcc/i686-pc-linux-gnu/4.1.1/include/stdarg.h: /usr/include/bits/stdio_lim.h: @@ -511,8 +544,14 @@ support.o support.o: support.c ../config.h /usr/include/sys/types.h \ /usr/include/gtk-2.0/gdk/gdk.h: +/usr/include/gtk-2.0/gdk/gdkcairo.h: + /usr/include/gtk-2.0/gdk/gdkcolor.h: +/usr/include/cairo/cairo.h: + +/usr/include/cairo/cairo-features.h: + /usr/include/gtk-2.0/gdk/gdktypes.h: /usr/include/glib-2.0/glib.h: @@ -525,9 +564,9 @@ support.o support.o: support.c ../config.h /usr/include/sys/types.h \ /usr/include/glib-2.0/glib/gmacros.h: -/usr/lib/gcc/i586-mandrake-linux-gnu/3.4.3/include/limits.h: +/usr/lib/gcc/i686-pc-linux-gnu/4.1.1/include/limits.h: -/usr/lib/gcc/i586-mandrake-linux-gnu/3.4.3/include/syslimits.h: +/usr/lib/gcc/i686-pc-linux-gnu/4.1.1/include/syslimits.h: /usr/include/limits.h: @@ -539,7 +578,7 @@ support.o support.o: support.c ../config.h /usr/include/sys/types.h \ /usr/include/bits/posix2_lim.h: -/usr/lib/gcc/i586-mandrake-linux-gnu/3.4.3/include/float.h: +/usr/lib/gcc/i686-pc-linux-gnu/4.1.1/include/float.h: /usr/include/glib-2.0/glib/garray.h: @@ -555,12 +594,18 @@ support.o support.o: support.c ../config.h /usr/include/sys/types.h \ /usr/include/glib-2.0/glib/gbacktrace.h: +/usr/include/glib-2.0/glib/gbase64.h: + +/usr/include/glib-2.0/glib/gbookmarkfile.h: + /usr/include/glib-2.0/glib/gcache.h: /usr/include/glib-2.0/glib/glist.h: /usr/include/glib-2.0/glib/gmem.h: +/usr/include/glib-2.0/glib/gslice.h: + /usr/include/glib-2.0/glib/gcompletion.h: /usr/include/glib-2.0/glib/gconvert.h: @@ -591,6 +636,8 @@ support.o support.o: support.c ../config.h /usr/include/sys/types.h \ /usr/include/glib-2.0/glib/gkeyfile.h: +/usr/include/glib-2.0/glib/gmappedfile.h: + /usr/include/glib-2.0/glib/gmarkup.h: /usr/include/glib-2.0/glib/gmessages.h: @@ -695,7 +742,9 @@ support.o support.o: support.c ../config.h /usr/include/sys/types.h \ /usr/lib/gtk-2.0/include/gdkconfig.h: -/usr/include/gtk-2.0/gdk/gdkcursor.h: +/usr/include/gtk-2.0/gdk/gdkpixbuf.h: + +/usr/include/gtk-2.0/gdk/gdkrgb.h: /usr/include/gtk-2.0/gdk-pixbuf/gdk-pixbuf.h: @@ -707,6 +756,8 @@ support.o support.o: support.c ../config.h /usr/include/sys/types.h \ /usr/include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-animation.h: +/usr/include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-simple-anim.h: + /usr/include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-io.h: /usr/include/glib-2.0/gmodule.h: @@ -715,6 +766,10 @@ support.o support.o: support.c ../config.h /usr/include/sys/types.h \ /usr/include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-enum-types.h: +/usr/include/pango-1.0/pango/pangocairo.h: + +/usr/include/gtk-2.0/gdk/gdkcursor.h: + /usr/include/gtk-2.0/gdk/gdkdisplay.h: /usr/include/gtk-2.0/gdk/gdkevents.h: @@ -727,8 +782,6 @@ support.o support.o: support.c ../config.h /usr/include/sys/types.h \ /usr/include/gtk-2.0/gdk/gdkgc.h: -/usr/include/gtk-2.0/gdk/gdkrgb.h: - /usr/include/gtk-2.0/gdk/gdkenumtypes.h: /usr/include/gtk-2.0/gdk/gdkfont.h: @@ -741,8 +794,6 @@ support.o support.o: support.c ../config.h /usr/include/sys/types.h \ /usr/include/gtk-2.0/gdk/gdkpango.h: -/usr/include/gtk-2.0/gdk/gdkpixbuf.h: - /usr/include/gtk-2.0/gdk/gdkpixmap.h: /usr/include/gtk-2.0/gdk/gdkproperty.h: @@ -829,6 +880,8 @@ support.o support.o: support.c ../config.h /usr/include/sys/types.h \ /usr/include/atk-1.0/atk/atkhyperlink.h: +/usr/include/atk-1.0/atk/atkhyperlinkimpl.h: + /usr/include/atk-1.0/atk/atkhypertext.h: /usr/include/atk-1.0/atk/atkimage.h: @@ -871,6 +924,8 @@ support.o support.o: support.c ../config.h /usr/include/sys/types.h \ /usr/include/gtk-2.0/gtk/gtkframe.h: +/usr/include/gtk-2.0/gtk/gtkassistant.h: + /usr/include/gtk-2.0/gtk/gtkbbox.h: /usr/include/gtk-2.0/gtk/gtkbox.h: @@ -899,6 +954,10 @@ support.o support.o: support.c ../config.h /usr/include/sys/types.h \ /usr/include/gtk-2.0/gtk/gtktreesortable.h: +/usr/include/gtk-2.0/gtk/gtkcellrendereraccel.h: + +/usr/include/gtk-2.0/gtk/gtkcellrenderertext.h: + /usr/include/gtk-2.0/gtk/gtkcellrenderercombo.h: /usr/include/gtk-2.0/gtk/gtkcellrenderertext.h: @@ -907,6 +966,8 @@ support.o support.o: support.c ../config.h /usr/include/sys/types.h \ /usr/include/gtk-2.0/gtk/gtkcellrendererprogress.h: +/usr/include/gtk-2.0/gtk/gtkcellrendererspin.h: + /usr/include/gtk-2.0/gtk/gtkcellrenderertoggle.h: /usr/include/gtk-2.0/gtk/gtkcellview.h: @@ -925,6 +986,12 @@ support.o support.o: support.c ../config.h /usr/include/sys/types.h \ /usr/include/gtk-2.0/gtk/gtkselection.h: +/usr/include/gtk-2.0/gtk/gtktextiter.h: + +/usr/include/gtk-2.0/gtk/gtktexttag.h: + +/usr/include/gtk-2.0/gtk/gtktextchild.h: + /usr/include/gtk-2.0/gtk/gtkclist.h: /usr/include/gtk-2.0/gtk/gtkhscrollbar.h: @@ -953,18 +1020,10 @@ support.o support.o: support.c ../config.h /usr/include/sys/types.h \ /usr/include/gtk-2.0/gtk/gtkdnd.h: -/usr/include/gtk-2.0/gtk/gtkcomboboxentry.h: - -/usr/include/gtk-2.0/gtk/gtkctree.h: - -/usr/include/gtk-2.0/gtk/gtkcurve.h: - -/usr/include/gtk-2.0/gtk/gtkdrawingarea.h: +/usr/include/gtk-2.0/gtk/gtkentry.h: /usr/include/gtk-2.0/gtk/gtkeditable.h: -/usr/include/gtk-2.0/gtk/gtkentry.h: - /usr/include/gtk-2.0/gtk/gtkimcontext.h: /usr/include/gtk-2.0/gtk/gtkentrycompletion.h: @@ -973,6 +1032,14 @@ support.o support.o: support.c ../config.h /usr/include/sys/types.h \ /usr/include/gtk-2.0/gtk/gtktreemodelfilter.h: +/usr/include/gtk-2.0/gtk/gtkcomboboxentry.h: + +/usr/include/gtk-2.0/gtk/gtkctree.h: + +/usr/include/gtk-2.0/gtk/gtkcurve.h: + +/usr/include/gtk-2.0/gtk/gtkdrawingarea.h: + /usr/include/gtk-2.0/gtk/gtkeventbox.h: /usr/include/gtk-2.0/gtk/gtkexpander.h: @@ -1039,6 +1106,8 @@ support.o support.o: support.c ../config.h /usr/include/sys/types.h \ /usr/include/gtk-2.0/gtk/gtklayout.h: +/usr/include/gtk-2.0/gtk/gtklinkbutton.h: + /usr/include/gtk-2.0/gtk/gtklist.h: /usr/include/gtk-2.0/gtk/gtklistitem.h: @@ -1075,6 +1144,24 @@ support.o support.o: support.c ../config.h /usr/include/sys/types.h \ /usr/include/gtk-2.0/gtk/gtkpreview.h: +/usr/include/gtk-2.0/gtk/gtkprintoperation.h: + +/usr/include/gtk-2.0/gtk/gtkmain.h: + +/usr/include/gtk-2.0/gtk/gtkenums.h: + +/usr/include/gtk-2.0/gtk/gtkwindow.h: + +/usr/include/gtk-2.0/gtk/gtkpagesetup.h: + +/usr/include/gtk-2.0/gtk/gtkpapersize.h: + +/usr/include/gtk-2.0/gtk/gtkprintsettings.h: + +/usr/include/gtk-2.0/gtk/gtkprintcontext.h: + +/usr/include/gtk-2.0/gtk/gtkprintoperationpreview.h: + /usr/include/gtk-2.0/gtk/gtkprogress.h: /usr/include/gtk-2.0/gtk/gtkprogressbar.h: @@ -1093,6 +1180,24 @@ support.o support.o: support.c ../config.h /usr/include/sys/types.h \ /usr/include/gtk-2.0/gtk/gtktoolbutton.h: +/usr/include/gtk-2.0/gtk/gtkrecentchooser.h: + +/usr/include/gtk-2.0/gtk/gtkrecentmanager.h: + +/usr/include/gtk-2.0/gtk/gtkrecentfilter.h: + +/usr/include/gtk-2.0/gtk/gtkrecentchooserdialog.h: + +/usr/include/gtk-2.0/gtk/gtkrecentchooser.h: + +/usr/include/gtk-2.0/gtk/gtkrecentchoosermenu.h: + +/usr/include/gtk-2.0/gtk/gtkrecentchooserwidget.h: + +/usr/include/gtk-2.0/gtk/gtkrecentfilter.h: + +/usr/include/gtk-2.0/gtk/gtkrecentmanager.h: + /usr/include/gtk-2.0/gtk/gtkscrolledwindow.h: /usr/include/gtk-2.0/gtk/gtkviewport.h: @@ -1107,6 +1212,8 @@ support.o support.o: support.c ../config.h /usr/include/sys/types.h \ /usr/include/gtk-2.0/gtk/gtkstatusbar.h: +/usr/include/gtk-2.0/gtk/gtkstatusicon.h: + /usr/include/gtk-2.0/gtk/gtkstock.h: /usr/include/gtk-2.0/gtk/gtktable.h: @@ -1119,14 +1226,10 @@ support.o support.o: support.c ../config.h /usr/include/sys/types.h \ /usr/include/gtk-2.0/gtk/gtktexttagtable.h: -/usr/include/gtk-2.0/gtk/gtktexttag.h: - -/usr/include/gtk-2.0/gtk/gtktextiter.h: - -/usr/include/gtk-2.0/gtk/gtktextchild.h: - /usr/include/gtk-2.0/gtk/gtktextmark.h: +/usr/include/gtk-2.0/gtk/gtktextbufferrichtext.h: + /usr/include/gtk-2.0/gtk/gtktextview.h: /usr/include/gtk-2.0/gtk/gtktipsquery.h: @@ -1169,8 +1272,6 @@ support.o support.o: support.c ../config.h /usr/include/sys/types.h \ /usr/include/libgnome-2.0/libgnome/gnome-program.h: -/usr/include/popt.h: - /usr/include/errno.h: /usr/include/bits/errno.h: @@ -1183,6 +1284,8 @@ support.o support.o: support.c ../config.h /usr/include/sys/types.h \ /usr/include/asm-generic/errno-base.h: +/usr/include/popt.h: + /usr/include/libgnome-2.0/libgnome/gnome-i18n.h: /usr/include/libbonobo-2.0/bonobo/bonobo-i18n.h: @@ -1227,10 +1330,6 @@ support.o support.o: support.c ../config.h /usr/include/sys/types.h \ /usr/include/libart-2.0/libart_lgpl/art_config.h: -/usr/include/multiarch-dispatch.h: - -/usr/include/multiarch-i386-linux/libart-2.0/libart_lgpl/art_config.h: - /usr/include/libart-2.0/libart_lgpl/art_rect.h: /usr/include/libart-2.0/libart_lgpl/art_svp.h: @@ -1271,6 +1370,12 @@ support.o support.o: support.c ../config.h /usr/include/sys/types.h \ /usr/include/libart-2.0/libart_lgpl/art_svp_vpath_stroke.h: +/usr/include/libgnomecanvas-2.0/libgnomecanvas/gnome-canvas-clipgroup.h: + +/usr/include/libart-2.0/libart_lgpl/art_svp_wind.h: + +/usr/include/libart-2.0/libart_lgpl/art_vpath_dash.h: + /usr/include/libgnomeui-2.0/libgnomeui/libgnomeui.h: /usr/include/libgnomeui-2.0/libgnomeui/gnome-uidefs.h: @@ -1331,12 +1436,14 @@ support.o support.o: support.c ../config.h /usr/include/sys/types.h \ /usr/include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-file-size.h: -/usr/include/multiarch-i386-linux/gnome-vfs-2.0/libgnomevfs/gnome-vfs-file-size.h: - /usr/include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-result.h: /usr/include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-uri.h: +/usr/include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-acl.h: + +/usr/include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-ace.h: + /usr/include/libgnomeui-2.0/libgnomeui/gnome-stock-icons.h: /usr/include/libgnomeui-2.0/libgnomeui/gnome-scores.h: diff --git a/projects/gvpndialer/trunk/src/callbacks.c b/projects/gvpndialer/trunk/src/callbacks.c index 7c38631..f6a7bf4 100644 --- a/projects/gvpndialer/trunk/src/callbacks.c +++ b/projects/gvpndialer/trunk/src/callbacks.c @@ -6,459 +6,482 @@ #include "interface.h" #include "support.h" - int authentication_attempts; int vpn_connection_active; pid_t vpnclient_pid; - void on_vpnclient_main_window_show (GtkWidget *widget, - gpointer user_data) +gpointer user_data) { - - /* Initialize variables */ - - gchar *vpn_dir_path = "/etc/opt/cisco-vpnclient/Profiles/"; - gchar *vpnclient_path = "/usr/bin"; - GtkCombo *profile_entry = GTK_COMBO(lookup_widget(widget,"profile_entry")); - GnomeAppBar *statusbar = GNOME_APPBAR(lookup_widget(widget,"statusbar")); - gchar *vpn_default_status = "Status Message"; - gchar *configkey; - GConfClient *client; - - - /* Set default status message */ - gnome_appbar_set_default(statusbar,vpn_default_status); - /* initialize vpndirpath config entry. If exists use it else create it */ - client = gconf_client_get_default(); - configkey = "/apps/gnome-settings/gvpndialer/profiledir"; - if (gconf_client_get_string(client,configkey,NULL) == NULL ){ - gconf_client_set_string(client,configkey,vpn_dir_path,NULL); - }else{ - vpn_dir_path = gconf_client_get_string(client,configkey,NULL); - } - configkey = "/apps/gnome-settings/gvpndialer/vpnclientdir"; - if (gconf_client_get_string(client,configkey,NULL) == NULL){ - gconf_client_set_string(client,configkey,vpnclient_path,NULL); - }else { - vpnclient_path = gconf_client_get_string(client,configkey,NULL); - } - - /* load Profiles into Glist. If it update status bar */ - if ( !(getProfiles(vpn_dir_path,profile_entry))){ - gnome_appbar_push(statusbar,"Unable to load VPN Profiles"); - } - - /*unreference gconfclient..always */ - g_object_unref(client); - + +/* Initialize variables */ + + gchar *vpn_dir_path = "/etc/opt/cisco-vpnclient/Profiles/"; + gchar *vpnclient_path = "/usr/bin"; + GtkCombo *profile_entry = GTK_COMBO(lookup_widget(widget,"profile_entry")); + GnomeAppBar *statusbar = GNOME_APPBAR(lookup_widget(widget,"statusbar")); + gchar *vpn_default_status = "Status Message"; + gchar *configkey; + GConfClient *client; + +/* Set default status message */ + gnome_appbar_set_default(statusbar,vpn_default_status); +/* initialize vpndirpath config entry. If exists use it else create it */ + client = gconf_client_get_default(); + configkey = "/apps/gnome-settings/gvpndialer/profiledir"; + if (gconf_client_get_string(client,configkey,NULL) == NULL ) + { + gconf_client_set_string(client,configkey,vpn_dir_path,NULL); + } + else + { + vpn_dir_path = gconf_client_get_string(client,configkey,NULL); + } + configkey = "/apps/gnome-settings/gvpndialer/vpnclientdir"; + if (gconf_client_get_string(client,configkey,NULL) == NULL) + { + gconf_client_set_string(client,configkey,vpnclient_path,NULL); + } + else + { + vpnclient_path = gconf_client_get_string(client,configkey,NULL); + } + +/* load Profiles into Glist. If it update status bar */ + if ( !(getProfiles(vpn_dir_path,profile_entry))) + { + gnome_appbar_push(statusbar,"Unable to load VPN Profiles"); + } + +/*unreference gconfclient..always */ + g_object_unref(client); + } gboolean on_vpnclient_main_window_delete_event (GtkWidget *widget, - GdkEvent *event, - gpointer user_data) +GdkEvent *event, +gpointer user_data) { - - /* hide main window. if u want to close click quit */ - gtk_widget_hide(widget); + +/* hide main window. if u want to close click quit */ + gtk_widget_hide(widget); } void on_quit1_activate (GtkMenuItem *menuitem, - gpointer user_data) +gpointer user_data) { - /* kill gvpn dialer */ - gtk_main_quit(); - +/* kill gvpn dialer */ + gtk_main_quit(); + } void on_preferences1_activate (GtkMenuItem *menuitem, - gpointer user_data) +gpointer user_data) { - GtkWidget *preference_window; - GtkEntry *vpnclient_path_entry; - GtkEntry *vpn_profile_path_entry; GConfClient *client; - GtkEntry *vpnclient_default_user_entry; - GtkCheckButton *vpnclient_start_hidden_cb; - - client = gconf_client_get_default(); - - preference_window = create_preference_window(); - vpnclient_path_entry = GTK_ENTRY(lookup_widget(preference_window, - "vpnclient_path_entry")); - vpn_profile_path_entry = GTK_ENTRY(lookup_widget(preference_window, - "vpn_profile_path_entry")); - vpnclient_default_user_entry = GTK_ENTRY(lookup_widget(preference_window, - "vpnclient_default_user_entry")); - vpnclient_start_hidden_cb = GTK_CHECK_BUTTON(lookup_widget(preference_window, - "vpnclient_start_hidden_cb")); - - gtk_entry_set_text(vpn_profile_path_entry, - gconf_client_get_string(client, - "/apps/gnome-settings/gvpndialer/profiledir", - NULL)); - gtk_entry_set_text(vpnclient_path_entry, - gconf_client_get_string(client, - "/apps/gnome-settings/gvpndialer/vpnclientdir", - NULL)); - gtk_entry_set_text(vpnclient_default_user_entry, - gconf_client_get_string(client, - "/apps/gnome-settings/gvpndialer/defaultuser", - NULL)); - - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(vpnclient_start_hidden_cb), - gconf_client_get_bool(client, - "/apps/gnome-settings/gvpndialer/starthidden", - NULL)); - - gtk_widget_show(preference_window); - - g_object_unref(client); + GtkWidget *preference_window; + GtkEntry *vpnclient_path_entry; + GtkEntry *vpn_profile_path_entry; GConfClient *client; + GtkEntry *vpnclient_default_user_entry; + GtkCheckButton *vpnclient_start_hidden_cb; + + client = gconf_client_get_default(); + + preference_window = create_preference_window(); + vpnclient_path_entry = GTK_ENTRY(lookup_widget(preference_window, + "vpnclient_path_entry")); + vpn_profile_path_entry = GTK_ENTRY(lookup_widget(preference_window, + "vpn_profile_path_entry")); + vpnclient_default_user_entry = GTK_ENTRY(lookup_widget(preference_window, + "vpnclient_default_user_entry")); + vpnclient_start_hidden_cb = GTK_CHECK_BUTTON(lookup_widget(preference_window, + "vpnclient_start_hidden_cb")); + + gtk_entry_set_text(vpn_profile_path_entry, + gconf_client_get_string(client, + "/apps/gnome-settings/gvpndialer/profiledir", + NULL)); + gtk_entry_set_text(vpnclient_path_entry, + gconf_client_get_string(client, + "/apps/gnome-settings/gvpndialer/vpnclientdir", + NULL)); + gtk_entry_set_text(vpnclient_default_user_entry, + gconf_client_get_string(client, + "/apps/gnome-settings/gvpndialer/defaultuser", + NULL)); + + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(vpnclient_start_hidden_cb), + gconf_client_get_bool(client, + "/apps/gnome-settings/gvpndialer/starthidden", + NULL)); + + gtk_widget_show(preference_window); + + g_object_unref(client); } + void on_status2_activate (GtkMenuItem *menuitem, - gpointer user_data) +gpointer user_data) { - GtkWidget *status_window; - GtkWidget *mainwindow; - mainwindow = lookup_widget (GTK_WIDGET(menuitem),"vpnclient_main_window"); - status_window = GTK_WIDGET(g_object_get_data(G_OBJECT(mainwindow),"statuswindow")); - if ( vpn_connection_active == 1 ){ - gtk_widget_show(status_window); - updatestats(status_window); - sleep(1); - g_timeout_add_full(0,(guint)5000,updatestats,status_window,NULL); - } else { - if (! GTK_WIDGET_VISIBLE(mainwindow)){ - gtk_widget_show(mainwindow); + GtkWidget *status_window; + GtkWidget *mainwindow; + mainwindow = lookup_widget (GTK_WIDGET(menuitem),"vpnclient_main_window"); + status_window = GTK_WIDGET(g_object_get_data(G_OBJECT(mainwindow),"statuswindow")); + if ( vpn_connection_active == 1 ) + { + gtk_widget_show(status_window); + updatestats(status_window); + sleep(1); + g_timeout_add_full(0,(guint)5000,updatestats,status_window,NULL); + } + else + { + if (! GTK_WIDGET_VISIBLE(mainwindow)) + { + gtk_widget_show(mainwindow); + } + update_statusbar(mainwindow,"Status is show only when a VPN connection is active"); } - update_statusbar(mainwindow,"Status is show only when a VPN connection is active"); - } } - void on_about1_activate (GtkMenuItem *menuitem, - gpointer user_data) +gpointer user_data) { - GtkWidget *about_window; - about_window = create_gvpn_dialer_about(); - gtk_widget_show(about_window); + GtkWidget *about_window; + about_window = create_gvpn_dialer_about(); + gtk_widget_show(about_window); } + /* What happens when you click the Connect Button */ void on_execute_vpn_button_clicked (GtkButton *button, - gpointer user_data) +gpointer user_data) { - - GtkWidget *login_window; - GtkWidget *main_window; - GtkWidget *grouppw_window; - GtkLabel *invalid_user_pass; - GtkLabel *grouppw_warning_label; - GtkEntry *username_entry; - GConfClient *client; - const gchar* username; - main_window = gtk_widget_get_toplevel(GTK_WIDGET(button)); - - /* initialize authentication attempts */ - authentication_attempts = 0; - - /* find the selected profile */ - GtkCombo *profile_entry_combobox = GTK_COMBO(lookup_widget(main_window,"profile_entry")); - const gchar *selected_profile = - gtk_entry_get_text (GTK_ENTRY(profile_entry_combobox->entry)); - - + + GtkWidget *login_window; + GtkWidget *main_window; + GtkWidget *grouppw_window; + GtkLabel *invalid_user_pass; + GtkLabel *grouppw_warning_label; + GtkEntry *username_entry; + GConfClient *client; + const gchar* username; + main_window = gtk_widget_get_toplevel(GTK_WIDGET(button)); + +/* initialize authentication attempts */ + authentication_attempts = 0; + +/* find the selected profile */ + GtkCombo *profile_entry_combobox = GTK_COMBO(lookup_widget(main_window,"profile_entry")); + const gchar *selected_profile = + gtk_entry_get_text (GTK_ENTRY(profile_entry_combobox->entry)); /* execute VPNclient. if program starts..continue */ - if (!(executeVpnClient(selected_profile,GTK_WIDGET(button)))){ - if (! GTK_WIDGET_VISIBLE(main_window)){ - gtk_widget_show(main_window); - } - update_statusbar(GTK_WIDGET(button),"Cannot start vpnclient.Manually run it to determine problem"); - return; - } - - /* Reset all password / username / label fields */ - - update_statusbar(GTK_WIDGET(button),"Logging in....."); - - login_window = GTK_WIDGET(g_object_get_data(G_OBJECT(main_window),"loginwindow_key")); - invalid_user_pass = GTK_LABEL(lookup_widget(login_window,"invalid_user_pass")); - gtk_label_set_text(invalid_user_pass, - "" - ); - - grouppw_window = GTK_WIDGET(g_object_get_data(G_OBJECT(main_window),"group_pass_win")); - grouppw_warning_label = GTK_LABEL(lookup_widget(grouppw_window,"grouppw_warning")); - gtk_label_set_text(grouppw_warning_label,""); - client = gconf_client_get_default(); - username_entry = GTK_ENTRY(lookup_widget(login_window, "enter_username")); - gtk_entry_set_text(username_entry, - gconf_client_get_string(client, - "/apps/gnome-settings/gvpndialer/defaultuser", - NULL)); - /* put focus in password entry if username was defaulted */ - username = gtk_entry_get_text(username_entry); - if(username[0] != '\0') - gtk_widget_grab_focus(GTK_WIDGET(lookup_widget(login_window, "enter_password"))); - /*unreference gconfclient..always */ - g_object_unref(client); - + if (!(executeVpnClient(selected_profile,GTK_WIDGET(button)))) + { + if (! GTK_WIDGET_VISIBLE(main_window)) + { + gtk_widget_show(main_window); + } + update_statusbar(GTK_WIDGET(button),"Cannot start vpnclient.Manually run it to determine problem"); + return; + } + +/* Reset all password / username / label fields */ + + update_statusbar(GTK_WIDGET(button),"Logging in....."); + + login_window = GTK_WIDGET(g_object_get_data(G_OBJECT(main_window),"loginwindow_key")); + invalid_user_pass = GTK_LABEL(lookup_widget(login_window,"invalid_user_pass")); + gtk_label_set_text(invalid_user_pass, + "" + ); + + grouppw_window = GTK_WIDGET(g_object_get_data(G_OBJECT(main_window),"group_pass_win")); + grouppw_warning_label = GTK_LABEL(lookup_widget(grouppw_window,"grouppw_warning")); + gtk_label_set_text(grouppw_warning_label,""); + client = gconf_client_get_default(); + username_entry = GTK_ENTRY(lookup_widget(login_window, "enter_username")); + gtk_entry_set_text(username_entry, + gconf_client_get_string(client, + "/apps/gnome-settings/gvpndialer/defaultuser", + NULL)); +/* put focus in password entry if username was defaulted */ + username = gtk_entry_get_text(username_entry); + if(username[0] != '\0') + gtk_widget_grab_focus(GTK_WIDGET(lookup_widget(login_window, "enter_password"))); +/*unreference gconfclient..always */ + g_object_unref(client); + } void on_disconnect_button_clicked (GtkButton *button, - gpointer user_data) +gpointer user_data) { - GtkWidget *icon; - GtkWidget *mainwindow; - - - update_statusbar(GTK_WIDGET(button),"VPN Connection Terminated"); - /* set vpn connection variable to 0 */ - vpn_connection_active = 0; - mainwindow = gtk_widget_get_toplevel(GTK_WIDGET(button)); - icon = GTK_WIDGET(g_object_get_data(G_OBJECT(mainwindow),"icon")); - tray_icon_load(icon,"gvpndialer/status_unlocked.png"); - /* kill vpn connection */ - kill_child(); + GtkWidget *icon; + GtkWidget *mainwindow; + + update_statusbar(GTK_WIDGET(button),"VPN Connection Terminated"); +/* set vpn connection variable to 0 */ + vpn_connection_active = 0; + mainwindow = gtk_widget_get_toplevel(GTK_WIDGET(button)); + icon = GTK_WIDGET(g_object_get_data(G_OBJECT(mainwindow),"icon")); + tray_icon_load(icon,"gvpndialer/status_unlocked.png"); +/* kill vpn connection */ + kill_child(); } + /* activate status window */ void on_status_button_clicked (GtkButton *button, - gpointer user_data) +gpointer user_data) { - GtkWidget *status_window; - GtkWidget *mainwindow; - mainwindow = gtk_widget_get_toplevel(GTK_WIDGET(button)); - status_window = GTK_WIDGET(g_object_get_data(G_OBJECT(mainwindow),"statuswindow")); - if ( vpn_connection_active == 1 && is_network_connection_active()){ - - gtk_widget_show (status_window); - updatestats(status_window); - sleep(1); - g_timeout_add_full(0,(guint)5000,updatestats,status_window,NULL); - }else { - if (! GTK_WIDGET_VISIBLE(mainwindow)){ - gtk_widget_show(mainwindow); - } - update_statusbar(mainwindow,"Status is shown only when an active VPN Connection"); - } -} + GtkWidget *status_window; + GtkWidget *mainwindow; + mainwindow = gtk_widget_get_toplevel(GTK_WIDGET(button)); + status_window = GTK_WIDGET(g_object_get_data(G_OBJECT(mainwindow),"statuswindow")); + if ( vpn_connection_active == 1 && is_network_connection_active()) + { + gtk_widget_show (status_window); + updatestats(status_window); + sleep(1); + g_timeout_add_full(0,(guint)5000,updatestats,status_window,NULL); + } + else + { + if (! GTK_WIDGET_VISIBLE(mainwindow)) + { + gtk_widget_show(mainwindow); + } + update_statusbar(mainwindow,"Status is shown only when an active VPN Connection"); + } +} void on_quit_button_clicked (GtkButton *button, - gpointer user_data) +gpointer user_data) { - /* kill gvpn dialer */ - gtk_main_quit(); +/* kill gvpn dialer */ + gtk_main_quit(); } void on_vpn_profile_entry_box_changed (GtkEditable *editable, - gpointer user_data) +gpointer user_data) { - GtkWidget *mainwindow; - mainwindow = lookup_widget(GTK_WIDGET(editable),"vpnclient_main_window"); - if ( ! (getHostnamefromProfile(GTK_WIDGET(editable)))){ - if (! GTK_WIDGET_VISIBLE(mainwindow)){ - gtk_widget_show(mainwindow); - } - update_statusbar(GTK_WIDGET(editable),"Cannot Read Hostname from Profile"); - } else { - update_statusbar(GTK_WIDGET(editable),"Profile Selected"); - } + GtkWidget *mainwindow; + mainwindow = lookup_widget(GTK_WIDGET(editable),"vpnclient_main_window"); + if ( ! (getHostnamefromProfile(GTK_WIDGET(editable)))) + { + if (! GTK_WIDGET_VISIBLE(mainwindow)) + { + gtk_widget_show(mainwindow); + } + update_statusbar(GTK_WIDGET(editable),"Cannot Read Hostname from Profile"); + } + else + { + update_statusbar(GTK_WIDGET(editable),"Profile Selected"); + } } gboolean on_login_window_delete_event (GtkWidget *widget, - GdkEvent *event, - gpointer user_data) +GdkEvent *event, +gpointer user_data) { - return FALSE; + return FALSE; } + /* cancel button on the login window */ void on_cancel_button_clicked (GtkButton *button, - gpointer user_data) +gpointer user_data) { -GtkWidget *main_window; - GtkWidget *toplevel; - GtkEntry *enter_password = NULL; - toplevel = gtk_widget_get_toplevel(GTK_WIDGET(button)); - main_window = GTK_WIDGET( - g_object_get_data( - G_OBJECT(toplevel), - "mainwindow_key")); + GtkWidget *main_window; + GtkWidget *toplevel; + GtkEntry *enter_password = NULL; + toplevel = gtk_widget_get_toplevel(GTK_WIDGET(button)); + main_window = GTK_WIDGET( + g_object_get_data( + G_OBJECT(toplevel), + "mainwindow_key")); /* clear the password field of the login window */ -enter_password = GTK_ENTRY(lookup_widget(GTK_WIDGET(button), - "enter_password")); + enter_password = GTK_ENTRY(lookup_widget(GTK_WIDGET(button), + "enter_password")); gtk_entry_set_text(enter_password,""); - /* Close login window and kill vpnclient */ - gtk_widget_hide(toplevel); - update_statusbar(main_window,"Status Message"); - /* for some reason sleep causes the app not to crash if u hit cancel too many times */ - sleep(1); - close_all_io_channels(main_window); - kill_child(); +/* Close login window and kill vpnclient */ + gtk_widget_hide(toplevel); + update_statusbar(main_window,"Status Message"); +/* for some reason sleep causes the app not to crash if u hit cancel too many times */ + sleep(1); + close_all_io_channels(main_window); + kill_child(); } + /* when someone clicks submit on the login window -*/ + */ void on_submit_button_clicked (GtkButton *button, - gpointer user_data) +gpointer user_data) { - GtkEntry *enter_password; - GtkEntry *enter_username; - GtkWidget *main_window; - GIOChannel *ptychannel; - GIOChannel *stdoutchannel; - GtkWidget *login_window; - GtkLabel *invalid_user_pass; - const gchar *entry; - const gchar *entry2; - login_window = gtk_widget_get_toplevel(GTK_WIDGET(button)); - invalid_user_pass = GTK_LABEL(lookup_widget(login_window,"invalid_user_pass")); - - main_window = GTK_WIDGET(g_object_get_data(G_OBJECT(login_window),"mainwindow_key")); - enter_password = GTK_ENTRY(lookup_widget(login_window,"enter_password")); - enter_username = GTK_ENTRY(lookup_widget(login_window,"enter_username")); - ptychannel = (GIOChannel *)g_object_get_data(G_OBJECT(main_window),"pty"); - stdoutchannel = (GIOChannel *)g_object_get_data(G_OBJECT(main_window),"stdout"); - /* check to see if someone forgot to type a username/password - add spaces if username/password is forgotten . client will reauthenticate */ - if ( strlen(gtk_entry_get_text(enter_username)) == 0 ){ - entry = "username"; - }else { - entry = gtk_entry_get_text(enter_username); - } - if ( strlen(gtk_entry_get_text(enter_password)) == 0){ - entry2 = "password"; - }else { - entry2 = gtk_entry_get_text(enter_password); - } - write_text_into_fd (entry,ptychannel); - sleep(1); - write_text_into_fd (entry2,ptychannel); - g_io_add_watch(stdoutchannel,G_IO_IN | G_IO_HUP, (GIOFunc)iofunc_stdout, (gpointer)main_window); + GtkEntry *enter_password; + GtkEntry *enter_username; + GtkWidget *main_window; + GIOChannel *ptychannel; + GIOChannel *stdoutchannel; + GtkWidget *login_window; + GtkLabel *invalid_user_pass; + const gchar *entry; + const gchar *entry2; + login_window = gtk_widget_get_toplevel(GTK_WIDGET(button)); + invalid_user_pass = GTK_LABEL(lookup_widget(login_window,"invalid_user_pass")); + + main_window = GTK_WIDGET(g_object_get_data(G_OBJECT(login_window),"mainwindow_key")); + enter_password = GTK_ENTRY(lookup_widget(login_window,"enter_password")); + enter_username = GTK_ENTRY(lookup_widget(login_window,"enter_username")); + ptychannel = (GIOChannel *)g_object_get_data(G_OBJECT(main_window),"pty"); + stdoutchannel = (GIOChannel *)g_object_get_data(G_OBJECT(main_window),"stdout"); +/* check to see if someone forgot to type a username/password +add spaces if username/password is forgotten . client will reauthenticate */ + if ( strlen(gtk_entry_get_text(enter_username)) == 0 ) + { + entry = "username"; + } + else + { + entry = gtk_entry_get_text(enter_username); + } + if ( strlen(gtk_entry_get_text(enter_password)) == 0) + { + entry2 = "password"; + } + else + { + entry2 = gtk_entry_get_text(enter_password); + } + write_text_into_fd (entry,ptychannel); + sleep(1); + write_text_into_fd (entry2,ptychannel); + g_io_add_watch(stdoutchannel,G_IO_IN | G_IO_HUP, (GIOFunc)iofunc_stdout, (gpointer)main_window); gtk_widget_hide(login_window); } - gboolean on_preference_window_delete_event (GtkWidget *widget, - GdkEvent *event, - gpointer user_data) +GdkEvent *event, +gpointer user_data) { - return FALSE; + return FALSE; } void on_preference_cancel_button_clicked (GtkButton *button, - gpointer user_data) +gpointer user_data) { - /* kill window with no changes done */ - gtk_widget_destroy(gtk_widget_get_toplevel(GTK_WIDGET(button))); +/* kill window with no changes done */ + gtk_widget_destroy(gtk_widget_get_toplevel(GTK_WIDGET(button))); } void on_preference_apply_button_clicked (GtkButton *button, - gpointer user_data) +gpointer user_data) { - GtkEntry *vpnclient_path_entry; - GtkEntry *vpn_profile_path_entry; - GtkEntry *vpnclient_default_user_entry; - GtkCheckButton *vpnclient_start_hidden_cb; - const gchar *gtkentry_text; - GtkWidget *main_window; - GConfClient *client; - - client = gconf_client_get_default(); - main_window = gtk_widget_get_toplevel(GTK_WIDGET(button)); - vpnclient_path_entry = GTK_ENTRY(lookup_widget(GTK_WIDGET(button), - "vpnclient_path_entry")); - vpn_profile_path_entry = GTK_ENTRY(lookup_widget(GTK_WIDGET(button), - "vpn_profile_path_entry")); - vpnclient_default_user_entry = GTK_ENTRY(lookup_widget(GTK_WIDGET(button), - "vpnclient_default_user_entry")); - - vpnclient_start_hidden_cb = GTK_CHECK_BUTTON(lookup_widget(GTK_WIDGET(button), - "vpnclient_start_hidden_cb")); - - gtkentry_text = gtk_entry_get_text(vpnclient_path_entry); - gconf_client_set_string(client,"/apps/gnome-settings/gvpndialer/vpnclientdir" - ,gtkentry_text,NULL); - - - gtkentry_text = gtk_entry_get_text(vpn_profile_path_entry); - gconf_client_set_string(client, - "/apps/gnome-settings/gvpndialer/profiledir", - gtkentry_text, - NULL); - - gtkentry_text = gtk_entry_get_text(vpnclient_default_user_entry); - gconf_client_set_string(client, - "/apps/gnome-settings/gvpndialer/defaultuser", - gtkentry_text, - NULL); - - gconf_client_set_bool(client, - "/apps/gnome-settings/gvpndialer/starthidden", - gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(vpnclient_start_hidden_cb)), - NULL); - - gtk_widget_destroy(gtk_widget_get_toplevel(GTK_WIDGET(button))); - - g_object_unref(client); + GtkEntry *vpnclient_path_entry; + GtkEntry *vpn_profile_path_entry; + GtkEntry *vpnclient_default_user_entry; + GtkCheckButton *vpnclient_start_hidden_cb; + const gchar *gtkentry_text; + GtkWidget *main_window; + GConfClient *client; + + client = gconf_client_get_default(); + main_window = gtk_widget_get_toplevel(GTK_WIDGET(button)); + vpnclient_path_entry = GTK_ENTRY(lookup_widget(GTK_WIDGET(button), + "vpnclient_path_entry")); + vpn_profile_path_entry = GTK_ENTRY(lookup_widget(GTK_WIDGET(button), + "vpn_profile_path_entry")); + vpnclient_default_user_entry = GTK_ENTRY(lookup_widget(GTK_WIDGET(button), + "vpnclient_default_user_entry")); + + vpnclient_start_hidden_cb = GTK_CHECK_BUTTON(lookup_widget(GTK_WIDGET(button), + "vpnclient_start_hidden_cb")); + + gtkentry_text = gtk_entry_get_text(vpnclient_path_entry); + gconf_client_set_string(client,"/apps/gnome-settings/gvpndialer/vpnclientdir" + ,gtkentry_text,NULL); + + gtkentry_text = gtk_entry_get_text(vpn_profile_path_entry); + gconf_client_set_string(client, + "/apps/gnome-settings/gvpndialer/profiledir", + gtkentry_text, + NULL); + + gtkentry_text = gtk_entry_get_text(vpnclient_default_user_entry); + gconf_client_set_string(client, + "/apps/gnome-settings/gvpndialer/defaultuser", + gtkentry_text, + NULL); + + gconf_client_set_bool(client, + "/apps/gnome-settings/gvpndialer/starthidden", + gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(vpnclient_start_hidden_cb)), + NULL); + + gtk_widget_destroy(gtk_widget_get_toplevel(GTK_WIDGET(button))); + + g_object_unref(client); } gboolean on_status_window_delete_event (GtkWidget *widget, - GdkEvent *event, - gpointer user_data) +GdkEvent *event, +gpointer user_data) { - return FALSE; + return FALSE; } + void on_enter_username_activate (GtkEntry *entry, - gpointer user_data) +gpointer user_data) { } @@ -466,17 +489,17 @@ on_enter_username_activate (GtkEntry *entry, void on_enter_password_activate (GtkEntry *entry, - gpointer user_data) +gpointer user_data) { - GtkButton *mybutton; - mybutton = GTK_BUTTON(lookup_widget(GTK_WIDGET(entry),"submit_button")); - on_submit_button_clicked(mybutton,user_data); + GtkButton *mybutton; + mybutton = GTK_BUTTON(lookup_widget(GTK_WIDGET(entry),"submit_button")); + on_submit_button_clicked(mybutton,user_data); } void on_submit_button_activate (GtkButton *button, - gpointer user_data) +gpointer user_data) { } @@ -484,68 +507,72 @@ on_submit_button_activate (GtkButton *button, void on_status_window_show (GtkWidget *widget, - gpointer user_data) +gpointer user_data) { - - + } + void on_close_status_window_button_clicked (GtkButton *button, - gpointer user_data) +gpointer user_data) { - /* hide window */ - gtk_widget_hide(gtk_widget_get_toplevel(GTK_WIDGET(button))); - +/* hide window */ + gtk_widget_hide(gtk_widget_get_toplevel(GTK_WIDGET(button))); + } /** BEGIN NON-GLADE FUNCTIONS **/ +int kill_child() +{ + +/* borrowed from http://www.linux-mag.com/2000-02/compile_03.html + Kills the child process graciously */ + + pid_t rc; -int kill_child(){ - - - /* borrowed from http://www.linux-mag.com/2000-02/compile_03.html - Kills the child process graciously */ - - pid_t rc; - - if (vpnclient_pid > 1 ){ - kill(vpnclient_pid, SIGTERM); - alarm(2); - rc = waitpid(vpnclient_pid, NULL,0); - alarm(0); - if (rc) { - /* we were interrupted by an alarm :-( */ - kill(SIGKILL, SIGTERM); - rc = waitpid(vpnclient_pid, NULL,0); + if (vpnclient_pid > 1 ) + { + kill(vpnclient_pid, SIGTERM); + alarm(2); + rc = waitpid(vpnclient_pid, NULL,0); + alarm(0); + if (rc) + { +/* we were interrupted by an alarm :-( */ + kill(SIGKILL, SIGTERM); + rc = waitpid(vpnclient_pid, NULL,0); + } + return 1; } - return 1; - } - return 0; + return 0; } + /* write text into stdin of forked process */ -int write_text_into_fd (const gchar *my_text_entry,GIOChannel *ioc ){ - GString *i_buffer = NULL; - - i_buffer = g_string_new(my_text_entry); +int write_text_into_fd (const gchar *my_text_entry,GIOChannel *ioc ) +{ + GString *i_buffer = NULL; + + i_buffer = g_string_new(my_text_entry); /* if buffer is empty, return zero. Something must be written */ - if ( i_buffer->len == 0 ){ + if ( i_buffer->len == 0 ) + { + g_string_free(i_buffer,TRUE); + return 0; + } + i_buffer = g_string_append_c(i_buffer,'\r'); + g_io_channel_write_chars(ioc,i_buffer->str,strlen(i_buffer->str),NULL,NULL); + g_io_channel_flush(ioc,NULL); g_string_free(i_buffer,TRUE); - return 0; - } - i_buffer = g_string_append_c(i_buffer,'\r'); - g_io_channel_write_chars(ioc,i_buffer->str,strlen(i_buffer->str),NULL,NULL); - g_io_channel_flush(ioc,NULL); - g_string_free(i_buffer,TRUE); - return 1; + return 1; } -/* Read Vpnclient stdout and taken appropriate action depending on +/* Read Vpnclient stdout and taken appropriate action depending on what it prints outs * returns 1 if you want to continue monitoring stdout activity * returns 0 if you don't want to monitor stdout activity. @@ -553,7 +580,8 @@ what it prints outs */ gboolean -iofunc_stdout (GIOChannel *ioc, GIOCondition cond, gpointer data){ +iofunc_stdout (GIOChannel *ioc, GIOCondition cond, gpointer data) +{ #define GROUP_PASSWORD 1 #define REAUTHENTICATE 2 #define ENTER_USERNAME 3 @@ -563,728 +591,795 @@ iofunc_stdout (GIOChannel *ioc, GIOCondition cond, gpointer data){ #define CONNECTION_TERMINATED 7 #define REASON_FOR_FAILURE 8 #define SAVE_PASS 9 - - GtkWidget *main_window = GTK_WIDGET(data); - GtkWidget *login_window; - GtkWidget *grouppw_window; - GtkLabel *invalid_user_pass; - GtkEntry *enter_password; - GtkEntry *enter_username; - GtkEntry *enter_grouppw; - gchar **reason = NULL; - gchar *line; - GIOStatus ret; - GString *buf = g_string_new_len("",BUFSIZE); - GtkWidget *vpn_profile_combolist; - GConfClient *client; - GtkWidget *icon; - int count = 0; - GIOChannel *pty_channel = (GIOChannel *)g_object_get_data(G_OBJECT(main_window),"pty"); - - /* if something is seriously wrong..kill process */ - if ( cond & G_IO_HUP ){ - close_all_io_channels(main_window); - kill_child(); - g_string_free(buf,TRUE); - /* stop monitoring stdout of the process */ - return 0; - } - /* Get relevant widgets */ - login_window = GTK_WIDGET(g_object_get_data - (G_OBJECT(main_window),"loginwindow_key")); - grouppw_window = GTK_WIDGET(g_object_get_data - (G_OBJECT(main_window),"group_pass_win")); - - enter_password = GTK_ENTRY(lookup_widget - (login_window,"enter_password")); - enter_username = GTK_ENTRY(lookup_widget - (login_window,"enter_username")); - invalid_user_pass = GTK_LABEL(lookup_widget - (login_window,"invalid_user_pass")); - enter_grouppw = GTK_ENTRY(lookup_widget - (grouppw_window,"group_pw_entry")); - /* there is something to read */ - if ( cond & G_IO_IN ){ - while ( ret != G_IO_STATUS_EOF ){ - ret = g_io_channel_read_line_string(ioc,buf,NULL,NULL); - if ( ret == G_IO_STATUS_AGAIN ){ - /* print out a prompt */ - g_string_free(buf,TRUE); - buf = g_string_new_len("",BUFSIZE); - ret = g_io_channel_read_chars(ioc,buf->str,BUFSIZE,NULL,NULL);} - if ( ret == G_IO_STATUS_NORMAL ){ - - switch (check_for_events(buf)) - { - - case GROUP_PASSWORD: - /* show password group window - exit iofunc_stdout, stop monitoring stdout activity */ - gtk_widget_grab_focus(GTK_WIDGET(enter_grouppw)); - gtk_widget_show(grouppw_window); - g_string_free(buf,TRUE); - return 0; - break; - case CONTACTING_GATEWAY: - update_statusbar(main_window,buf->str); - continue; - case REAUTHENTICATE: - /* show the invalid username field if authentication failed */ - if ( authentication_attempts > 0 ){ - gtk_label_set_text - (invalid_user_pass, - "Invalid Username or Password"); - gtk_widget_grab_focus(GTK_WIDGET(enter_password)); - - } - continue; - - case ENTER_USERNAME: - gtk_entry_set_text(enter_password,""); - /* set the focus back onto the username entry */ - gtk_widget_grab_focus(GTK_WIDGET(enter_username)); - authentication_attempts++; - gtk_widget_show(login_window); - g_string_free(buf,TRUE); - return 0; - break; - case CONTINUE_YES: - write_text_into_fd ("yes",pty_channel); - break; - - case CONNECTION_TERMINATED: - gtk_entry_set_text(enter_password,""); - gtk_entry_set_text(enter_username,""); - gtk_entry_set_text(enter_grouppw,""); - count++; - sleep(1); - continue; - - case VPN_SECURE: - gtk_entry_set_text(enter_password,""); - gtk_entry_set_text(enter_username,""); - update_statusbar(main_window,"VPN Connection Active"); - vpn_connection_active = 1; - /* save successfully used profile . Will default to this next time */ - vpn_profile_combolist = lookup_widget(main_window,"profile_entry"); - /* initialize gconfclient */ - client = gconf_client_get_default(); - gconf_client_set_string - (client, - "/apps/gnome-settings/gvpndialer/lastchosenprofile", - gtk_entry_get_text - (GTK_ENTRY(GTK_COMBO(vpn_profile_combolist)->entry)),NULL); - g_object_unref(client); - /* change icon to be the closed padlock */ - icon = GTK_WIDGET(g_object_get_data(G_OBJECT(main_window),"icon")); - tray_icon_load (icon,"gvpndialer/status_lock.png"); - gtk_widget_hide(main_window); - /* no need to read stdout anymore. stop monitoring it. */ - g_string_free(buf,TRUE); - sleep(2); /* don't know why i need to do this. stops app from crashing */ - /* Check VPN status now that connection is secure. - Do something if something bad happens */ - g_timeout_add((guint)1000,is_vpn_connection_active_full,(gpointer)main_window); - return 0; - break; - - case REASON_FOR_FAILURE: - if (! GTK_WIDGET_VISIBLE(main_window)){ - gtk_widget_show(main_window); - } - if ( count > 0 ){ - reason = g_strsplit(g_strchomp(buf->str),"Reason:",2); - update_statusbar(main_window,reason[1]); - g_strfreev(reason); - g_string_free(buf,TRUE); - }else { - g_string_free(buf,TRUE); - update_statusbar(main_window, - "VPNclient terminated for unknown reason"); - } - /* check to see if process is active. if not kill it */ - if (is_vpn_connection_active() ){ - close_all_io_channels(main_window); - kill_child(); - } - return 0; - break; - - case SAVE_PASS: - write_text_into_fd ("n",pty_channel); - break; - - default: - continue; - } - } - return 1; + + GtkWidget *main_window = GTK_WIDGET(data); + GtkWidget *login_window; + GtkWidget *grouppw_window; + GtkLabel *invalid_user_pass; + GtkEntry *enter_password; + GtkEntry *enter_username; + GtkEntry *enter_grouppw; + gchar **reason = NULL; + gchar *line; + GIOStatus ret; + GString *buf = g_string_new_len("",BUFSIZE); + GtkWidget *vpn_profile_combolist; + GConfClient *client; + GtkWidget *icon; + int count = 0; + GIOChannel *pty_channel = (GIOChannel *)g_object_get_data(G_OBJECT(main_window),"pty"); + +/* if something is seriously wrong..kill process */ + if ( cond & G_IO_HUP ) + { + close_all_io_channels(main_window); + kill_child(); + g_string_free(buf,TRUE); +/* stop monitoring stdout of the process */ + return 0; } - } - g_string_free(buf,TRUE); - return 1; +/* Get relevant widgets */ + login_window = GTK_WIDGET(g_object_get_data + (G_OBJECT(main_window),"loginwindow_key")); + grouppw_window = GTK_WIDGET(g_object_get_data + (G_OBJECT(main_window),"group_pass_win")); + + enter_password = GTK_ENTRY(lookup_widget + (login_window,"enter_password")); + enter_username = GTK_ENTRY(lookup_widget + (login_window,"enter_username")); + invalid_user_pass = GTK_LABEL(lookup_widget + (login_window,"invalid_user_pass")); + enter_grouppw = GTK_ENTRY(lookup_widget + (grouppw_window,"group_pw_entry")); +/* there is something to read */ + if ( cond & G_IO_IN ) + { + while ( ret != G_IO_STATUS_EOF ) + { + ret = g_io_channel_read_line_string(ioc,buf,NULL,NULL); + if ( ret == G_IO_STATUS_AGAIN ) + { +/* print out a prompt */ + g_string_free(buf,TRUE); + buf = g_string_new_len("",BUFSIZE); + ret = g_io_channel_read_chars(ioc,buf->str,BUFSIZE,NULL,NULL); + } + if ( ret == G_IO_STATUS_NORMAL ) + { + + switch (check_for_events(buf)) + { + + case GROUP_PASSWORD: +/* show password group window + exit iofunc_stdout, stop monitoring stdout activity */ + gtk_widget_grab_focus(GTK_WIDGET(enter_grouppw)); + gtk_widget_show(grouppw_window); + g_string_free(buf,TRUE); + return 0; + break; + case CONTACTING_GATEWAY: + update_statusbar(main_window,buf->str); + continue; + case REAUTHENTICATE: +/* show the invalid username field if authentication failed */ + if ( authentication_attempts > 0 ) + { + gtk_label_set_text + (invalid_user_pass, + "Invalid Username or Password"); + gtk_widget_grab_focus(GTK_WIDGET(enter_password)); + + } + continue; + + case ENTER_USERNAME: + gtk_entry_set_text(enter_password,""); +/* set the focus back onto the username entry */ + gtk_widget_grab_focus(GTK_WIDGET(enter_username)); + authentication_attempts++; + gtk_widget_show(login_window); + g_string_free(buf,TRUE); + return 0; + break; + case CONTINUE_YES: + write_text_into_fd ("yes",pty_channel); + break; + + case CONNECTION_TERMINATED: + gtk_entry_set_text(enter_password,""); + gtk_entry_set_text(enter_username,""); + gtk_entry_set_text(enter_grouppw,""); + count++; + sleep(1); + continue; + + case VPN_SECURE: + gtk_entry_set_text(enter_password,""); + gtk_entry_set_text(enter_username,""); + update_statusbar(main_window,"VPN Connection Active"); + vpn_connection_active = 1; +/* save successfully used profile . Will default to this next time */ + vpn_profile_combolist = lookup_widget(main_window,"profile_entry"); +/* initialize gconfclient */ + client = gconf_client_get_default(); + gconf_client_set_string + (client, + "/apps/gnome-settings/gvpndialer/lastchosenprofile", + gtk_entry_get_text + (GTK_ENTRY(GTK_COMBO(vpn_profile_combolist)->entry)),NULL); + g_object_unref(client); +/* change icon to be the closed padlock */ + icon = GTK_WIDGET(g_object_get_data(G_OBJECT(main_window),"icon")); + tray_icon_load (icon,"gvpndialer/status_lock.png"); + gtk_widget_hide(main_window); +/* no need to read stdout anymore. stop monitoring it. */ + g_string_free(buf,TRUE); + sleep(2); /* don't know why i need to do this. stops app from crashing */ +/* Check VPN status now that connection is secure. + Do something if something bad happens */ + g_timeout_add((guint)1000,is_vpn_connection_active_full,(gpointer)main_window); + return 0; + break; + + case REASON_FOR_FAILURE: + if (! GTK_WIDGET_VISIBLE(main_window)) + { + gtk_widget_show(main_window); + } + if ( count > 0 ) + { + reason = g_strsplit(g_strchomp(buf->str),"Reason:",2); + update_statusbar(main_window,reason[1]); + g_strfreev(reason); + g_string_free(buf,TRUE); + } + else + { + g_string_free(buf,TRUE); + update_statusbar(main_window, + "VPNclient terminated for unknown reason"); + } +/* check to see if process is active. if not kill it */ + if (is_vpn_connection_active() ) + { + close_all_io_channels(main_window); + kill_child(); + } + return 0; + break; + + case SAVE_PASS: + write_text_into_fd ("n",pty_channel); + break; + + default: + continue; + } + } + return 1; + } + } + g_string_free(buf,TRUE); + return 1; } + void update_statusbar( GtkWidget *anywidget, - gchar *status_message){ - - - GnomeAppBar *statusbar = GNOME_APPBAR(lookup_widget(anywidget,"statusbar")); - gnome_appbar_push(statusbar,status_message); +gchar *status_message) +{ + + GnomeAppBar *statusbar = GNOME_APPBAR(lookup_widget(anywidget,"statusbar")); + gnome_appbar_push(statusbar,status_message); } + /* return 1 if successful, or 0 if not */ int executeVpnClient(const gchar *profile, - GtkWidget *widget){ - gchar *filename = NULL; - gchar *vpn_args[4]; - GConfClient *client; - GtkWidget *mainwindow = gtk_widget_get_toplevel(widget); - - client = gconf_client_get_default(); - filename = gconf_client_get_string(client,"/apps/gnome-settings/gvpndialer/vpnclientdir",NULL); - if(filename != NULL ){ - filename = g_strjoin("/",filename,"vpnclient",NULL); - }else{ - filename = "vpnclient"; - } - g_object_unref(client); - vpn_args[0] = filename; - vpn_args[1] = "connect"; - vpn_args[2] = (gchar *)profile; - vpn_args[3] = NULL; - - /* start vpnclient */ - start_term(vpn_args,mainwindow); - - /* check to see if vpnclient was successfully activated */ - if ( vpnclient_pid <= 1 ){ - - return 0; - } - - return 1; +GtkWidget *widget) +{ + gchar *filename = NULL; + gchar *vpn_args[4]; + GConfClient *client; + GtkWidget *mainwindow = gtk_widget_get_toplevel(widget); + + client = gconf_client_get_default(); + filename = gconf_client_get_string(client,"/apps/gnome-settings/gvpndialer/vpnclientdir",NULL); + if(filename != NULL ) + { + filename = g_strjoin("/",filename,"vpnclient",NULL); + } + else + { + filename = "vpnclient"; + } + g_object_unref(client); + vpn_args[0] = filename; + vpn_args[1] = "connect"; + vpn_args[2] = (gchar *)profile; + vpn_args[3] = NULL; + +/* start vpnclient */ + start_term(vpn_args,mainwindow); + +/* check to see if vpnclient was successfully activated */ + if ( vpnclient_pid <= 1 ) + { + + return 0; + } + + return 1; } -/* creates pty + +/* creates pty Used code from anjuta and gst projects. */ - + void start_term ( gchar **args, GtkWidget *main_window) { - int pty_master_fd, md; - int stdout_pipe[2],stderr_pipe[2]; - GIOChannel *pty_channel = NULL; - GIOChannel *stdout_channel = NULL; - GIOChannel *stderr_channel = NULL; - - - pipe (stderr_pipe); - pipe (stdout_pipe); - /* Fork the command */ - vpnclient_pid = forkpty (&pty_master_fd, NULL, NULL, NULL); - if (vpnclient_pid == 0) + int pty_master_fd, md; + int stdout_pipe[2],stderr_pipe[2]; + GIOChannel *pty_channel = NULL; + GIOChannel *stdout_channel = NULL; + GIOChannel *stderr_channel = NULL; + + pipe (stderr_pipe); + pipe (stdout_pipe); +/* Fork the command */ + vpnclient_pid = forkpty (&pty_master_fd, NULL, NULL, NULL); + if (vpnclient_pid == 0) { - unsetenv("LC_ALL"); - unsetenv("LC_MESSAGES"); - unsetenv("LANG"); - unsetenv("LANGUAGE"); - - dup2 (stderr_pipe[1],2); - dup2 (stdout_pipe[1],1); - - /* Close unnecessary pipes */ - close (stderr_pipe[0]); - close (stdout_pipe[0]); - - execvp (args[0], args); - exit(255); - } - - /* Close parent's side pipes */ - close (stderr_pipe[1]); - close (stdout_pipe[1]); - - if (vpnclient_pid < 0) + unsetenv("LC_ALL"); + unsetenv("LC_MESSAGES"); + unsetenv("LANG"); + unsetenv("LANGUAGE"); + + dup2 (stderr_pipe[1],2); + dup2 (stdout_pipe[1],1); + +/* Close unnecessary pipes */ + close (stderr_pipe[0]); + close (stdout_pipe[0]); + + execvp (args[0], args); + exit(255); + } + +/* Close parent's side pipes */ + close (stderr_pipe[1]); + close (stdout_pipe[1]); + + if (vpnclient_pid < 0) { - /* if fork failed */ - /* Close parent's side pipes */ - close (stderr_pipe[0]); - close (stdout_pipe[0]); - exit(255); +/* if fork failed */ +/* Close parent's side pipes */ + close (stderr_pipe[0]); + close (stdout_pipe[0]); + exit(255); } - - - /* Initialize GIOChannels */ - pty_channel = g_io_channel_unix_new(pty_master_fd); - stderr_channel = g_io_channel_unix_new (stderr_pipe[0]); - stdout_channel = g_io_channel_unix_new (stdout_pipe[0]); - /* Set channels to not block */ - g_io_channel_set_flags(stdout_channel,G_IO_FLAG_NONBLOCK,NULL); - g_io_channel_set_flags(stderr_channel,G_IO_FLAG_NONBLOCK,NULL); - g_io_channel_set_flags(pty_channel, G_IO_FLAG_NONBLOCK,NULL); - /* track stdout and stderr channel using main_window widget */ - g_object_set_data(G_OBJECT(main_window),"stdout",stdout_channel); - g_object_set_data(G_OBJECT(main_window),"stderr",stderr_channel); - g_object_set_data(G_OBJECT(main_window),"pty",pty_channel); - - /* Watch events for stdout stream */ - g_io_add_watch (stdout_channel, - G_IO_IN | G_IO_HUP , - (GIOFunc)iofunc_stdout, (gpointer)main_window); - /* Exit. Process created successfully! */ +/* Initialize GIOChannels */ + pty_channel = g_io_channel_unix_new(pty_master_fd); + stderr_channel = g_io_channel_unix_new (stderr_pipe[0]); + stdout_channel = g_io_channel_unix_new (stdout_pipe[0]); +/* Set channels to not block */ + g_io_channel_set_flags(stdout_channel,G_IO_FLAG_NONBLOCK,NULL); + g_io_channel_set_flags(stderr_channel,G_IO_FLAG_NONBLOCK,NULL); + g_io_channel_set_flags(pty_channel, G_IO_FLAG_NONBLOCK,NULL); +/* track stdout and stderr channel using main_window widget */ + g_object_set_data(G_OBJECT(main_window),"stdout",stdout_channel); + g_object_set_data(G_OBJECT(main_window),"stderr",stderr_channel); + g_object_set_data(G_OBJECT(main_window),"pty",pty_channel); + +/* Watch events for stdout stream */ + g_io_add_watch (stdout_channel, + G_IO_IN | G_IO_HUP , + (GIOFunc)iofunc_stdout, (gpointer)main_window); +/* Exit. Process created successfully! */ } + int getHostnamefromProfile(GtkWidget *mywidget) { - int profile_fd; - GIOChannel *Mychannel = NULL; - GError *error = NULL; - GString *line = NULL; - gboolean pending; - gchar *matching_line = "Host"; - gchar **host = NULL; - gchar *filename = NULL; - GConfClient *client ; - GtkEntry *hostname_entry ; - - - client = gconf_client_get_default(); - hostname_entry = GTK_ENTRY(lookup_widget(mywidget, - "hostname_entry" )); - filename = gtk_editable_get_chars(GTK_EDITABLE(mywidget),0,-1); - filename = g_strjoin(".",filename,"pcf",NULL); - - filename = g_strjoin("/", - gconf_client_get_string( - client, - "/apps/gnome-settings/gvpndialer/profiledir", - NULL), - filename, - NULL - ); - g_object_unref(client); - /* Initialize GString */ - line = g_string_new(""); - /* Use open to create a file descriptor that points to an int */ - profile_fd = open(filename,O_RDONLY); - /* for some reason the widget chooses a filename that doesn't exist need to catch this */ - if ( profile_fd == -1 ){ - return 0; - } + int profile_fd; + GIOChannel *Mychannel = NULL; + GError *error = NULL; + GString *line = NULL; + gboolean pending; + gchar *matching_line = "Host"; + gchar **host = NULL; + gchar *filename = NULL; + GConfClient *client ; + GtkEntry *hostname_entry ; + + client = gconf_client_get_default(); + hostname_entry = GTK_ENTRY(lookup_widget(mywidget, + "hostname_entry" )); + filename = gtk_editable_get_chars(GTK_EDITABLE(mywidget),0,-1); + filename = g_strjoin(".",filename,"pcf",NULL); + + filename = g_strjoin("/", + gconf_client_get_string( + client, + "/apps/gnome-settings/gvpndialer/profiledir", + NULL), + filename, + NULL + ); + g_object_unref(client); +/* Initialize GString */ + line = g_string_new(""); +/* Use open to create a file descriptor that points to an int */ + profile_fd = open(filename,O_RDONLY); +/* for some reason the widget chooses a filename that doesn't exist need to catch this */ + if ( profile_fd == -1 ) + { + return 0; + } - Mychannel = g_io_channel_unix_new(profile_fd); - if(Mychannel != NULL ) + Mychannel = g_io_channel_unix_new(profile_fd); + if(Mychannel != NULL ) { - /* read each line of the file, and find the line starting with +/* read each line of the file, and find the line starting with Host - split the line and only print out the hostname */ - while(g_io_channel_read_line_string + split the line and only print out the hostname */ + while(g_io_channel_read_line_string (Mychannel,line,NULL,&error) == G_IO_STATUS_NORMAL) { - if (g_ascii_strncasecmp(line->str,matching_line,4) == 0 ) + if (g_ascii_strncasecmp(line->str,matching_line,4) == 0 ) { - host = g_strsplit(g_strchomp(line->str),"=",2); - gtk_entry_set_text(hostname_entry,host[1]); - break; + host = g_strsplit(g_strchomp(line->str),"=",2); + gtk_entry_set_text(hostname_entry,host[1]); + break; } } - } else { - return 0; } - g_io_channel_shutdown(Mychannel,pending,&error); - g_free(filename); - g_strfreev(host); - g_string_free(line,TRUE); - close(profile_fd); - return 1; + else + { + return 0; + } + g_io_channel_shutdown(Mychannel,pending,&error); + g_free(filename); + g_strfreev(host); + g_string_free(line,TRUE); + close(profile_fd); + return 1; } + /* according to GTK API GtkCombo is deprecated .. Need to work on using new way but also supporting old way */ int getProfiles (gchar *dir_path, - GtkCombo *vpn_profile_entry){ - - GDir *directory = NULL; - GList *vpn_profiles = NULL; - GError **error = NULL; - gchar *filename = NULL; - gchar **split_string = NULL; - gchar *lastprofile; - GConfClient *client; - int count = 0; - int last_profile_exists = 0; - - client = gconf_client_get_default(); - lastprofile = gconf_client_get_string(client,"/apps/gnome-settings/gvpndialer/lastchosenprofile",NULL); - - - /*unreference gconfclient */ - g_object_unref(client); - - directory = g_dir_open(dir_path,0,error); - while ((filename = (gchar *) g_dir_read_name(directory)) != NULL ){ /*run for *.pcf file only */ - if (g_str_has_suffix(filename,"pcf") == TRUE ){ - /* save filename in Glist */ - count++; - - split_string = g_strsplit(filename,".",2); - /* put the default profile at the top of the list */ - if(( lastprofile != NULL ) - && (last_profile_exists == 0 ) ){ - - if ( ( g_ascii_strcasecmp(lastprofile,split_string[0])) == 0 ){ - last_profile_exists = 1; - }else { - vpn_profiles = g_list_append (vpn_profiles,split_string[0]); - } - - }else{ - vpn_profiles = g_list_append (vpn_profiles, split_string[0]); } +GtkCombo *vpn_profile_entry) +{ + + GDir *directory = NULL; + GList *vpn_profiles = NULL; + GError **error = NULL; + gchar *filename = NULL; + gchar **split_string = NULL; + gchar *lastprofile; + GConfClient *client; + int count = 0; + int last_profile_exists = 0; + + client = gconf_client_get_default(); + lastprofile = gconf_client_get_string(client,"/apps/gnome-settings/gvpndialer/lastchosenprofile",NULL); + +/*unreference gconfclient */ + g_object_unref(client); + + directory = g_dir_open(dir_path,0,error); + /*run for *.pcf file only */ + while ((filename = (gchar *) g_dir_read_name(directory)) != NULL ) + { + if (g_str_has_suffix(filename,"pcf") == TRUE ) + { +/* save filename in Glist */ + count++; + + split_string = g_strsplit(filename,".",2); +/* put the default profile at the top of the list */ + if(( lastprofile != NULL ) + && (last_profile_exists == 0 ) ) + { + + if ( ( g_ascii_strcasecmp(lastprofile,split_string[0])) == 0 ) + { + last_profile_exists = 1; + } + else + { + vpn_profiles = g_list_append (vpn_profiles,split_string[0]); + } + + } + else + { + vpn_profiles = g_list_append (vpn_profiles, split_string[0]); + } + } } - } - - if ( count == 0 ) return 0; - /* sort list alphabetically */ - vpn_profiles = glist_strings_sort(vpn_profiles); - /* add last used profile to the top */ - if (last_profile_exists == 1 ){ - vpn_profiles = g_list_prepend (vpn_profiles,lastprofile); - } - gtk_combo_set_popdown_strings(vpn_profile_entry,vpn_profiles); - g_dir_close(directory); - g_list_free(vpn_profiles); - g_free(lastprofile); - g_strfreev(split_string); - return 1; + + if ( count == 0 ) return 0; +/* sort list alphabetically */ + vpn_profiles = glist_strings_sort(vpn_profiles); +/* add last used profile to the top */ + if (last_profile_exists == 1 ) + { + vpn_profiles = g_list_prepend (vpn_profiles,lastprofile); + } + gtk_combo_set_popdown_strings(vpn_profile_entry,vpn_profiles); + g_dir_close(directory); + g_list_free(vpn_profiles); + g_free(lastprofile); + g_strfreev(split_string); + return 1; } + /* check if vpn connection is alive */ -gboolean is_vpn_connection_active_full (gpointer mainwindow) { - pid_t zombie; - - int is_process_died; - GtkWidget *icon; - - is_process_died = kill(vpnclient_pid,0); - zombie = waitpid(vpnclient_pid,NULL,WNOHANG); - /* if the process is not there, please stop checking the vpn connection */ - if (is_process_died){ return FALSE; } - - /* check if vpnclient is a zombie */ - if (zombie){ - if (! GTK_WIDGET_VISIBLE(mainwindow)){ +gboolean is_vpn_connection_active_full (gpointer mainwindow) +{ + pid_t zombie; + + int is_process_died; + GtkWidget *icon; + + is_process_died = kill(vpnclient_pid,0); + zombie = waitpid(vpnclient_pid,NULL,WNOHANG); +/* if the process is not there, please stop checking the vpn connection */ + if (is_process_died){ return FALSE; } + +/* check if vpnclient is a zombie */ + if (zombie) + { + if (! GTK_WIDGET_VISIBLE(mainwindow)) + { gtk_widget_show(mainwindow); - } - update_statusbar(GTK_WIDGET(mainwindow) - ,"VPN Connection Ended Abruptly or VPN Daemon is not active"); - icon = GTK_WIDGET(g_object_get_data(G_OBJECT(mainwindow),"icon")); - tray_icon_load(icon,"gvpndialer/status_unlocked.png"); - close_all_io_channels(mainwindow); - /* show main window if you get an abrupt failure */ - if (! GTK_WIDGET_VISIBLE(mainwindow) ) gtk_widget_show(mainwindow); - return FALSE; - } else { - return TRUE; - } - -} - -gboolean is_vpn_connection_active () { - pid_t zombie; - int is_process_died; - is_process_died = kill(vpnclient_pid,0); - zombie = waitpid(vpnclient_pid,NULL,WNOHANG); - /* if the process is not there, please stop checking the vpn connection */ - if (is_process_died){ return FALSE; } - - /* check if vpnclient is a zombie */ - if (zombie){ - return FALSE; - } else { - return TRUE; - } - + } + update_statusbar(GTK_WIDGET(mainwindow) + ,"VPN Connection Ended Abruptly or VPN Daemon is not active"); + icon = GTK_WIDGET(g_object_get_data(G_OBJECT(mainwindow),"icon")); + tray_icon_load(icon,"gvpndialer/status_unlocked.png"); + close_all_io_channels(mainwindow); +/* show main window if you get an abrupt failure */ + if (! GTK_WIDGET_VISIBLE(mainwindow) ) gtk_widget_show(mainwindow); + return FALSE; + } + else + { + return TRUE; + } + +} + + +gboolean is_vpn_connection_active () +{ + pid_t zombie; + int is_process_died; + is_process_died = kill(vpnclient_pid,0); + zombie = waitpid(vpnclient_pid,NULL,WNOHANG); +/* if the process is not there, please stop checking the vpn connection */ + if (is_process_died){ return FALSE; } + +/* check if vpnclient is a zombie */ + if (zombie) + { + return FALSE; + } + else + { + return TRUE; + } + } + /* Close all IO Channels before killing process */ -void close_all_io_channels(gpointer mymain_window) { - - GIOChannel *stdout_channel = (GIOChannel *)g_object_get_data(G_OBJECT(mymain_window), - "stdout"); - GIOChannel *stderr_channel = (GIOChannel *)g_object_get_data(G_OBJECT(mymain_window), - "stderr"); - GIOChannel *pty_channel = (GIOChannel *)g_object_get_data(G_OBJECT(mymain_window), - "pty"); - GString *buf = g_string_new_len("",1024); - GIOStatus ret; - if (g_io_channel_get_flags(stderr_channel) & G_IO_FLAG_IS_READABLE){ - ret = g_io_channel_read_line_string(stderr_channel, buf,NULL,NULL); - if (ret == G_IO_STATUS_NORMAL ){ - update_statusbar(GTK_WIDGET(mymain_window),buf->str); - - } - } - g_string_free(buf,TRUE); - g_io_channel_shutdown(stdout_channel,TRUE,NULL); - g_io_channel_shutdown(stderr_channel,TRUE,NULL); - g_io_channel_shutdown(pty_channel,TRUE,NULL); +void close_all_io_channels(gpointer mymain_window) +{ + + GIOChannel *stdout_channel = (GIOChannel *)g_object_get_data(G_OBJECT(mymain_window), + "stdout"); + GIOChannel *stderr_channel = (GIOChannel *)g_object_get_data(G_OBJECT(mymain_window), + "stderr"); + GIOChannel *pty_channel = (GIOChannel *)g_object_get_data(G_OBJECT(mymain_window), + "pty"); + GString *buf = g_string_new_len("",1024); + GIOStatus ret; + if (g_io_channel_get_flags(stderr_channel) & G_IO_FLAG_IS_READABLE) + { + ret = g_io_channel_read_line_string(stderr_channel, buf,NULL,NULL); + if (ret == G_IO_STATUS_NORMAL ) + { + update_statusbar(GTK_WIDGET(mymain_window),buf->str); + + } + } + g_string_free(buf,TRUE); + g_io_channel_shutdown(stdout_channel,TRUE,NULL); + g_io_channel_shutdown(stderr_channel,TRUE,NULL); + g_io_channel_shutdown(pty_channel,TRUE,NULL); } /* this function runs every second while the status window is up */ /* It updates the stats on the status/statistics window */ -gboolean updatestats( gpointer data ){ +gboolean updatestats( gpointer data ) +{ #define TUNNELSTATS 1 #define TRAFFICSTATS 2 #define ROUTESTATS 3 - - GString *routestats; - GString *trafficstats; - GString *tunnelstats; - GString *mybuffer; - int statstype; - GError *error; - gint output_fd,child_pid; - gchar *vpnfilename; - GtkWidget *statuswindow; - GtkWidget *mainwindow; - GIOChannel *vpnstats_io; - GtkTextView *tunnel; - GtkTextView *route; - GtkTextView *traffic; - GConfClient *client; - client = gconf_client_get_default(); - vpnfilename = gconf_client_get_string(client,"/apps/gnome-settings/gvpndialer/vpnclientdir",NULL); - vpnfilename = g_strjoin("/",vpnfilename,"vpnclient",NULL); - g_object_unref(client); - - mybuffer = g_string_new(""); - routestats = g_string_new(""); - trafficstats = g_string_new(""); - tunnelstats = g_string_new(""); - statuswindow = GTK_WIDGET(data); - - traffic = (GtkTextView *)lookup_widget(statuswindow,"trafficstats_text"); - route = (GtkTextView *)lookup_widget(statuswindow,"routestats_text"); - tunnel = (GtkTextView *)lookup_widget(statuswindow,"tunnelstats_text"); - gchar *executable[] = {vpnfilename,"stat",NULL}; - /* if status window is visible, print the latest stats */ - if ( GTK_WIDGET_VISIBLE(statuswindow) ){ - /* create a new i/o pipe to capture data from vpnclient stat */ - if ( g_spawn_async_with_pipes - (NULL, - executable, - NULL, - (G_SPAWN_SEARCH_PATH), - NULL, - NULL, - &child_pid, - NULL, - &output_fd, - NULL, - &error)) - { - error = NULL; - vpnstats_io = g_io_channel_unix_new(output_fd); - while (g_io_channel_read_line_string - (vpnstats_io,mybuffer,NULL,&error) - == G_IO_STATUS_NORMAL){ - if (g_ascii_strncasecmp - ("VPN tunnel",mybuffer->str,10) == 0 ){ - statstype = 1; - continue; - }else if (g_ascii_strncasecmp - ("VPN traffic",mybuffer->str,11) == 0 ){ - statstype = 2; - continue; - }else if (g_ascii_strncasecmp - ("Configured routes",mybuffer->str,17) == 0 ){ - statstype = 3; - } - switch(statstype) { - case TUNNELSTATS: - g_string_append(tunnelstats,mybuffer->str); - break; - case TRAFFICSTATS: - g_string_append(trafficstats,mybuffer->str); - break; - case ROUTESTATS: - g_string_append(routestats,mybuffer->str); - break; - } - } - /* update the vpnclient status window with the latest data */ - gtk_text_buffer_set_text - (gtk_text_view_get_buffer - (traffic),trafficstats->str,-1); - gtk_text_buffer_set_text - (gtk_text_view_get_buffer - (route),routestats->str,-1); - gtk_text_buffer_set_text - (gtk_text_view_get_buffer - (tunnel),tunnelstats->str,-1); - - - g_io_channel_shutdown(vpnstats_io,TRUE,NULL); - g_string_free(mybuffer,TRUE); - g_string_free(tunnelstats,TRUE); - g_string_free(trafficstats,TRUE); - g_string_free(routestats,TRUE); - return TRUE; - }else { - /* for some reason can't execute vpnclient stat */ - return FALSE; - } - } else - /* status window is closed */ - return FALSE; + + GString *routestats; + GString *trafficstats; + GString *tunnelstats; + GString *mybuffer; + int statstype; + GError *error; + gint output_fd,child_pid; + gchar *vpnfilename; + GtkWidget *statuswindow; + GtkWidget *mainwindow; + GIOChannel *vpnstats_io; + GtkTextView *tunnel; + GtkTextView *route; + GtkTextView *traffic; + GConfClient *client; + client = gconf_client_get_default(); + vpnfilename = gconf_client_get_string(client,"/apps/gnome-settings/gvpndialer/vpnclientdir",NULL); + vpnfilename = g_strjoin("/",vpnfilename,"vpnclient",NULL); + g_object_unref(client); + + mybuffer = g_string_new(""); + routestats = g_string_new(""); + trafficstats = g_string_new(""); + tunnelstats = g_string_new(""); + statuswindow = GTK_WIDGET(data); + + traffic = (GtkTextView *)lookup_widget(statuswindow,"trafficstats_text"); + route = (GtkTextView *)lookup_widget(statuswindow,"routestats_text"); + tunnel = (GtkTextView *)lookup_widget(statuswindow,"tunnelstats_text"); + gchar *executable[] = {vpnfilename,"stat",NULL}; +/* if status window is visible, print the latest stats */ + if ( GTK_WIDGET_VISIBLE(statuswindow) ) + { +/* create a new i/o pipe to capture data from vpnclient stat */ + if ( g_spawn_async_with_pipes + (NULL, + executable, + NULL, + (G_SPAWN_SEARCH_PATH), + NULL, + NULL, + &child_pid, + NULL, + &output_fd, + NULL, + &error)) + { + error = NULL; + vpnstats_io = g_io_channel_unix_new(output_fd); + while (g_io_channel_read_line_string + (vpnstats_io,mybuffer,NULL,&error) + == G_IO_STATUS_NORMAL) + { + if (g_ascii_strncasecmp + ("VPN tunnel",mybuffer->str,10) == 0 ) + { + statstype = 1; + continue; + }else if (g_ascii_strncasecmp + ("VPN traffic",mybuffer->str,11) == 0 ) + { + statstype = 2; + continue; + }else if (g_ascii_strncasecmp + ("Configured routes",mybuffer->str,17) == 0 ) + { + statstype = 3; + } + switch(statstype) + { + case TUNNELSTATS: + g_string_append(tunnelstats,mybuffer->str); + break; + case TRAFFICSTATS: + g_string_append(trafficstats,mybuffer->str); + break; + case ROUTESTATS: + g_string_append(routestats,mybuffer->str); + break; + } + } +/* update the vpnclient status window with the latest data */ + gtk_text_buffer_set_text + (gtk_text_view_get_buffer + (traffic),trafficstats->str,-1); + gtk_text_buffer_set_text + (gtk_text_view_get_buffer + (route),routestats->str,-1); + gtk_text_buffer_set_text + (gtk_text_view_get_buffer + (tunnel),tunnelstats->str,-1); + + g_io_channel_shutdown(vpnstats_io,TRUE,NULL); + g_string_free(mybuffer,TRUE); + g_string_free(tunnelstats,TRUE); + g_string_free(trafficstats,TRUE); + g_string_free(routestats,TRUE); + return TRUE; + } + else + { +/* for some reason can't execute vpnclient stat */ + return FALSE; + } + } else +/* status window is closed */ + return FALSE; } - + /* creates the sys tray */ -void tray_create (GtkWidget *mainwindow) { - GtkWidget *box; - EggTrayIcon *tray_icon; - GtkWidget *icon = NULL ; - GtkWidget *menu = NULL; - - /* create the menu, if it doesn't exist */ - - if (!menu){ - /* create menu */ - menu = gtk_menu_new(); - /* associate menu and mainwindow */ - g_object_set_data(G_OBJECT(menu),"mainwindow",mainwindow); - /* add menuitems */ - create_menu (menu); - - } - - /* create the system tray entry */ - tray_icon = egg_tray_icon_new ("GvpnDialer System Tray"); - box = gtk_event_box_new (); - icon = gtk_image_new (); - - - /* continue creating system tray entry */ - gtk_container_add (GTK_CONTAINER (box), icon); - gtk_container_add (GTK_CONTAINER (tray_icon), box); - gtk_widget_show_all (GTK_WIDGET (tray_icon)); - - g_signal_connect (G_OBJECT (box), "button-press-event", G_CALLBACK (clicked), (gpointer)menu); - - /* associate icon with main window */ - g_object_set_data(G_OBJECT(mainwindow),"icon",icon); - - /* load the icon */ - tray_icon_load (icon,"gvpndialer/status_unlocked.png"); +void tray_create (GtkWidget *mainwindow) +{ + GtkWidget *box; + EggTrayIcon *tray_icon; + GtkWidget *icon = NULL ; + GtkWidget *menu = NULL; + +/* create the menu, if it doesn't exist */ + + if (!menu) + { +/* create menu */ + menu = gtk_menu_new(); +/* associate menu and mainwindow */ + g_object_set_data(G_OBJECT(menu),"mainwindow",mainwindow); +/* add menuitems */ + create_menu (menu); + + } + +/* create the system tray entry */ + tray_icon = egg_tray_icon_new ("GvpnDialer System Tray"); + box = gtk_event_box_new (); + icon = gtk_image_new (); + +/* continue creating system tray entry */ + gtk_container_add (GTK_CONTAINER (box), icon); + gtk_container_add (GTK_CONTAINER (tray_icon), box); + gtk_widget_show_all (GTK_WIDGET (tray_icon)); + + g_signal_connect (G_OBJECT (box), "button-press-event", G_CALLBACK (clicked), (gpointer)menu); + +/* associate icon with main window */ + g_object_set_data(G_OBJECT(mainwindow),"icon",icon); + +/* load the icon */ + tray_icon_load (icon,"gvpndialer/status_unlocked.png"); } -void tray_icon_load (GtkWidget *icon, const gchar *file){ - GdkPixbuf *pixbuf; - /* pixbuf = gtk_image_get_pixbuf (GTK_IMAGE (icon)); - if (pixbuf) - g_object_unref (G_OBJECT (pixbuf)); - pixbuf = gdk_pixbuf_new_from_file (file, NULL); - gtk_image_set_from_pixbuf (GTK_IMAGE (icon), pixbuf); +void tray_icon_load (GtkWidget *icon, const gchar *file) +{ + GdkPixbuf *pixbuf; +/* pixbuf = gtk_image_get_pixbuf (GTK_IMAGE (icon)); + if (pixbuf) + g_object_unref (G_OBJECT (pixbuf)); + pixbuf = gdk_pixbuf_new_from_file (file, NULL); + gtk_image_set_from_pixbuf (GTK_IMAGE (icon), pixbuf); */ - pixbuf = create_pixbuf(file); - gtk_image_set_from_pixbuf (GTK_IMAGE(icon),pixbuf); + pixbuf = create_pixbuf(file); + gtk_image_set_from_pixbuf (GTK_IMAGE(icon),pixbuf); } - void clicked (GtkWidget *widget, GdkEventButton *event, gpointer data) { - - GtkWidget *mainwindow; - if (event->button == 3 ){ - gtk_menu_popup (GTK_MENU (data), NULL, NULL, NULL, NULL, event->button, - event->time); - }else if (event->button == 1 ){ - mainwindow = GTK_WIDGET(g_object_get_data(G_OBJECT(data),"mainwindow")); - if ( GTK_WIDGET_VISIBLE(mainwindow)){ - gtk_widget_hide(mainwindow); - } else { - gtk_widget_show(mainwindow); + + GtkWidget *mainwindow; + if (event->button == 3 ) + { + gtk_menu_popup (GTK_MENU (data), NULL, NULL, NULL, NULL, event->button, + event->time); + } + else if (event->button == 1 ) + { + mainwindow = GTK_WIDGET(g_object_get_data(G_OBJECT(data),"mainwindow")); + if ( GTK_WIDGET_VISIBLE(mainwindow)) + { + gtk_widget_hide(mainwindow); + } + else + { + gtk_widget_show(mainwindow); + } } - } } - + void create_menu (GtkWidget *menu) { - GtkWidget *menuitem; - - GtkWidget *mainwindow; - GtkButton *connect; - GtkButton *disconnect; - GtkButton *status; - - - /* get mainwindow pointer */ - - mainwindow = GTK_WIDGET(g_object_get_data(G_OBJECT(menu),"mainwindow")); - /* create the menus */ - menuitem = gtk_menu_item_new_with_label ("Connect"); - g_signal_connect(G_OBJECT(menuitem),"activate", G_CALLBACK(tray_connect_selected),(gpointer)mainwindow); - gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); - menuitem = gtk_menu_item_new_with_label ("Disconnect"); - g_signal_connect(G_OBJECT(menuitem),"activate", G_CALLBACK(tray_disconnect_selected),(gpointer)mainwindow); - gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); - - menuitem = gtk_separator_menu_item_new (); - gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); - - menuitem = gtk_menu_item_new_with_label ("Status"); - g_signal_connect(G_OBJECT(menuitem),"activate", G_CALLBACK(tray_status_selected),(gpointer)mainwindow); - gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); - - menuitem = gtk_separator_menu_item_new (); - gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); - - - menuitem = gtk_menu_item_new_with_label (_("Exit")); - g_signal_connect (G_OBJECT (menuitem), "activate", G_CALLBACK (gtk_main_quit), 0); - gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); - - gtk_widget_show_all (menu); + GtkWidget *menuitem; + + GtkWidget *mainwindow; + GtkButton *connect; + GtkButton *disconnect; + GtkButton *status; + +/* get mainwindow pointer */ + + mainwindow = GTK_WIDGET(g_object_get_data(G_OBJECT(menu),"mainwindow")); +/* create the menus */ + menuitem = gtk_menu_item_new_with_label ("Connect"); + g_signal_connect(G_OBJECT(menuitem),"activate", G_CALLBACK(tray_connect_selected),(gpointer)mainwindow); + gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); + menuitem = gtk_menu_item_new_with_label ("Disconnect"); + g_signal_connect(G_OBJECT(menuitem),"activate", G_CALLBACK(tray_disconnect_selected),(gpointer)mainwindow); + gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); + + menuitem = gtk_separator_menu_item_new (); + gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); + + menuitem = gtk_menu_item_new_with_label ("Status"); + g_signal_connect(G_OBJECT(menuitem),"activate", G_CALLBACK(tray_status_selected),(gpointer)mainwindow); + gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); + + menuitem = gtk_separator_menu_item_new (); + gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); + + menuitem = gtk_menu_item_new_with_label (_("Exit")); + g_signal_connect (G_OBJECT (menuitem), "activate", G_CALLBACK (gtk_main_quit), 0); + gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); + + gtk_widget_show_all (menu); } -void tray_status_selected(GtkMenuItem *menuitem,gpointer user_data){ - GtkButton *status; - - status = (GtkButton *)lookup_widget(GTK_WIDGET (user_data),"status_button"); - on_status_button_clicked(status,0); +void tray_status_selected(GtkMenuItem *menuitem,gpointer user_data) +{ + + GtkButton *status; + + status = (GtkButton *)lookup_widget(GTK_WIDGET (user_data),"status_button"); + on_status_button_clicked(status,0); } -void tray_disconnect_selected(GtkMenuItem *menuitem, gpointer user_data){ - GtkButton *disconnect; +void tray_disconnect_selected(GtkMenuItem *menuitem, gpointer user_data) +{ + + GtkButton *disconnect; - disconnect = (GtkButton *)lookup_widget(GTK_WIDGET(user_data),"disconnect_button"); - on_disconnect_button_clicked(disconnect,0); + disconnect = (GtkButton *)lookup_widget(GTK_WIDGET(user_data),"disconnect_button"); + on_disconnect_button_clicked(disconnect,0); } -void tray_connect_selected(GtkMenuItem *menuitem, gpointer user_data){ - GtkButton *connect; - connect = (GtkButton *)lookup_widget(GTK_WIDGET(user_data),"execute_vpn_button"); - on_execute_vpn_button_clicked(connect,0); +void tray_connect_selected(GtkMenuItem *menuitem, gpointer user_data) +{ + GtkButton *connect; + + connect = (GtkButton *)lookup_widget(GTK_WIDGET(user_data),"execute_vpn_button"); + on_execute_vpn_button_clicked(connect,0); } + /* Returns the following. If "group password" is found return 1 If "Username and Password" is found return 2 @@ -1297,172 +1392,186 @@ If "Reason:" is found return 8 If "Save Password" is found return 9 If no match return 0 */ - int check_for_events(GString *buf){ - if (check_for_string("group password", buf->str)) { return 1; } - if (check_for_string("Username and Password",buf->str)){ return 2; } - if (check_for_string("Username",buf->str)){ return 3;} - if (check_for_string("Contacting the gateway",buf->str)){ return 4;} - if (check_for_string("continue",buf->str)){ return 5;} - if (check_for_string("VPN connection is secure",buf->str)) { return 6;} - if (check_for_string("terminated",buf->str)){ return 7;} - if (check_for_string("Reason:",buf->str)){ return 8;} - if (check_for_string("Save Password",buf->str)){ return 9;} - /* found nothing */ - return 0; +int check_for_events(GString *buf) +{ + if (check_for_string("group password", buf->str)) { return 1; } + if (check_for_string("Username and Password",buf->str)){ return 2; } + if (check_for_string("Username",buf->str)){ return 3;} + if (check_for_string("Contacting the gateway",buf->str)){ return 4;} + if (check_for_string("continue",buf->str)){ return 5;} + if (check_for_string("VPN connection is secure",buf->str)) { return 6;} + if (check_for_string("terminated",buf->str)){ return 7;} + if (check_for_string("Reason:",buf->str)){ return 8;} + if (check_for_string("Save Password",buf->str)){ return 9;} +/* found nothing */ + return 0; } -/* return true if pattern is found - returns -1 if pattern is bogus + + +/* return true if pattern is found + returns -1 if pattern is bogus return 0 if pattern is not found Code from Apache 2.0 pcre demo */ -int check_for_string(gchar *pattern, gchar *subject){ - pcre *re; - const char *error; - int erroffset; - int subject_length; - int rc; - int result = 0; - int ovector[OVECCOUNT]; - - subject_length = strlen(subject); - re = pcre_compile ( - pattern, /*the pattern*/ - 0, /* default options*/ - &error, /* for error message */ - &erroffset, /* for error offset */ - NULL); - /* if compilation failed: print critical message */ - if (re == NULL){ - g_critical("PCRE compilation failed at offset %d: %s\n", erroffset,error); - return -1; - } - /************************************************************************* - * If the compilation succeeded, we call PCRE again, in order to do a * - * pattern match against the subject string. This does just ONE match. If * - * further matching is needed, it will be done below. * - *************************************************************************/ - - rc = pcre_exec( - re, /* the compiled pattern */ - NULL, /* no extra data - we didn't study the pattern */ - subject, /* the subject string */ - subject_length, /* the length of the subject */ - 0, /* start at offset 0 in the subject */ - 0, /* default options */ - ovector, /* output vector for substring information */ - OVECCOUNT); /* number of elements in the output vector */ - - if (rc <= 0 ){ - free(re); - /* debug no MATCH or some type of error*/ - return 0; - } - free(re); /* release memory used for the compiled pattern */ - return rc; +int check_for_string(gchar *pattern, gchar *subject) +{ + pcre *re; + const char *error; + int erroffset; + int subject_length; + int rc; + int result = 0; + int ovector[OVECCOUNT]; + + subject_length = strlen(subject); + re = pcre_compile ( + pattern, /*the pattern*/ + 0, /* default options*/ + &error, /* for error message */ + &erroffset, /* for error offset */ + NULL); +/* if compilation failed: print critical message */ + if (re == NULL) + { + g_critical("PCRE compilation failed at offset %d: %s\n", erroffset,error); + return -1; + } +/************************************************************************* + * If the compilation succeeded, we call PCRE again, in order to do a * + * pattern match against the subject string. This does just ONE match. If * + * further matching is needed, it will be done below. * + *************************************************************************/ + + rc = pcre_exec( + re, /* the compiled pattern */ + NULL, /* no extra data - we didn't study the pattern */ + subject, /* the subject string */ + subject_length, /* the length of the subject */ + 0, /* start at offset 0 in the subject */ + 0, /* default options */ + ovector, /* output vector for substring information */ + OVECCOUNT); /* number of elements in the output vector */ + + if (rc <= 0 ) + { + free(re); +/* debug no MATCH or some type of error*/ + return 0; + } + free(re); /* release memory used for the compiled pattern */ + return rc; } + void on_enter_group_password_activate (GtkEntry *entry, - gpointer user_data) +gpointer user_data) { - GtkButton *mybutton; - mybutton = GTK_BUTTON(lookup_widget(GTK_WIDGET(entry),"group_pw_okay_button")); - on_group_pw_submit_button_clicked(mybutton,user_data); + GtkButton *mybutton; + mybutton = GTK_BUTTON(lookup_widget(GTK_WIDGET(entry),"group_pw_okay_button")); + on_group_pw_submit_button_clicked(mybutton,user_data); } void on_group_pw_cancel_button_clicked (GtkButton *button, - gpointer user_data) +gpointer user_data) { -GtkWidget *main_window; - GtkWidget *toplevel; - GtkEntry *enter_password = NULL; - toplevel = gtk_widget_get_toplevel(GTK_WIDGET(button)); - main_window = GTK_WIDGET( - g_object_get_data( - G_OBJECT(toplevel), - "mainwindow_key")); + GtkWidget *main_window; + GtkWidget *toplevel; + GtkEntry *enter_password = NULL; + toplevel = gtk_widget_get_toplevel(GTK_WIDGET(button)); + main_window = GTK_WIDGET( + g_object_get_data( + G_OBJECT(toplevel), + "mainwindow_key")); /* clear the password field of the login window */ -enter_password = GTK_ENTRY(lookup_widget(GTK_WIDGET(button), - "group_pw_entry")); + enter_password = GTK_ENTRY(lookup_widget(GTK_WIDGET(button), + "group_pw_entry")); gtk_entry_set_text(enter_password,""); - /* Close login window and kill vpnclient */ - gtk_widget_hide(toplevel); - update_statusbar(main_window,"Status Message"); - close_all_io_channels(main_window); - kill_child(); +/* Close login window and kill vpnclient */ + gtk_widget_hide(toplevel); + update_statusbar(main_window,"Status Message"); + close_all_io_channels(main_window); + kill_child(); } void on_group_pw_submit_button_clicked (GtkButton *button, - gpointer user_data) +gpointer user_data) { - GtkWidget *grouppw_window = gtk_widget_get_toplevel(GTK_WIDGET(button)); - GtkEntry *grouppw_entry = GTK_ENTRY(lookup_widget(grouppw_window,"group_pw_entry")); - GtkLabel *grouppw_warning = GTK_LABEL(lookup_widget(grouppw_window,"grouppw_warning")); - GtkWidget *main_window = GTK_WIDGET(g_object_get_data(G_OBJECT(grouppw_window),"mainwindow_key")); - GIOChannel *ptychannel = (GIOChannel *)g_object_get_data(G_OBJECT(main_window),"pty"); - GIOChannel *stdoutchannel = (GIOChannel *)g_object_get_data(G_OBJECT(main_window),"stdout"); - - /* write group password to vpnclient */ - if ( ! (write_text_into_fd - (gtk_entry_get_text(grouppw_entry),ptychannel))){ - gtk_label_set_text(grouppw_warning, - "!!Group password cannot be empty!!"); - return; - } - /*begin to watch stdout of vpnclient again */ - g_io_add_watch(stdoutchannel,G_IO_IN | G_IO_HUP, (GIOFunc)iofunc_stdout, (gpointer)main_window); - /*clear group password entry and label */ - gtk_entry_set_text(grouppw_entry,""); - gtk_label_set_text(grouppw_warning,""); - /* hide group password window */ - gtk_widget_hide(grouppw_window); + GtkWidget *grouppw_window = gtk_widget_get_toplevel(GTK_WIDGET(button)); + GtkEntry *grouppw_entry = GTK_ENTRY(lookup_widget(grouppw_window,"group_pw_entry")); + GtkLabel *grouppw_warning = GTK_LABEL(lookup_widget(grouppw_window,"grouppw_warning")); + GtkWidget *main_window = GTK_WIDGET(g_object_get_data(G_OBJECT(grouppw_window),"mainwindow_key")); + GIOChannel *ptychannel = (GIOChannel *)g_object_get_data(G_OBJECT(main_window),"pty"); + GIOChannel *stdoutchannel = (GIOChannel *)g_object_get_data(G_OBJECT(main_window),"stdout"); + +/* write group password to vpnclient */ + if ( ! (write_text_into_fd + (gtk_entry_get_text(grouppw_entry),ptychannel))) + { + gtk_label_set_text(grouppw_warning, + "!!Group password cannot be empty!!"); + return; + } +/*begin to watch stdout of vpnclient again */ + g_io_add_watch(stdoutchannel,G_IO_IN | G_IO_HUP, (GIOFunc)iofunc_stdout, (gpointer)main_window); +/*clear group password entry and label */ + gtk_entry_set_text(grouppw_entry,""); + gtk_label_set_text(grouppw_warning,""); +/* hide group password window */ + gtk_widget_hide(grouppw_window); } + /* Code to sort VPN profiles. Obtained from the Anjuta Project */ static gint sort_node (gchar* a, gchar *b) { - if ( !a && !b) return 0; - else if (!a) return -1; - else if (!b) return 1; - return strcmp (a, b); + if ( !a && !b) return 0; + else if (!a) return -1; + else if (!b) return 1; + return strcmp (a, b); } + /* Sort the list alphabatically */ GList* glist_strings_sort (GList * list) { - return g_list_sort(list, (GCompareFunc)sort_node); + return g_list_sort(list, (GCompareFunc)sort_node); } + /* Check to see if network interface is down. For some reason vpnclient doesn't detect right away that the NIC is down. If you attempt to view the status during this state, your PC will hang..yuck ! */ int -is_network_connection_active(){ - GIOChannel *procroute; - GIOStatus ret; - gint active = 0; - GString *buf = g_string_new_len("",BUFSIZE); - procroute = g_io_channel_new_file("/proc/net/route","r",NULL); - while ( ret != G_IO_STATUS_EOF ){ - ret = g_io_channel_read_line_string(procroute,buf,NULL,NULL); - if (check_for_string("FFFFFFFF",buf->str)){ - active = 1; - } - } - g_io_channel_shutdown(procroute,TRUE,NULL); - return active; - +is_network_connection_active() +{ + GIOChannel *procroute; + GIOStatus ret; + gint active = 0; + GString *buf = g_string_new_len("",BUFSIZE); + procroute = g_io_channel_new_file("/proc/net/route","r",NULL); + while ( ret != G_IO_STATUS_EOF ) + { + ret = g_io_channel_read_line_string(procroute,buf,NULL,NULL); + if (check_for_string("FFFFFFFF",buf->str)) + { + active = 1; + } + } + g_io_channel_shutdown(procroute,TRUE,NULL); + return active; + } diff --git a/projects/gvpndialer/trunk/src/interface.c b/projects/gvpndialer/trunk/src/interface.c index d019af9..3e275df 100644 --- a/projects/gvpndialer/trunk/src/interface.c +++ b/projects/gvpndialer/trunk/src/interface.c @@ -78,7 +78,6 @@ create_vpnclient_main_window (void) GtkWidget *separatortoolitem1; GtkWidget *status_button; GtkWidget *separatortoolitem2; - GtkWidget *quit_button; GtkWidget *vbox2; GtkWidget *table3; GtkWidget *label10; @@ -143,12 +142,6 @@ create_vpnclient_main_window (void) gtk_widget_show (separatortoolitem2); gtk_container_add (GTK_CONTAINER (toolbar1), separatortoolitem2); - quit_button = (GtkWidget*) gtk_tool_button_new_from_stock ("gtk-quit"); - gtk_widget_show (quit_button); - gtk_container_add (GTK_CONTAINER (toolbar1), quit_button); - gtk_container_set_border_width (GTK_CONTAINER (quit_button), 7); - gtk_tool_item_set_tooltip (GTK_TOOL_ITEM (quit_button), tooltips, "Quit GVPN Dialer", NULL); - vbox2 = gtk_vbox_new (FALSE, 0); gtk_widget_show (vbox2); gnome_app_set_contents (GNOME_APP (vpnclient_main_window), vbox2); @@ -231,9 +224,6 @@ create_vpnclient_main_window (void) g_signal_connect ((gpointer) status_button, "clicked", G_CALLBACK (on_status_button_clicked), NULL); - g_signal_connect ((gpointer) quit_button, "clicked", - G_CALLBACK (on_quit_button_clicked), - NULL); g_signal_connect ((gpointer) vpn_profile_entry_box, "changed", G_CALLBACK (on_vpn_profile_entry_box_changed), NULL); @@ -255,7 +245,6 @@ create_vpnclient_main_window (void) GLADE_HOOKUP_OBJECT (vpnclient_main_window, separatortoolitem1, "separatortoolitem1"); GLADE_HOOKUP_OBJECT (vpnclient_main_window, status_button, "status_button"); GLADE_HOOKUP_OBJECT (vpnclient_main_window, separatortoolitem2, "separatortoolitem2"); - GLADE_HOOKUP_OBJECT (vpnclient_main_window, quit_button, "quit_button"); GLADE_HOOKUP_OBJECT (vpnclient_main_window, vbox2, "vbox2"); GLADE_HOOKUP_OBJECT (vpnclient_main_window, table3, "table3"); GLADE_HOOKUP_OBJECT (vpnclient_main_window, label10, "label10"); |