September 2010 - openSUSE Commits - openSUSE Mailing Lists

commit gupnp-tools for openSUSE:Factory
by root＠hilbert.suse.de 23 Sep '10

23 Sep '10

Hello community, here is the log from the commit of package gupnp-tools for openSUSE:Factory checked in at Fri Sep 24 01:01:07 CEST 2010. -------- --- GNOME/gupnp-tools/gupnp-tools.changes 2009-10-02 09:25:00.000000000 +0200 +++ /mounts/work_src_done/STABLE/gupnp-tools/gupnp-tools.changes 2010-09-17 09:36:54.000000000 +0200 @@ -1,0 +2,13 @@ +Fri Sep 17 09:33:40 CEST 2010 - vuntz(a)opensuse.org + +- Update to version 0.8.1: + + Make sure everything builds and runs on windows. + + Add popup menu to playlist treeview. + + Add UI for user to fetch and view the DIDL-Lite XML for media + objects. + + Make it possible for user to select containers. + + Get rid of redundant newline in warning messages. + + Obey the ACLOCAL_FLAGS environment variable. + + Other non-functional improvements. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- gupnp-tools-0.8.tar.bz2 New: ---- gupnp-tools-0.8.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gupnp-tools.spec ++++++ --- /var/tmp/diff_new_pack.0Rtbzg/_old 2010-09-24 01:00:59.000000000 +0200 +++ /var/tmp/diff_new_pack.0Rtbzg/_new 2010-09-24 01:00:59.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package gupnp-tools (Version 0.8) +# spec file for package gupnp-tools (Version 0.8.1) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,10 +18,10 @@ Name: gupnp-tools -Version: 0.8 +Version: 0.8.1 Release: 1 Summary: UPnP tools to test and debug UPnP devices and control points -License: GPL v2 or later +License: GPLv2+ Group: Productivity/Networking/Other Url: http://www.gupnp.org/ Source: %{name}-%{version}.tar.bz2 ++++++ gupnp-tools-0.8.tar.bz2 -> gupnp-tools-0.8.1.tar.bz2 ++++++ ++++ 31949 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gupnp-tools-0.8/NEWS new/gupnp-tools-0.8.1/NEWS --- old/gupnp-tools-0.8/NEWS 2009-08-31 15:58:58.000000000 +0200 +++ new/gupnp-tools-0.8.1/NEWS 2010-09-16 17:12:37.000000000 +0200 @@ -1,3 +1,27 @@ +0.8.1 +===== + +Changes since 0.8: + +- Make sure everything builds and runs on windows. +- Add popup menu to playlist treeview. +- Add UI for user to fetch and view the DIDL-Lite XML for media objects. +- Make it possible for user to select containers. +- Get rid of redundant newline in warning messages. +- Obey the ACLOCAL_FLAGS environment variable. +- Other non-functional improvements. + +Dependencies changed: + +- Require and adapt to gupnp-av >= 0.5.5 + +All contributors: + +Zeeshan Ali (Khattak) <zeeshanak(a)gnome.org> +Ross Burton <ross(a)linux.intel.com> +Jens Georg <mail(a)jensge.org> +Neil Roberts <neil(a)linux.intel.com> + 0.8 ==== diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gupnp-tools-0.8/config.h.in new/gupnp-tools-0.8.1/config.h.in --- old/gupnp-tools-0.8/config.h.in 2009-08-26 16:55:00.000000000 +0200 +++ new/gupnp-tools-0.8.1/config.h.in 2010-09-16 17:14:25.000000000 +0200 @@ -51,6 +51,9 @@ /* Define to 1 if you have the <string.h> header file. */ #undef HAVE_STRING_H +/* Define to 1 if you have the <sys/param.h> header file. */ +#undef HAVE_SYS_PARAM_H + /* Define to 1 if you have the <sys/stat.h> header file. */ #undef HAVE_SYS_STAT_H @@ -82,6 +85,9 @@ /* Define to the one symbol short name of this package. */ #undef PACKAGE_TARNAME +/* Define to the home page for this package. */ +#undef PACKAGE_URL + /* Define to the version of this package. */ #undef PACKAGE_VERSION diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gupnp-tools-0.8/configure.ac new/gupnp-tools-0.8.1/configure.ac --- old/gupnp-tools-0.8/configure.ac 2009-08-26 16:54:42.000000000 +0200 +++ new/gupnp-tools-0.8.1/configure.ac 2010-09-16 17:12:54.000000000 +0200 @@ -1,5 +1,5 @@ AC_PREREQ(2.53) -AC_INIT(gupnp-tools, 0.8, http://www.gupnp.org/) +AC_INIT(gupnp-tools, 0.8.1, http://www.gupnp.org/) AM_INIT_AUTOMAKE() AC_CONFIG_SRCDIR(src/common/icons.h) AM_CONFIG_HEADER(config.h) @@ -12,18 +12,37 @@ AC_FUNC_MMAP GUPNP_REQUIRED=0.13 -GUPNP_AV_REQUIRED=0.5 +GUPNP_AV_REQUIRED=0.5.5 GTK_REQUIRED=2.16 GTHREAD_REQUIRED=2.12 GIO_REQUIRED=2.12 ICON_THEME_REQUIRED=2.20 +AC_MSG_CHECKING([for Win32]) +case "$host" in + *-*-mingw*) + os_win32=yes + ;; + *) + os_win32=no + ;; +esac +AC_MSG_RESULT([$os_win32]) +AM_CONDITIONAL(OS_WIN32, [test $os_win32 = yes]) + PKG_CHECK_MODULES(LIBGUPNP, gupnp-1.0 >= $GUPNP_REQUIRED) PKG_CHECK_MODULES(GTK, gtk+-2.0 >= $GTK_REQUIRED) PKG_CHECK_MODULES(GTHREAD, gthread-2.0 >= $GTHREAD_REQUIRED) PKG_CHECK_MODULES(GNOME_ICON_THEME, gnome-icon-theme >= $ICON_THEME_REQUIRED) PKG_CHECK_MODULES(GIO, gio-2.0 >= $GIO_REQUIRED) +if test "x$os_win32" = "xno"; then + PKG_CHECK_MODULES(UUID, uuid) +else + AC_CHECK_TOOL(WINDRES, windres) + AC_SUBST([UUID_LIBS], ["-lrpcrt4"]) +fi + AC_ARG_WITH( av, AC_HELP_STRING([--disable-av],[Don't build AV tools]), try_av=$withval, try_av=yes ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gupnp-tools-0.8/data/gupnp-av-cp.ui new/gupnp-tools-0.8.1/data/gupnp-av-cp.ui --- old/gupnp-tools-0.8/data/gupnp-av-cp.ui 2009-05-21 01:45:23.000000000 +0200 +++ new/gupnp-tools-0.8.1/data/gupnp-av-cp.ui 2010-09-01 22:30:20.000000000 +0200 @@ -130,8 +130,8 @@ <object class="GtkVScale" id="volume-vscale"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="adjustment">adjustment1</property> <property name="update_policy">discontinuous</property> + <property name="adjustment">adjustment1</property> <property name="inverted">True</property> <property name="digits">0</property> <property name="draw_value">False</property> @@ -173,8 +173,8 @@ <object class="GtkHScale" id="position-hscale"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="adjustment">adjustment2</property> <property name="update_policy">discontinuous</property> + <property name="adjustment">adjustment2</property> <property name="digits">0</property> <property name="draw_value">False</property> <signal name="value_changed" handler="on_position_hscale_value_changed"/> @@ -218,8 +218,8 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="can_default">True</property> - <property name="tooltip_text">Clears the CP's idea of the state of the currently selected AV Renderer. Useful for dealing with AV Renderers that don't report state changes.</property> <property name="receives_default">False</property> + <property name="tooltip_text">Clears the CP's idea of the state of the currently selected AV Renderer. Useful for dealing with AV Renderers that don't report state changes.</property> <signal name="clicked" handler="on_clear_state_button_clicked"/> <child> <object class="GtkAlignment" id="alignment14"> @@ -234,7 +234,6 @@ <object class="GtkImage" id="image21"> <property name="visible">True</property> <property name="stock">gtk-clear</property> - <property name="icon-size">4</property> </object> <packing> <property name="expand">False</property> @@ -295,7 +294,6 @@ <object class="GtkImage" id="image16"> <property name="visible">True</property> <property name="stock">gtk-media-play</property> - <property name="icon-size">4</property> </object> <packing> <property name="expand">False</property> @@ -346,7 +344,6 @@ <object class="GtkImage" id="image17"> <property name="visible">True</property> <property name="stock">gtk-media-pause</property> - <property name="icon-size">4</property> </object> <packing> <property name="expand">False</property> @@ -397,7 +394,6 @@ <object class="GtkImage" id="image18"> <property name="visible">True</property> <property name="stock">gtk-media-stop</property> - <property name="icon-size">4</property> </object> <packing> <property name="expand">False</property> @@ -448,7 +444,6 @@ <object class="GtkImage" id="image19"> <property name="visible">True</property> <property name="stock">gtk-media-previous</property> - <property name="icon-size">4</property> </object> <packing> <property name="expand">False</property> @@ -499,7 +494,6 @@ <object class="GtkImage" id="image20"> <property name="visible">True</property> <property name="stock">gtk-media-next</property> - <property name="icon-size">4</property> </object> <packing> <property name="expand">False</property> @@ -590,4 +584,86 @@ <property name="upper">100</property> <property name="step_increment">1</property> </object> + <object class="GtkMenu" id="playlist-popup"> + <property name="visible">True</property> + <child> + <object class="GtkMenuItem" id="play-menuitem"> + <property name="visible">True</property> + <property name="label" translatable="yes">_Play</property> + <property name="use_underline">True</property> + <signal name="activate" handler="on_play_button_clicked"/> + </object> + </child> + <child> + <object class="GtkMenuItem" id="didl-menuitem"> + <property name="visible">True</property> + <property name="tooltip_text" translatable="yes">Fetch the DIDL-Lite XML for this media object</property> + <property name="label" translatable="yes">Fetch _DIDL-Lite</property> + <property name="use_underline">True</property> + <signal name="activate" handler="on_didl_menuitem_activate"/> + </object> + </child> + </object> + <object class="GtkDialog" id="didl-dialog"> + <property name="width_request">640</property> + <property name="height_request">480</property> + <property name="border_width">5</property> + <property name="title" translatable="yes">GUPnP AV CP - Metadata View</property> + <property name="type_hint">normal</property> + <property name="has_separator">False</property> + <child internal-child="vbox"> + <object class="GtkVBox" id="dialog-vbox3"> + <property name="visible">True</property> + <property name="spacing">2</property> + <child> + <object class="GtkScrolledWindow" id="didl-scrolledwindow"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="hscrollbar_policy">automatic</property> + <property name="vscrollbar_policy">automatic</property> + <child> + <object class="GtkTextView" id="didl-textview"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="editable">False</property> + <property name="wrap_mode">char</property> + </object> + </child> + </object> + <packing> + <property name="position">1</property> + </packing> + </child> + <child internal-child="action_area"> + <object class="GtkHButtonBox" id="didl-action-area"> + <property name="visible">True</property> + <property name="layout_style">end</property> + <child> + <object class="GtkButton" id="didl-close-button"> + <property name="label">gtk-close</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="use_stock">True</property> + <signal name="clicked" handler="gtk_widget_hide" object="didl-dialog"/> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="pack_type">end</property> + <property name="position">0</property> + </packing> + </child> + </object> + </child> + <action-widgets> + <action-widget response="0">didl-close-button</action-widget> + </action-widgets> + </object> </interface> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gupnp-tools-0.8/src/av-cp/Makefile.am new/gupnp-tools-0.8.1/src/av-cp/Makefile.am --- old/gupnp-tools-0.8/src/av-cp/Makefile.am 2009-08-26 16:54:42.000000000 +0200 +++ new/gupnp-tools-0.8.1/src/av-cp/Makefile.am 2010-06-24 15:40:28.000000000 +0200 @@ -24,11 +24,22 @@ renderer-combo.h \ renderer-controls.h -gupnp_av_cp_LDADD = $(LIBGUPNP_LIBS) \ +gupnp_av_cp_LDADD = ../common/libicons.a \ + $(LIBGUPNP_LIBS) \ $(LIBGUPNP_AV_LIBS) \ $(GTK_LIBS) \ - $(GTHREAD_LIBS) \ - ../common/libicons.a + $(GTHREAD_LIBS) gupnp_av_cp_LDFLAGS = -export-dynamic +if OS_WIN32 +av-cp.res: av-cp.rc + $(WINDRES) -i av-cp.rc --input-format=rc -o av-cp.res -O coff +gupnp_av_cp_LDADD += av-cp.res +BUILT_SOURCES=av-cp.res +CLEAN_FILES=av-cp.res +gupnp_av_cp_LDFLAGS += -Wl,-subsystem,windows +endif + +EXTRA_DIST=av-cp.rc + MAINTAINERCLEANFILES = Makefile.in diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gupnp-tools-0.8/src/av-cp/av-cp.rc new/gupnp-tools-0.8.1/src/av-cp/av-cp.rc --- old/gupnp-tools-0.8/src/av-cp/av-cp.rc 1970-01-01 01:00:00.000000000 +0100 +++ new/gupnp-tools-0.8.1/src/av-cp/av-cp.rc 2010-06-24 15:40:28.000000000 +0200 @@ -0,0 +1 @@ +A ICON MOVEABLE PURE LOADONCALL DISCARDABLE "../../data/pixmaps/win32/av-cp.ico" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gupnp-tools-0.8/src/av-cp/gui.c new/gupnp-tools-0.8.1/src/av-cp/gui.c --- old/gupnp-tools-0.8/src/av-cp/gui.c 2009-08-26 16:54:42.000000000 +0200 +++ new/gupnp-tools-0.8.1/src/av-cp/gui.c 2010-06-24 15:40:28.000000000 +0200 @@ -21,6 +21,7 @@ #include <string.h> #include <stdlib.h> #include <config.h> +#include <gmodule.h> #include "gui.h" #include "playlist-treeview.h" @@ -36,6 +37,7 @@ static GtkWidget *main_window; static GtkWidget *about_dialog; +G_MODULE_EXPORT gboolean on_delete_event (GtkWidget *widget, GdkEvent *event, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gupnp-tools-0.8/src/av-cp/main.c new/gupnp-tools-0.8.1/src/av-cp/main.c --- old/gupnp-tools-0.8/src/av-cp/main.c 2009-08-26 16:54:42.000000000 +0200 +++ new/gupnp-tools-0.8.1/src/av-cp/main.c 2010-09-03 16:38:14.000000000 +0200 @@ -22,6 +22,7 @@ #include <libgupnp-av/gupnp-av.h> #include <string.h> #include <stdlib.h> +#include <gmodule.h> #include "gui.h" #include "renderer-combo.h" @@ -124,6 +125,7 @@ g_object_unref (context_manager); } +G_MODULE_EXPORT void application_exit (void) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gupnp-tools-0.8/src/av-cp/playlist-treeview.c new/gupnp-tools-0.8.1/src/av-cp/playlist-treeview.c --- old/gupnp-tools-0.8/src/av-cp/playlist-treeview.c 2009-08-26 16:54:42.000000000 +0200 +++ new/gupnp-tools-0.8.1/src/av-cp/playlist-treeview.c 2010-09-01 23:52:46.000000000 +0200 @@ -21,13 +21,13 @@ #include <string.h> #include <stdlib.h> #include <config.h> +#include <gmodule.h> #include "playlist-treeview.h" #include "renderer-combo.h" #include "renderer-controls.h" #include "icons.h" #include "gui.h" -#include "main.h" #define CONTENT_DIR "urn:schemas-upnp-org:service:ContentDirectory" @@ -43,6 +43,9 @@ gpointer user_data); static GtkWidget *treeview; +static GtkWidget *popup; +static GtkWidget *didl_dialog; +static GtkWidget *didl_textview; static gboolean expanded; typedef struct @@ -56,7 +59,7 @@ typedef struct { - GetSelectedItemCallback callback; + MetadataFunc callback; gchar *id; @@ -87,9 +90,9 @@ } static BrowseMetadataData * -browse_metadata_data_new (GetSelectedItemCallback callback, - const char *id, - gpointer user_data) +browse_metadata_data_new (MetadataFunc callback, + const char *id, + gpointer user_data) { BrowseMetadataData *data; @@ -114,12 +117,36 @@ guint32 starting_index, guint32 requested_count); +G_MODULE_EXPORT gboolean on_playlist_treeview_button_release (GtkWidget *widget, GdkEventButton *event, gpointer user_data) { - return FALSE; + GtkTreeSelection *selection; + GtkTreeModel *model; + GtkTreeIter iter; + + if (event->type != GDK_BUTTON_RELEASE || + event->button != 3) + return FALSE; + + selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (treeview)); + g_assert (selection != NULL); + + /* Only show the popup menu when a row is selected */ + if (!gtk_tree_selection_get_selected (selection, &model, &iter)) + return FALSE; + + gtk_menu_popup (GTK_MENU (popup), + NULL, + NULL, + NULL, + NULL, + event->button, + event->time); + + return TRUE; } static void @@ -132,9 +159,8 @@ if (state == PLAYBACK_STATE_PLAYING || state == PLAYBACK_STATE_PAUSED) { - if (!get_selected_item ((GetSelectedItemCallback) - set_av_transport_uri, - NULL)) { + if (!get_selected_object ((MetadataFunc) set_av_transport_uri, + NULL)) { av_transport_send_action ("Stop", NULL); } } @@ -159,7 +185,7 @@ /* Is container? */ G_TYPE_BOOLEAN, /* childCount */ - G_TYPE_UINT); + G_TYPE_INT); return GTK_TREE_MODEL (store); } @@ -200,6 +226,7 @@ gtk_tree_selection_set_mode (selection, GTK_SELECTION_SINGLE); } +G_MODULE_EXPORT void on_playlist_row_expanded (GtkTreeView *tree_view, GtkTreeIter *iter, @@ -220,7 +247,7 @@ GUPnPServiceProxy *content_dir; gchar *id; gboolean is_container; - guint child_count; + gint child_count; gtk_tree_model_get (model, &child_iter, 3, &content_dir, @@ -229,7 +256,7 @@ 6, &child_count, -1); - if (is_container && child_count > 0) { + if (is_container && child_count != 0) { browse (content_dir, id, 0, MAX_BROWSE); } @@ -254,6 +281,7 @@ &child_iter)); } +G_MODULE_EXPORT void on_playlist_row_collapsed (GtkTreeView *tree_view, GtkTreeIter *iter, @@ -275,31 +303,23 @@ } while (gtk_tree_model_iter_next (model, &child_iter)); } -static gboolean -tree_selection_func (GtkTreeSelection *selection, - GtkTreeModel *model, - GtkTreePath *path, - gboolean path_currently_selected, - gpointer data) +static void display_metadata (const char *metadata, + gpointer user_data) { - GtkTreeIter iter; - gboolean is_container; - - if (path_currently_selected) { - return TRUE; - } + GtkTextBuffer *buffer; - if (!gtk_tree_model_get_iter (model, &iter, path)) { - return FALSE; - } + buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (didl_textview)); + gtk_text_buffer_set_text (buffer, metadata, -1); - gtk_tree_model_get (model, - &iter, - 5, &is_container, - -1); + gtk_dialog_run (GTK_DIALOG (didl_dialog)); +} - /* Let it be selected if it's an item */ - return !is_container; +G_MODULE_EXPORT +void +on_didl_menuitem_activate (GtkMenuItem *menuitem, + gpointer user_data) +{ + get_selected_object (display_metadata, NULL); } void @@ -312,6 +332,14 @@ "playlist-treeview")); g_assert (treeview != NULL); + popup = GTK_WIDGET (gtk_builder_get_object (builder, "playlist-popup")); + g_assert (popup != NULL); + + didl_dialog = GTK_WIDGET (gtk_builder_get_object (builder, + "didl-dialog")); + didl_textview = GTK_WIDGET (gtk_builder_get_object (builder, + "didl-textview")); + model = create_playlist_treemodel (); g_assert (model != NULL); @@ -326,10 +354,6 @@ "changed", G_CALLBACK (on_item_selected), NULL); - gtk_tree_selection_set_select_function (selection, - tree_selection_func, - NULL, - NULL); expanded = FALSE; } @@ -584,7 +608,7 @@ const char *parent_id; const char *title; gboolean is_container; - uint child_count; + gint child_count; GdkPixbuf *icon; gint position; @@ -751,7 +775,7 @@ if (!gupnp_didl_lite_parser_parse_didl (parser, didl_xml, &error)) { - g_warning ("%s\n", error->message); + g_warning ("%s", error->message); g_error_free (error); } @@ -774,7 +798,7 @@ GUPnPServiceInfo *info; info = GUPNP_SERVICE_INFO (content_dir); - g_warning ("Failed to browse '%s': %s\n", + g_warning ("Failed to browse '%s': %s", gupnp_service_info_get_location (info), error->message); @@ -785,6 +809,44 @@ } static void +browse_metadata_cb (GUPnPServiceProxy *content_dir, + GUPnPServiceProxyAction *action, + gpointer user_data) +{ + BrowseMetadataData *data; + char *metadata; + GError *error; + + data = (BrowseMetadataData *) user_data; + + metadata = NULL; + error = NULL; + + gupnp_service_proxy_end_action (content_dir, + action, + &error, + /* OUT args */ + "Result", + G_TYPE_STRING, + &metadata, + NULL); + if (metadata) { + data->callback (metadata, data->user_data); + + g_free (metadata); + } else if (error) { + g_warning ("Failed to get metadata for '%s': %s", + data->id, + error->message); + + g_error_free (error); + } + + browse_metadata_data_free (data); + g_object_unref (content_dir); +} + +static void browse (GUPnPServiceProxy *content_dir, const char *container_id, guint32 starting_index, @@ -824,6 +886,42 @@ } static void +browse_metadata (GUPnPServiceProxy *content_dir, + const char *id, + MetadataFunc callback, + gpointer user_data) +{ + BrowseMetadataData *data; + + data = browse_metadata_data_new (callback, id, user_data); + + gupnp_service_proxy_begin_action + (g_object_ref (content_dir), + "Browse", + browse_metadata_cb, + data, + /* IN args */ + "ObjectID", + G_TYPE_STRING, + data->id, + "BrowseFlag", + G_TYPE_STRING, + "BrowseMetadata", + "Filter", + G_TYPE_STRING, + "*", + "StartingIndex", + G_TYPE_UINT, + 0, + "RequestedCount", + G_TYPE_UINT, 0, + "SortCriteria", + G_TYPE_STRING, + "", + NULL); +} + +static void append_media_server (GUPnPDeviceProxy *proxy, GtkTreeModel *model, GtkTreeIter *parent_iter) @@ -848,6 +946,7 @@ 1, friendly_name, 2, info, 3, content_dir, + 4, "0", 5, TRUE, -1); g_free (friendly_name); @@ -930,54 +1029,14 @@ } } -void -browse_metadata_cb (GUPnPServiceProxy *content_dir, - GUPnPServiceProxyAction *action, - gpointer user_data) -{ - BrowseMetadataData *data; - char *metadata; - GError *error; - - data = (BrowseMetadataData *) user_data; - - metadata = NULL; - error = NULL; - - gupnp_service_proxy_end_action (content_dir, - action, - &error, - /* OUT args */ - "Result", - G_TYPE_STRING, - &metadata, - NULL); - if (metadata) { - data->callback (metadata, data->user_data); - - g_free (metadata); - } else if (error) { - g_warning ("Failed to get metadata for '%s': %s\n", - data->id, - error->message); - - g_error_free (error); - } - - browse_metadata_data_free (data); - g_object_unref (content_dir); -} - gboolean -get_selected_item (GetSelectedItemCallback callback, - gpointer user_data) +get_selected_object (MetadataFunc callback, + gpointer user_data) { GUPnPServiceProxy *content_dir; GtkTreeSelection *selection; GtkTreeModel *model; GtkTreeIter iter; - gboolean is_container; - BrowseMetadataData *data; char *id = NULL; gboolean ret = FALSE; @@ -992,42 +1051,12 @@ &iter, 3, &content_dir, 4, &id, - 5, &is_container, -1); - if (is_container) { - goto free_and_return; - } - - data = browse_metadata_data_new (callback, id, user_data); + browse_metadata (g_object_ref (content_dir), id, callback, user_data); - gupnp_service_proxy_begin_action - (g_object_ref (content_dir), - "Browse", - browse_metadata_cb, - data, - /* IN args */ - "ObjectID", - G_TYPE_STRING, - data->id, - "BrowseFlag", - G_TYPE_STRING, - "BrowseMetadata", - "Filter", - G_TYPE_STRING, - "*", - "StartingIndex", - G_TYPE_UINT, - 0, - "RequestedCount", - G_TYPE_UINT, 0, - "SortCriteria", - G_TYPE_STRING, - "", - NULL); ret = TRUE; -free_and_return: if (id) { g_free (id); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gupnp-tools-0.8/src/av-cp/playlist-treeview.h new/gupnp-tools-0.8.1/src/av-cp/playlist-treeview.h --- old/gupnp-tools-0.8/src/av-cp/playlist-treeview.h 2009-04-16 13:25:02.000000000 +0200 +++ new/gupnp-tools-0.8.1/src/av-cp/playlist-treeview.h 2010-09-01 23:38:07.000000000 +0200 @@ -25,8 +25,8 @@ #include <gtk/gtk.h> #include <libgupnp-av/gupnp-av.h> -typedef void (* GetSelectedItemCallback) (const char *metadata, - gpointer user_data); +typedef void (* MetadataFunc) (const char *metadata, + gpointer user_data); void setup_playlist_treeview (GtkBuilder *builder); @@ -38,7 +38,7 @@ remove_media_server (GUPnPDeviceProxy *proxy); gboolean -get_selected_item (GetSelectedItemCallback callback, +get_selected_object (MetadataFunc callback, gpointer user_data); void diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gupnp-tools-0.8/src/av-cp/renderer-controls.c new/gupnp-tools-0.8.1/src/av-cp/renderer-controls.c --- old/gupnp-tools-0.8/src/av-cp/renderer-controls.c 2009-08-26 16:54:42.000000000 +0200 +++ new/gupnp-tools-0.8.1/src/av-cp/renderer-controls.c 2010-09-01 23:36:48.000000000 +0200 @@ -22,6 +22,7 @@ #include <stdlib.h> #include <config.h> #include <gtk/gtk.h> +#include <gmodule.h> #include "playlist-treeview.h" #include "renderer-controls.h" @@ -216,6 +217,7 @@ g_object_unref (av_transport); } +G_MODULE_EXPORT gboolean on_volume_vscale_value_changed (GtkRange *range, gpointer user_data); @@ -336,6 +338,7 @@ NULL); } +G_MODULE_EXPORT void on_play_button_clicked (GtkButton *button, gpointer user_data) @@ -346,14 +349,13 @@ if (state == PLAYBACK_STATE_STOPPED || state == PLAYBACK_STATE_UNKNOWN) { - get_selected_item ((GetSelectedItemCallback) - set_av_transport_uri, - play); + get_selected_object ((MetadataFunc) set_av_transport_uri, play); } else { play (); } } +G_MODULE_EXPORT void on_pause_button_clicked (GtkButton *button, gpointer user_data) @@ -361,6 +363,7 @@ av_transport_send_action ("Pause", NULL); } +G_MODULE_EXPORT void on_stop_button_clicked (GtkButton *button, gpointer user_data) @@ -368,6 +371,7 @@ av_transport_send_action ("Stop", NULL); } +G_MODULE_EXPORT void on_next_button_clicked (GtkButton *button, gpointer user_data) @@ -375,6 +379,7 @@ select_next_object (); } +G_MODULE_EXPORT void on_previous_button_clicked (GtkButton *button, gpointer user_data) @@ -382,6 +387,7 @@ select_prev_object (); } +G_MODULE_EXPORT void on_clear_state_button_clicked (GtkButton *button, gpointer user_data) @@ -389,6 +395,7 @@ clear_selected_renderer_state (); } +G_MODULE_EXPORT gboolean on_position_hscale_value_changed (GtkRange *range, gpointer user_data) @@ -661,6 +668,7 @@ g_object_unref (rendering_control); } +G_MODULE_EXPORT gboolean on_volume_vscale_value_changed (GtkRange *range, gpointer user_data) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gupnp-tools-0.8/src/network-light/Makefile.am new/gupnp-tools-0.8.1/src/network-light/Makefile.am --- old/gupnp-tools-0.8/src/network-light/Makefile.am 2009-08-26 16:54:42.000000000 +0200 +++ new/gupnp-tools-0.8.1/src/network-light/Makefile.am 2010-06-24 15:40:28.000000000 +0200 @@ -7,6 +7,7 @@ AM_CFLAGS = $(LIBGUPNP_CFLAGS) \ $(GTK_CFLAGS) \ $(GTHREAD_CFLAGS) \ + $(UUID_CFLAGS) \ -I$(top_srcdir) \ -DDATA_DIR='"$(shareddir)"' \ -I$(top_srcdir)/src/common @@ -19,8 +20,19 @@ main.h \ gui.h \ upnp.h -gupnp_network_light_LDADD = $(LIBGUPNP_LIBS) $(GTK_LIBS) $(GTHREAD_LIBS) \ - ../common/libicons.a +gupnp_network_light_LDADD = ../common/libicons.a $(LIBGUPNP_LIBS) $(GTK_LIBS) $(GTHREAD_LIBS) $(UUID_LIBS) + gupnp_network_light_LDFLAGS = -export-dynamic +if OS_WIN32 +network-light.res: network-light.rc + $(WINDRES) -i network-light.rc --input-format=rc -o network-light.res -O coff +gupnp_network_light_LDADD += network-light.res +BUILT_SOURCES=network-light.res +CLEAN_FILES=network-light.res +gupnp_network_light_LDFLAGS += -Wl,-subsystem,windows +endif + +EXTRA_DIST=network-light.rc + MAINTAINERCLEANFILES = Makefile.in diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gupnp-tools-0.8/src/network-light/gui.c new/gupnp-tools-0.8.1/src/network-light/gui.c --- old/gupnp-tools-0.8/src/network-light/gui.c 2009-08-26 16:54:42.000000000 +0200 +++ new/gupnp-tools-0.8.1/src/network-light/gui.c 2010-06-24 15:40:28.000000000 +0200 @@ -21,6 +21,7 @@ #include <string.h> #include <stdlib.h> #include <config.h> +#include <gmodule.h> #include "gui.h" #include "icons.h" @@ -68,6 +69,7 @@ g_object_unref (pixbuf); } +G_MODULE_EXPORT void on_light_status_menuitem_activate (GtkCheckMenuItem *menuitem, gpointer user_data) @@ -75,6 +77,7 @@ set_all_status (gtk_check_menu_item_get_active (menuitem)); } +G_MODULE_EXPORT void on_about_menuitem_activate (GtkMenuItem *menuitem, gpointer user_data) @@ -88,6 +91,7 @@ gtk_widget_show (about_dialog); } +G_MODULE_EXPORT void on_increase_luminance_menuitem_activate (GtkMenuItem *menuitem, gpointer user_data) @@ -95,6 +99,7 @@ set_all_load_level (get_load_level () + 20); } +G_MODULE_EXPORT void on_decrease_luminance_menuitem_activate (GtkMenuItem *menuitem, gpointer user_data) @@ -152,6 +157,7 @@ event->time); } +G_MODULE_EXPORT gboolean on_main_window_button_event (GtkWidget *widget, GdkEventButton *event, @@ -172,6 +178,7 @@ } } +G_MODULE_EXPORT gboolean on_delete_event (GtkWidget *widget, GdkEvent *event, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gupnp-tools-0.8/src/network-light/network-light.rc new/gupnp-tools-0.8.1/src/network-light/network-light.rc --- old/gupnp-tools-0.8/src/network-light/network-light.rc 1970-01-01 01:00:00.000000000 +0100 +++ new/gupnp-tools-0.8.1/src/network-light/network-light.rc 2010-06-24 15:40:28.000000000 +0200 @@ -0,0 +1 @@ +A ICON MOVEABLE PURE LOADONCALL DISCARDABLE "../../data/pixmaps/win32/network-light.ico" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gupnp-tools-0.8/src/network-light/upnp.c new/gupnp-tools-0.8.1/src/network-light/upnp.c --- old/gupnp-tools-0.8/src/network-light/upnp.c 2009-08-26 16:54:42.000000000 +0200 +++ new/gupnp-tools-0.8.1/src/network-light/upnp.c 2010-06-24 15:40:28.000000000 +0200 @@ -25,7 +25,13 @@ #include <stdio.h> #include <locale.h> #include <string.h> +#include <gmodule.h> +#ifndef G_OS_WIN32 #include <uuid/uuid.h> +#else +#include <rpc.h> +typedef UUID uuid_t; +#endif #include <glib/gstdio.h> #include "gui.h" @@ -123,6 +129,7 @@ } } +G_MODULE_EXPORT void on_get_status (GUPnPService *service, GUPnPServiceAction *action, @@ -137,6 +144,7 @@ gupnp_service_action_return (action); } +G_MODULE_EXPORT void on_get_target (GUPnPService *service, GUPnPServiceAction *action, @@ -151,6 +159,7 @@ gupnp_service_action_return (action); } +G_MODULE_EXPORT void on_set_target (GUPnPService *service, GUPnPServiceAction *action, @@ -168,6 +177,7 @@ set_status (status); } +G_MODULE_EXPORT void on_query_status (GUPnPService *service, const char *variable_name, @@ -178,6 +188,7 @@ g_value_set_boolean (value, get_status ()); } +G_MODULE_EXPORT void on_query_target (GUPnPService *service, const char *variable_name, @@ -188,6 +199,7 @@ g_value_set_boolean (value, get_status ()); } +G_MODULE_EXPORT void on_get_load_level_status (GUPnPService *service, GUPnPServiceAction *action, @@ -202,6 +214,7 @@ gupnp_service_action_return (action); } +G_MODULE_EXPORT void on_get_load_level_target (GUPnPService *service, GUPnPServiceAction *action, @@ -216,6 +229,7 @@ gupnp_service_action_return (action); } +G_MODULE_EXPORT void on_set_load_level_target (GUPnPService *service, GUPnPServiceAction *action, @@ -234,6 +248,7 @@ set_load_level (load_level); } +G_MODULE_EXPORT void on_query_load_level_status (GUPnPService *service, const char *variable_name, @@ -244,6 +259,7 @@ g_value_set_uint (value, get_load_level ()); } +G_MODULE_EXPORT void on_query_load_level_target (GUPnPService *service, const char *variable_name, @@ -318,8 +334,18 @@ xmlNode *uuid_node; char *udn; +#ifndef G_OS_WIN32 uuid_generate (uuid_context); uuid_unparse (uuid_context, uuid); +#else + { + gchar *tmp_uuid; + UuidCreate(&uuid_context); + UuidToString(&uuid_context, &tmp_uuid); + memcpy(uuid, tmp_uuid, 36); + RpcStringFree(&tmp_uuid); + } +#endif uuid_node = xml_util_get_element ((xmlNode *) doc->doc, "root", diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gupnp-tools-0.8/src/universal-cp/Makefile.am new/gupnp-tools-0.8.1/src/universal-cp/Makefile.am --- old/gupnp-tools-0.8/src/universal-cp/Makefile.am 2009-08-26 16:54:42.000000000 +0200 +++ new/gupnp-tools-0.8.1/src/universal-cp/Makefile.am 2010-06-24 15:40:28.000000000 +0200 @@ -22,8 +22,19 @@ details-treeview.h \ event-treeview.h \ action-dialog.h -gupnp_universal_cp_LDADD = $(GTK_LIBS) $(LIBGUPNP_LIBS) $(GTHREAD_LIBS) \ - ../common/libicons.a +gupnp_universal_cp_LDADD = ../common/libicons.a $(GTK_LIBS) $(LIBGUPNP_LIBS) $(GTHREAD_LIBS) gupnp_universal_cp_LDFLAGS = -export-dynamic +if OS_WIN32 +universal-cp.res: universal-cp.rc + $(WINDRES) -i universal-cp.rc --input-format=rc -o universal-cp.res -O coff +gupnp_universal_cp_LDADD += universal-cp.res +BUILT_SOURCES=universal-cp.res +CLEAN_FILES=universal-cp.res +gupnp_universal_cp_LDFLAGS += -Wl,-subsystem,windows +endif + +EXTRA_DIST=universal-cp.rc + + MAINTAINERCLEANFILES = Makefile.in diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gupnp-tools-0.8/src/universal-cp/action-dialog.c new/gupnp-tools-0.8.1/src/universal-cp/action-dialog.c --- old/gupnp-tools-0.8/src/universal-cp/action-dialog.c 2009-08-26 16:54:42.000000000 +0200 +++ new/gupnp-tools-0.8.1/src/universal-cp/action-dialog.c 2010-06-24 15:40:28.000000000 +0200 @@ -22,6 +22,8 @@ #include <stdlib.h> #include <config.h> +#include <gmodule.h> + #include "gui.h" #include "device-treeview.h" #include "icons.h" @@ -702,6 +704,7 @@ g_object_unref (introspection); } +G_MODULE_EXPORT void on_action_invocation (GtkButton *button, gpointer user_data) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gupnp-tools-0.8/src/universal-cp/details-treeview.c new/gupnp-tools-0.8.1/src/universal-cp/details-treeview.c --- old/gupnp-tools-0.8/src/universal-cp/details-treeview.c 2009-08-26 16:54:42.000000000 +0200 +++ new/gupnp-tools-0.8.1/src/universal-cp/details-treeview.c 2010-09-01 18:33:58.000000000 +0200 @@ -22,6 +22,8 @@ #include <stdlib.h> #include <config.h> +#include <gmodule.h> + #include "details-treeview.h" #include "gui.h" @@ -43,16 +45,7 @@ return gtk_tree_selection_get_selected (selection, &model, iter); } -static void -setup_details_popup (GtkWidget *popup) -{ - /* Only show "Copy Value" menuitem when a row is selected */ - g_object_set (copy_value_menuitem, - "visible", - get_selected_row (NULL), - NULL); -} - +G_MODULE_EXPORT gboolean on_details_treeview_button_release (GtkWidget *widget, GdkEventButton *event, @@ -62,7 +55,11 @@ event->button != 3) return FALSE; - setup_details_popup (popup); + /* Only show "Copy Value" menuitem when a row is selected */ + g_object_set (copy_value_menuitem, + "visible", + get_selected_row (NULL), + NULL); gtk_menu_popup (GTK_MENU (popup), NULL, @@ -74,6 +71,7 @@ return TRUE; } +G_MODULE_EXPORT void on_details_treeview_row_activate (GtkMenuItem *menuitem, gpointer user_data) @@ -100,6 +98,7 @@ } } +G_MODULE_EXPORT void on_copy_all_details_activate (GtkMenuItem *menuitem, gpointer user_data) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gupnp-tools-0.8/src/universal-cp/device-treeview.c new/gupnp-tools-0.8.1/src/universal-cp/device-treeview.c --- old/gupnp-tools-0.8/src/universal-cp/device-treeview.c 2009-08-26 16:54:42.000000000 +0200 +++ new/gupnp-tools-0.8.1/src/universal-cp/device-treeview.c 2010-06-24 15:40:28.000000000 +0200 @@ -22,6 +22,8 @@ #include <stdlib.h> #include <config.h> +#include <gmodule.h> + #include "gui.h" #include "icons.h" #include "action-dialog.h" @@ -162,6 +164,7 @@ g_object_unref (proxy); } +G_MODULE_EXPORT gboolean on_device_treeview_button_release (GtkWidget *widget, GdkEventButton *event, @@ -183,6 +186,7 @@ return TRUE; } +G_MODULE_EXPORT void on_device_treeview_row_activate (GtkMenuItem *menuitem, gpointer user_data) @@ -790,6 +794,7 @@ return action_info; } +G_MODULE_EXPORT void on_expand_devices_activate (GtkMenuItem *menuitem, gpointer user_data) @@ -797,6 +802,7 @@ gtk_tree_view_expand_all (GTK_TREE_VIEW (treeview)); } +G_MODULE_EXPORT void on_collapse_devices_activate (GtkMenuItem *menuitem, gpointer user_data) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gupnp-tools-0.8/src/universal-cp/event-treeview.c new/gupnp-tools-0.8.1/src/universal-cp/event-treeview.c --- old/gupnp-tools-0.8/src/universal-cp/event-treeview.c 2009-08-26 16:54:42.000000000 +0200 +++ new/gupnp-tools-0.8.1/src/universal-cp/event-treeview.c 2010-06-24 15:40:28.000000000 +0200 @@ -22,6 +22,8 @@ #include <stdlib.h> #include <config.h> +#include <gmodule.h> + #include "event-treeview.h" #include "gui.h" @@ -112,6 +114,7 @@ NULL); } +G_MODULE_EXPORT gboolean on_event_treeview_button_release (GtkWidget *widget, GdkEventButton *event, @@ -133,6 +136,7 @@ return TRUE; } +G_MODULE_EXPORT void on_event_treeview_row_activate (GtkMenuItem *menuitem, gpointer user_data) @@ -181,6 +185,7 @@ } } +G_MODULE_EXPORT void on_copy_all_events_activate (GtkMenuItem *menuitem, gpointer user_data) @@ -335,6 +340,7 @@ more = gtk_list_store_remove (GTK_LIST_STORE (model), &iter); } +G_MODULE_EXPORT void on_clear_event_log_activate (GtkMenuItem *menuitem, gpointer user_data) @@ -397,6 +403,7 @@ NULL); } +G_MODULE_EXPORT void on_event_log_activate (GtkCheckMenuItem *menuitem, gpointer user_data) @@ -407,6 +414,7 @@ NULL); } +G_MODULE_EXPORT void on_subscribe_to_events_activate (GtkCheckMenuItem *menuitem, gpointer user_data) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gupnp-tools-0.8/src/universal-cp/gui.c new/gupnp-tools-0.8.1/src/universal-cp/gui.c --- old/gupnp-tools-0.8/src/universal-cp/gui.c 2009-08-26 16:54:42.000000000 +0200 +++ new/gupnp-tools-0.8.1/src/universal-cp/gui.c 2010-06-24 15:40:28.000000000 +0200 @@ -22,6 +22,8 @@ #include <stdlib.h> #include <config.h> +#include <gmodule.h> + #include "gui.h" #include "device-treeview.h" #include "event-treeview.h" @@ -79,6 +81,7 @@ setup_device_treeview (builder); } +G_MODULE_EXPORT gboolean on_delete_event (GtkWidget *widget, GdkEvent *event, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gupnp-tools-0.8/src/universal-cp/main.c new/gupnp-tools-0.8.1/src/universal-cp/main.c --- old/gupnp-tools-0.8/src/universal-cp/main.c 2009-08-26 16:54:42.000000000 +0200 +++ new/gupnp-tools-0.8.1/src/universal-cp/main.c 2010-06-24 15:40:28.000000000 +0200 @@ -23,6 +23,8 @@ #include <string.h> #include <stdlib.h> +#include <gmodule.h> + static GUPnPContextManager *context_manager; static void @@ -89,6 +91,7 @@ g_object_unref (context_manager); } +G_MODULE_EXPORT void application_exit (void) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gupnp-tools-0.8/src/universal-cp/universal-cp.rc new/gupnp-tools-0.8.1/src/universal-cp/universal-cp.rc --- old/gupnp-tools-0.8/src/universal-cp/universal-cp.rc 1970-01-01 01:00:00.000000000 +0100 +++ new/gupnp-tools-0.8.1/src/universal-cp/universal-cp.rc 2010-06-24 15:40:28.000000000 +0200 @@ -0,0 +1 @@ +A ICON MOVEABLE PURE LOADONCALL DISCARDABLE "../../data/pixmaps/win32/universal-cp.ico" ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit makedumpfile for openSUSE:Factory
by root＠hilbert.suse.de 23 Sep '10

23 Sep '10

Hello community, here is the log from the commit of package makedumpfile for openSUSE:Factory checked in at Fri Sep 24 01:01:00 CEST 2010. -------- --- makedumpfile/makedumpfile.changes 2010-02-28 12:02:51.000000000 +0100 +++ /mounts/work_src_done/STABLE/makedumpfile/makedumpfile.changes 2010-09-22 10:58:50.000000000 +0200 @@ -1,0 +2,20 @@ +Wed Sep 22 08:13:48 UTC 2010 - ptesarik(a)novell.com + +- Update to 1.3.6 + * Features + o Use TMPDIR environment variable for temporary files + o Add linux-2.6.32 - 2.6.34 support + * Bugfixes + o Fix buffer overflow when writing dh->signature + o handle !SPARSEMEM_EX properly + * Code Cleanup + o Fix 'struct kdump_sub_header' member in IMPLEMENTATION + o fix typo in IMPLEMENTATION + o add maintainers + o add TMPDIR description + o add .gitignore file + o makedumpfile: works on 2.6.32 + o the initialization method is operated if it is possible +- makedumpfile-fix-buffer-overflow.diff: dropped (upstream). + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- makedumpfile-1.3.5.tar.bz2 makedumpfile-fix-buffer-overflow.diff New: ---- makedumpfile-1.3.6.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ makedumpfile.spec ++++++ --- /var/tmp/diff_new_pack.y39dOu/_old 2010-09-24 01:00:46.000000000 +0200 +++ /var/tmp/diff_new_pack.y39dOu/_new 2010-09-24 01:00:46.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package makedumpfile (Version 1.3.5) +# spec file for package makedumpfile (Version 1.3.6) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -26,14 +26,13 @@ BuildRequires: libdw-devel libdw1 libelf-devel libelf0 libelf1 %endif License: GPLv2+ -Version: 1.3.5 +Version: 1.3.6 Release: 1 Summary: Partial kernel dump Group: System/Kernel Url: https://sourceforge.net/projects/makedumpfile/ Source: %{name}-%{version}.tar.bz2 Patch0: %{name}-coptflags.diff -Patch1: %{name}-fix-buffer-overflow.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build ExclusiveArch: %ix86 x86_64 ia64 ppc64 @@ -52,7 +51,6 @@ %prep %setup -q %patch0 -p1 -%patch1 -p1 %build make COPTFLAGS="$RPM_OPT_FLAGS" ++++++ makedumpfile-1.3.5.tar.bz2 -> makedumpfile-1.3.6.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/makedumpfile-1.3.5/.gitignore new/makedumpfile-1.3.6/.gitignore --- old/makedumpfile-1.3.5/.gitignore 1970-01-01 01:00:00.000000000 +0100 +++ new/makedumpfile-1.3.6/.gitignore 2010-06-22 02:58:12.000000000 +0200 @@ -0,0 +1,80 @@ +# +# NOTE! Don't add files that are generated in specific +# subdirectories here. Add them in the ".gitignore" file +# in that subdirectory instead. +# +# NOTE! Please use 'git ls-files -i --exclude-standard' +# command after changing this file, to see if there are +# any tracked files which get ignored after the change. +# +# Normal rules +# +.* +*.o +*.o.* +*.a +*.s +*.ko +*.so +*.so.dbg +*.mod.c +*.i +*.lst +*.symtypes +*.order +modules.builtin +*.elf +*.bin +*.gz +*.bz2 +*.lzma +*.lzo +*.patch +*.gcno + +# +# Top-level generic files +# +/tags +/TAGS +/linux +/vmlinux +/vmlinuz +/System.map +/Module.markers +/Module.symvers + +# +# git files that we don't want to ignore even it they are dot-files +# +!.gitignore +!.mailmap + +# +# Generated include files +# +include/config +include/linux/version.h +include/generated + +# stgit generated dirs +patches-* + +# quilt's files +patches +series + +# cscope files +cscope.* +ncscope.* + +# gnu global files +GPATH +GRTAGS +GSYMS +GTAGS + +*.orig +*~ +\#*# +makedumpfile diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/makedumpfile-1.3.5/IMPLEMENTATION new/makedumpfile-1.3.6/IMPLEMENTATION --- old/makedumpfile-1.3.5/IMPLEMENTATION 2008-09-04 09:31:58.000000000 +0200 +++ new/makedumpfile-1.3.6/IMPLEMENTATION 2010-06-22 02:58:12.000000000 +0200 @@ -56,7 +56,7 @@ }; - sub header - The sub header of the kdump compressed format is orignal. This header + The sub header of the kdump compressed format is original. This header has the member phys_base and dump_level. The member phys_base is for an x86_64 relocatable kernel, and the member dump_level has '-d' option's value of makedumpfile command. @@ -64,6 +64,11 @@ struct kdump_sub_header { unsigned long phys_base; int dump_level; /* header_version 1 and later */ + int split; /* header_version 2 and later */ + unsigned long start_pfn; /* header_version 2 and later */ + unsigned long end_pfn; /* header_version 2 and later */ + off_t offset_vmcoreinfo;/* header_version 3 and later */ + unsigned long size_vmcoreinfo; /* header_version 3 and later */ }; - 1st-bitmap diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/makedumpfile-1.3.5/Makefile new/makedumpfile-1.3.6/Makefile --- old/makedumpfile-1.3.5/Makefile 2009-11-11 01:44:51.000000000 +0100 +++ new/makedumpfile-1.3.6/Makefile 2010-06-22 02:58:12.000000000 +0200 @@ -1,7 +1,7 @@ # makedumpfile -VERSION=1.3.5 -DATE=11 November 2009 +VERSION=1.3.6 +DATE=25 June 2010 CC = gcc CFLAGS = -g -O2 -Wall -D_FILE_OFFSET_BITS=64 \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/makedumpfile-1.3.5/README new/makedumpfile-1.3.6/README --- old/makedumpfile-1.3.5/README 2009-11-11 01:44:51.000000000 +0100 +++ new/makedumpfile-1.3.6/README 2010-06-22 02:58:12.000000000 +0200 @@ -63,7 +63,10 @@ 2.6.28 | OK | ** | -- | | | ** | OK | -- | OK | OK | OK | 2.6.29 | OK | ** | -- | | | ** | OK | -- | OK | OK | OK | 2.6.30 | OK | ** | -- | | | ** | OK | -- | OK | OK | OK | - 2.6.31 | OK | ** | -- | | | ** | | -- | | OK | OK | + 2.6.31 | OK | ** | -- | | | ** | | -- | OK | OK | OK | + 2.6.32 | OK | ** | -- | | | ** | | -- | OK | OK | | + 2.6.33 | OK | ** | -- | | | ** | | -- | OK | OK | | + 2.6.34 | OK | ** | -- | | | ** | | -- | OK | OK | | OK : Support. -- : Not support. @@ -139,5 +142,8 @@ If finding some bugs, please send the information to the following: Ken'ichi Ohmichi <oomichi(a)mxs.nes.nec.co.jp> Masaki Tachibana <tachibana(a)mxm.nes.nec.co.jp> + Minoru Usui <usui(a)mxm.nes.nec.co.jp> + Masayuki Igawa <igawa(a)mxs.nes.nec.co.jp> + Daisuke Nishimura <nishimura(a)mxp.nes.nec.co.jp> kexec-ml <kexec(a)lists.infradead.org> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/makedumpfile-1.3.5/makedumpfile.8 new/makedumpfile-1.3.6/makedumpfile.8 --- old/makedumpfile-1.3.5/makedumpfile.8 2009-11-11 01:44:51.000000000 +0100 +++ new/makedumpfile-1.3.6/makedumpfile.8 2010-06-22 02:58:12.000000000 +0200 @@ -1,4 +1,4 @@ -.TH MAKEDUMPFILE 8 "11 November 2009" "makedumpfile v1.3.5" "Linux System Administrator's Manual" +.TH MAKEDUMPFILE 8 "25 June 2010" "makedumpfile v1.3.6" "Linux System Administrator's Manual" .SH NAME makedumpfile \- make a small dumpfile of kdump .SH SYNOPSIS @@ -453,6 +453,18 @@ \fB\-v\fR Show the version of makedumpfile. +.SH ENVIRONMENT VARIABLES + +.TP 8 +.B TMPDIR +This environment variable is for a temporary memory bitmap file. +If your machine has a lots of memory and you use tmpfs on /tmp, makedumpfile +can fail for a little memory in the 2nd kernel because makedumpfile makes a +very large temporary memory bitmap file in this case. To avoid this failure, +you can set a TMPDIR environment variable. If you do not set a TMPDIR +environment variable, makedumpfile uses /tmp directory for a temporary +bitmap file as a default. + .SH DIAGNOSTICS makedumpfile exits with the following value. .TP diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/makedumpfile-1.3.5/makedumpfile.c new/makedumpfile-1.3.6/makedumpfile.c --- old/makedumpfile-1.3.5/makedumpfile.c 2009-11-11 01:44:51.000000000 +0100 +++ new/makedumpfile-1.3.6/makedumpfile.c 2010-06-22 02:58:12.000000000 +0200 @@ -933,14 +933,21 @@ open_dump_bitmap(void) { int i, fd; + char *tmpname; - if ((info->name_bitmap - = (char *)malloc(sizeof(FILENAME_BITMAP))) == NULL) { + tmpname = getenv("TMPDIR"); + if (!tmpname) + tmpname = "/tmp"; + + if ((info->name_bitmap = (char *)malloc(sizeof(FILENAME_BITMAP) + + strlen(tmpname) + 1)) == NULL) { ERRMSG("Can't allocate memory for the filename. %s\n", strerror(errno)); return FALSE; } - strcpy(info->name_bitmap, FILENAME_BITMAP); + strcpy(info->name_bitmap, tmpname); + strcat(info->name_bitmap, "/"); + strcat(info->name_bitmap, FILENAME_BITMAP); if ((fd = mkstemp(info->name_bitmap)) < 0) { ERRMSG("Can't open the bitmap file(%s). %s\n", info->name_bitmap, strerror(errno)); @@ -3547,9 +3554,6 @@ { unsigned long addr; - if (!is_kvaddr(mem_sec[SECTION_NR_TO_ROOT(nr)])) - return NOT_KV_ADDR; - if (is_sparsemem_extreme()) addr = mem_sec[SECTION_NR_TO_ROOT(nr)] + (nr & SECTION_ROOT_MASK()) * SIZE(mem_section); @@ -3772,6 +3776,8 @@ int initial(void) { + int debug_info = FALSE; + if (!(vt.mem_flags & MEMORY_XEN) && info->flag_exclude_xen_dom) { MSG("'-X' option is disable,"); MSG("because %s is not Xen's memory core image.\n", info->name_memory); @@ -3803,6 +3809,7 @@ if (!read_vmcoreinfo()) return FALSE; close_vmcoreinfo(); + debug_info = TRUE; /* * Get the debug information for analysis from the kernel file */ @@ -3818,6 +3825,8 @@ if (!get_srcfile_info()) return FALSE; + + debug_info = TRUE; } else { /* * Check whether /proc/vmcore contains vmcoreinfo, @@ -3847,6 +3856,7 @@ if (!read_vmcoreinfo_from_vmcore(info->offset_vmcoreinfo, info->size_vmcoreinfo, FALSE)) return FALSE; + debug_info = TRUE; } if (!get_value_for_old_linux()) @@ -3863,31 +3873,25 @@ if (!get_max_mapnr()) return FALSE; - if ((info->max_dump_level <= DL_EXCLUDE_ZERO) && !info->flag_dmesg) { - /* - * The debugging information is unnecessary, because the memory - * management system will not be analazed. - */ - if (!get_mem_map_without_mm()) + if (debug_info) { + if (!get_machdep_info()) return FALSE; - else - return TRUE; - } - - if (!get_machdep_info()) - return FALSE; - if (!check_release()) - return FALSE; + if (!check_release()) + return FALSE; - if (!get_versiondep_info()) - return FALSE; + if (!get_versiondep_info()) + return FALSE; - if (!get_numnodes()) - return FALSE; + if (!get_numnodes()) + return FALSE; - if (!get_mem_map()) - return FALSE; + if (!get_mem_map()) + return FALSE; + } else { + if (!get_mem_map_without_mm()) + return FALSE; + } return TRUE; } @@ -5454,7 +5458,7 @@ /* * Write common header */ - strcpy(dh->signature, KDUMP_SIGNATURE); + strncpy(dh->signature, KDUMP_SIGNATURE, strlen(KDUMP_SIGNATURE)); dh->header_version = 3; dh->block_size = info->page_size; dh->sub_hdr_size = sizeof(kh) + info->size_vmcoreinfo; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/makedumpfile-1.3.5/makedumpfile.h new/makedumpfile-1.3.6/makedumpfile.h --- old/makedumpfile-1.3.5/makedumpfile.h 2009-11-11 01:44:51.000000000 +0100 +++ new/makedumpfile-1.3.6/makedumpfile.h 2010-06-22 02:58:12.000000000 +0200 @@ -230,7 +230,7 @@ #define BUFSIZE_FGETS (1500) #define BUFSIZE_BITMAP (4096) #define PFN_BUFBITMAP (BITPERBYTE*BUFSIZE_BITMAP) -#define FILENAME_BITMAP "/tmp/kdump_bitmapXXXXXX" +#define FILENAME_BITMAP "kdump_bitmapXXXXXX" #define FILENAME_STDOUT "STDOUT" /* @@ -449,7 +449,7 @@ #define KVER_MIN_SHIFT 16 #define KERNEL_VERSION(x,y,z) (((x) << KVER_MAJ_SHIFT) | ((y) << KVER_MIN_SHIFT) | (z)) #define OLDEST_VERSION KERNEL_VERSION(2, 6, 15)/* linux-2.6.15 */ -#define LATEST_VERSION KERNEL_VERSION(2, 6, 31)/* linux-2.6.31 */ +#define LATEST_VERSION KERNEL_VERSION(2, 6, 34)/* linux-2.6.34 */ /* * vmcoreinfo in /proc/vmcore diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/makedumpfile-1.3.5/makedumpfile.spec new/makedumpfile-1.3.6/makedumpfile.spec --- old/makedumpfile-1.3.5/makedumpfile.spec 2009-11-11 01:44:51.000000000 +0100 +++ new/makedumpfile-1.3.6/makedumpfile.spec 2010-06-22 02:58:12.000000000 +0200 @@ -1,6 +1,6 @@ Name: makedumpfile Summary: makedumpfile package -Version: 1.3.5 +Version: 1.3.6 Release: 1 Group: Applications/Text License: GPL ++++++ makedumpfile-coptflags.diff ++++++ --- /var/tmp/diff_new_pack.y39dOu/_old 2010-09-24 01:00:46.000000000 +0200 +++ /var/tmp/diff_new_pack.y39dOu/_new 2010-09-24 01:00:46.000000000 +0200 @@ -5,7 +5,7 @@ --- a/Makefile +++ b/Makefile @@ -4,10 +4,10 @@ VERSION=1.3.5 - DATE=11 November 2009 + DATE=25 June 2010 CC = gcc -CFLAGS = -g -O2 -Wall -D_FILE_OFFSET_BITS=64 \ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit perl-DBD-ODBC for openSUSE:Factory
by root＠hilbert.suse.de 23 Sep '10

23 Sep '10

Hello community, here is the log from the commit of package perl-DBD-ODBC for openSUSE:Factory checked in at Fri Sep 24 01:00:50 CEST 2010. -------- --- perl-DBD-ODBC/perl-DBD-ODBC.changes 2010-07-25 17:07:45.000000000 +0200 +++ /mounts/work_src_done/STABLE/perl-DBD-ODBC/perl-DBD-ODBC.changes 2010-09-23 15:01:33.000000000 +0200 @@ -1,0 +2,22 @@ +Thu Sep 23 14:56:12 CEST 2010 - anicka(a)suse.cz + +- update to 1.25 + * Changed bind_col so it actually pays attention to the TYPE + attribute as you could not override the bind type of a bound + column before. + * Left a sv_undef in + * Change sprintf to snprintf for safety. + * Removed some unused fields from the fbh structure which should + save a little memory for each column in a result-set. + * Started adding support for DBI's DiscardString and StrictlyTyped + but not complete yet so don't use them yet. + * Added experimental odbc_lob_read method - see pod. + * Moved the binding of columns to the first call to fetch instead of + after execute is called as it prevents bind_col overrriding the + type used for binding and I needed it to support odbc_lob_read. + * Removed support for DBI's blob_read - it was totally flawed and + did not work at all. May replace in the future. + * Added support for MS SQL Server XML type (SQL type -152). + * bugfixes, new FAQs + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- DBD-ODBC-1.24.tar.bz2 perl-DBD-ODBC-1.23-Makefile.diff New: ---- DBD-ODBC-1.25.tar.bz2 perl-DBD-ODBC-1.25-Makefile.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-DBD-ODBC.spec ++++++ --- /var/tmp/diff_new_pack.4O0iIT/_old 2010-09-24 01:00:35.000000000 +0200 +++ /var/tmp/diff_new_pack.4O0iIT/_new 2010-09-24 01:00:35.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package perl-DBD-ODBC (Version 1.24) +# spec file for package perl-DBD-ODBC (Version 1.25) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -22,14 +22,14 @@ Name: perl-DBD-ODBC %define cpan_name DBD-ODBC Summary: ODBC Driver for DBI -Version: 1.24 +Version: 1.25 Release: 1 License: GPL+ or Artistic Group: Development/Libraries/Perl Url: http://search.cpan.org/dist/DBD-ODBC/ #Source: http://www.cpan.org/modules/by-module/DBD/DBD-ODBC-%{version}.tar.gz Source: %{cpan_name}-%{version}.tar.bz2 -Patch0: %{name}-1.23-Makefile.diff +Patch0: %{name}-%{version}-Makefile.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: perl %if 0%{?suse_version} < 1120 ++++++ DBD-ODBC-1.24.tar.bz2 -> DBD-ODBC-1.25.tar.bz2 ++++++ ++++ 2087 lines of diff (skipped) ++++++ perl-DBD-ODBC-1.23-Makefile.diff -> perl-DBD-ODBC-1.25-Makefile.diff ++++++ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit pitivi for openSUSE:Factory
by root＠hilbert.suse.de 23 Sep '10

23 Sep '10

Hello community, here is the log from the commit of package pitivi for openSUSE:Factory checked in at Fri Sep 24 01:00:34 CEST 2010. -------- --- GNOME/pitivi/pitivi.changes 2010-08-29 20:45:32.000000000 +0200 +++ /mounts/work_src_done/STABLE/pitivi/pitivi.changes 2010-09-22 12:44:15.000000000 +0200 @@ -1,0 +2,12 @@ +Wed Sep 22 12:42:36 CEST 2010 - dimstar(a)opensuse.org + +- Update to version 0.13.5: + + periodic backup of the current project file. + + easy crossfading transitions of overlapping clips. + + better icons for link and group operations. + + new add keyframe button. + + fixed support for the missing plugins installer. + + improved support for pictures. + + various performance improvements. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- pitivi-0.13.4.tar.bz2 New: ---- pitivi-0.13.5.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pitivi.spec ++++++ --- /var/tmp/diff_new_pack.2SoqnX/_old 2010-09-24 00:59:18.000000000 +0200 +++ /var/tmp/diff_new_pack.2SoqnX/_new 2010-09-24 00:59:18.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package pitivi (Version 0.13.4) +# spec file for package pitivi (Version 0.13.5) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -18,7 +18,7 @@ Name: pitivi -Version: 0.13.4 +Version: 0.13.5 Release: 1 License: LGPLv2.1+ Summary: Intuitive and featureful movie editor ++++++ pitivi-0.13.4.tar.bz2 -> pitivi-0.13.5.tar.bz2 ++++++ ++++ 43070 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit powertop for openSUSE:Factory
by root＠hilbert.suse.de 23 Sep '10

23 Sep '10

Hello community, here is the log from the commit of package powertop for openSUSE:Factory checked in at Fri Sep 24 01:00:21 CEST 2010. -------- --- powertop/powertop.changes 2010-05-09 19:07:35.000000000 +0200 +++ /mounts/work_src_done/STABLE/powertop/powertop.changes 2010-08-24 19:11:48.000000000 +0200 @@ -1,0 +2,29 @@ +Tue Aug 24 17:14:01 UTC 2010 - trenn(a)novell.com + +- Fix minor build warning: + powertop.x86_64: W: name-repeated-in-summary C PowerTOP +- Update to version 1.13: + Features: + * PowerTOP now supports Runtime Device Power Management, both in terms + of enabling it via a suggestion as well as collecting statistics for it + * PowerTOP now has support for reporting which application keeps the + disk from powersaving mode (worth +/- 0.5W) + * PowerTOP now has support for reporting AHCI Link power management + statistics (worth 0.5W - 1W) + * PowerTOP now supports the Audio power saving statistics so you can see + if some app keeps your audio out of powersave (0.5W - 1W) + * PowerTOP reports the use of "Turbo Mode" on Intel processors that + support this (Core i7 and such) + + Fixes: + * We should have fixed all suggestions that previously didn't go away + even though you hit the key to apply them + * We don't turn on USB power management for USB input devices, they tend + to break if you do + * Be smarter about we report ethernet activity in the light of + multiqueue networking + * many translation updates + * Recognize per cpu hpet in timer reporting + * Various wifi power saving api changes/tweaks taken care of + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- powertop-1.11-svn_r332.diff powertop-1.11.tar.gz powertop-segfault.diff New: ---- powertop-1.13.tar.bz2 powertop_fix_sizof_link.patch powertop_set_cflags_override.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ powertop.spec ++++++ --- /var/tmp/diff_new_pack.Zypt7B/_old 2010-09-24 00:58:47.000000000 +0200 +++ /var/tmp/diff_new_pack.Zypt7B/_new 2010-09-24 00:58:47.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package powertop (Version 1.11) +# spec file for package powertop (Version 1.13) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,14 +19,14 @@ Name: powertop Url: http://www.linuxpowertop.org -Summary: PowerTOP is a Linux Tool to Find out What is Using Power on a Laptop -Version: 1.11 -Release: 3 +Summary: A Linux Tool to Find out What is Using Power on a Laptop +Version: 1.13 +Release: 1 License: GPLv2+ Group: System/Monitoring -Source0: %{name}-%{version}.tar.gz -Patch0: powertop-segfault.diff -Patch1: powertop-1.11-svn_r332.diff +Source0: %{name}-%{version}.tar.bz2 +Patch0: powertop_fix_sizof_link.patch +Patch1: powertop_set_cflags_override.patch BuildRequires: ncurses-devel BuildRoot: %{_tmppath}/%{name}-%{version}-build AutoReqProv: on @@ -37,14 +37,13 @@ doing in terms of power savings. - Authors: -------- Arjan van de Ven <arjan(a)linux.intel.com> %prep %setup -%patch0 +%patch0 -p1 %patch1 -p1 %build ++++++ powertop_fix_sizof_link.patch ++++++ commit 24a9f62c5b7f79500cd468876fa5323e689179a2 Author: Luca Tettamanti <kronos.it(a)gmail.com> Date: Fri Aug 6 09:56:15 2010 -0700 readlink is failing because sizeof(link) returns the size of 'link' which is a function, not the intended char buffer. Fix the typo. Signed-off-by: Luca Tettamanti <kronos.it(a)gmail.com> diff --git a/usb.c b/usb.c index f3a1bef..44d3252 100644 --- a/usb.c +++ b/usb.c @@ -52,7 +52,7 @@ void activate_usb_autosuspend(void) /* skip usb input devices */ sprintf(filename, "/sys/bus/usb/devices/%s/driver", dirent->d_name); memset(linkto, 0, sizeof(linkto)); - len = readlink(filename, linkto, sizeof(link) - 1); + len = readlink(filename, linkto, sizeof(linkto) - 1); if (strstr(linkto, "usbhid")) continue; ++++++ powertop_set_cflags_override.patch ++++++ --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Index: powertop-1.13/Makefile =================================================================== --- powertop-1.13.orig/Makefile +++ powertop-1.13/Makefile @@ -7,7 +7,7 @@ WARNFLAGS=-Wall -Wshadow -W -Wformat -Wi CFLAGS?=-O1 -g ${WARNFLAGS} CC?=gcc -CFLAGS+=-D VERSION=\"$(VERSION)\" +override CFLAGS+=-D VERSION=\"$(VERSION)\" # # The w in -lncursesw is not a typo; it is the wide-character version ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit qtcurve-gtk2 for openSUSE:Factory
by root＠hilbert.suse.de 23 Sep '10

23 Sep '10

Hello community, here is the log from the commit of package qtcurve-gtk2 for openSUSE:Factory checked in at Fri Sep 24 00:59:09 CEST 2010. -------- --- KDE/qtcurve-gtk2/qtcurve-gtk2.changes 2010-08-10 00:27:03.000000000 +0200 +++ /mounts/work_src_done/STABLE/qtcurve-gtk2/qtcurve-gtk2.changes 2010-09-18 14:57:05.000000000 +0200 @@ -1,0 +2,63 @@ +Sat Sep 18 14:54:51 CEST 2010 - vuntz(a)opensuse.org + +- Update to version 1.6.1: + + Add option to have rounded popup menus. + + Allow rounded tooltips when not compositing. + + Use a hack to re-enable shadows for rounded tooltips. + + Don't map/unmap tooltips - not required?. + + Fix kwin titlebar blending for striped backgrounds. + + Use flat selection for items of editable combo: it matches KDE4 + better. + + Simplify faded menu item code. + + Do not use gtk_style_apply_default_background for resize + widgets: it messes up translucency. + +------------------------------------------------------------------- +Mon Sep 13 09:07:58 CEST 2010 - dimstar(a)opensuse.org + +- Update to version 1.6.0: + + Add 'glow' focus option - this is now the default. + + Fix potential crash in rgbToHsv + + Use square-ish focus for view items if using squared selection. + + Store dialog/window opacity in an XProperty - so that kwin + theme can use this as the titlebar opacity. + + Don't hide focus rect on listview headers when mouse-overed. + + Fix crash due to missing gtk_widget_get_allocation - this was + only introduced in Gtk 2.18.0 + + Group boxes need to respect 'square frames' setting. + + Some Java Swing fixes/workarounds: + - always use plain slider style + - dont depress sliders + - slightly improve tabs + + Added option to specify tooltip background appearance. + + Added options to draw shaded, or faded, group boxes. + + Added options to specify location of group box label; inside, + outside. + + Dont use the 'no buttons' scrollbar setting for mozilla apps. + + Draw coloured mouse over for 'checked' toggle buttons. + + Fix look of some sunken toolbar button in firefox. + + Use Highlight colour for default button glow. + + When KDE4's 'Inactive selection changes colour' setting is + enabled, dont change the selection colour - use same colour, + but set 50% transparent. + + Add "npviewer.bin" to list of apps that are brower plugin + viewers - opacity settings are excluded from these. + + Exclude opacity settings from SWT apps (e.g. eclipse), totem, + and sonata. + + Default sub-menu popup delay to 225 - matches Gtk2 standard + default. The previous default of 100 seems to cause issues with + Thunar. + + Extend background gradients into window decoration. + + Fix faded menuitems when using menu background gradients. + + If background gradient has a 'shine', then when used for + backgrounds draw a radial gradient top centered. + + Use arrows on pathbar buttons. + + If using compositing then use rounded and semi-transparent + tooltips. (Note: when using rounded tooltips, the kwin shadow + dissapears.) + + Add option to force square tooltips. + + Reduce GdkGC usage - use cairo for text layout. + + Add a hack to work-around issues with NVIDIA and cairo 1.10. + + Improve tab mouse-over code. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- QtCurve-Gtk2-1.5.2.tar.bz2 New: ---- QtCurve-Gtk2-1.6.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qtcurve-gtk2.spec ++++++ --- /var/tmp/diff_new_pack.7eVxtH/_old 2010-09-24 00:58:36.000000000 +0200 +++ /var/tmp/diff_new_pack.7eVxtH/_new 2010-09-24 00:58:36.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package qtcurve-gtk2 (Version 1.5.2) +# spec file for package qtcurve-gtk2 (Version 1.6.1) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -18,7 +18,7 @@ Name: qtcurve-gtk2 -Version: 1.5.2 +Version: 1.6.1 Release: 1 License: GPLv2+ Summary: QtCurve style for Gtk2 ++++++ QtCurve-Gtk2-1.5.2.tar.bz2 -> QtCurve-Gtk2-1.6.1.tar.bz2 ++++++ ++++ 3751 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit rfc for openSUSE:Factory
by root＠hilbert.suse.de 23 Sep '10

23 Sep '10

Hello community, here is the log from the commit of package rfc for openSUSE:Factory checked in at Fri Sep 24 00:58:37 CEST 2010. -------- --- AUTO/all/rfc/rfc.changes 2010-09-22 00:45:12.000000000 +0200 +++ /mounts/work_src_done/STABLE/rfc/rfc.changes 2010-09-23 20:45:29.000000000 +0200 @@ -2 +2 @@ -Wed Sep 22 00:45:12 CEST 2010 - autobuild(a)suse.de +Thu Sep 23 20:45:29 CEST 2010 - autobuild(a)suse.de @@ -4 +4 @@ -- automated update on 2010-09-22 +- automated update on 2010-09-23 calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rfc.spec ++++++ --- /var/tmp/diff_new_pack.W3cjRn/_old 2010-09-24 00:58:24.000000000 +0200 +++ /var/tmp/diff_new_pack.W3cjRn/_new 2010-09-24 00:58:24.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package rfc (Version 2010.9.21) +# spec file for package rfc (Version 2010.9.23) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -25,8 +25,8 @@ Summary: The RFCs (Request For Comments) Source: rfc.tgz BuildArch: noarch -Version: 2010.9.21 -Release: 2 +Version: 2010.9.23 +Release: 1 Url: ftp://ftp.isi.edu/in-notes BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ rfc.tgz ++++++ AUTO/all/rfc/rfc.tgz /mounts/work_src_done/STABLE/rfc/rfc.tgz differ: char 5, line 1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit susedoc-buildbook for openSUSE:Factory
by root＠hilbert.suse.de 23 Sep '10

23 Sep '10

Hello community, here is the log from the commit of package susedoc-buildbook for openSUSE:Factory checked in at Fri Sep 24 00:58:26 CEST 2010. -------- --- susedoc-buildbook/susedoc-buildbook.changes 2010-09-10 16:21:52.000000000 +0200 +++ /mounts/work_src_done/STABLE/susedoc-buildbook/susedoc-buildbook.changes 2010-09-21 10:34:44.000000000 +0200 @@ -1,0 +2,7 @@ +Tue Sep 21 10:34:01 CEST 2010 - ke(a)suse.de + +- 0.16: +* update_spec.pl: Fix typo (use obsoletes). +* buildbook: Fix the obsoleting opensuse-manuals_??-pdf statement. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- susedoc-buildbook-0.15.tar.bz2 New: ---- susedoc-buildbook-0.16.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ susedoc-buildbook.spec ++++++ --- /var/tmp/diff_new_pack.arnOwP/_old 2010-09-24 00:58:11.000000000 +0200 +++ /var/tmp/diff_new_pack.arnOwP/_new 2010-09-24 00:58:11.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package susedoc-buildbook (Version 0.15) +# spec file for package susedoc-buildbook (Version 0.16) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -23,7 +23,7 @@ Group: Documentation/SUSE AutoReqProv: on Summary: susedoc Book Build Script -Version: 0.15 +Version: 0.16 Release: 1 Source: %{name}-%{version}.tar.bz2 Url: https://svn.berlios.de/svnroot/repos/opensuse-doc/trunk/susedoc-buildbook ++++++ susedoc-buildbook-0.15.tar.bz2 -> susedoc-buildbook-0.16.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/susedoc-buildbook-0.15/NEWS new/susedoc-buildbook-0.16/NEWS --- old/susedoc-buildbook-0.15/NEWS 2010-09-09 09:38:01.000000000 +0200 +++ new/susedoc-buildbook-0.16/NEWS 2010-09-21 10:32:49.000000000 +0200 @@ -1,3 +1,7 @@ +0.16: +* update_spec.pl: Fix typo, actually use obsoletes entries. +* buildbook.sh: Fix the obsoleting opensuse-manuals_??-pdf statement. + 0.15: * Fix typo in .spec.in. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/susedoc-buildbook-0.15/buildbook.sh new/susedoc-buildbook-0.16/buildbook.sh --- old/susedoc-buildbook-0.15/buildbook.sh 2010-08-02 15:11:37.000000000 +0200 +++ new/susedoc-buildbook-0.16/buildbook.sh 2010-09-21 13:07:04.000000000 +0200 @@ -477,7 +477,8 @@ ;; esac done - pdfobs="$pdfobs opensuse-manuals=11.3-pdf" + ### append "-pdf" after(!) the version number!!! + pdfobs="$pdfobs opensuse-manuals_$LL=11.3-pdf" set_obs_in_spec elif [ $product = sled-manuals ]; then # obsolete since sle11 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/susedoc-buildbook-0.15/configure new/susedoc-buildbook-0.16/configure --- old/susedoc-buildbook-0.15/configure 2010-09-09 09:38:54.000000000 +0200 +++ new/susedoc-buildbook-0.16/configure 2010-09-21 10:09:11.000000000 +0200 @@ -2121,7 +2121,7 @@ # Define the identity of the package. PACKAGE=susedoc-buildbook - VERSION=0.15 + VERSION=0.16 cat >>confdefs.h <<_ACEOF diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/susedoc-buildbook-0.15/configure.ac new/susedoc-buildbook-0.16/configure.ac --- old/susedoc-buildbook-0.15/configure.ac 2010-09-09 09:38:09.000000000 +0200 +++ new/susedoc-buildbook-0.16/configure.ac 2010-09-21 10:04:44.000000000 +0200 @@ -1,4 +1,4 @@ AC_INIT([book.spec.in]) -AM_INIT_AUTOMAKE([susedoc-buildbook], [0.15]) +AM_INIT_AUTOMAKE([susedoc-buildbook], [0.16]) AC_CONFIG_FILES([Makefile]) AC_OUTPUT diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/susedoc-buildbook-0.15/update_spec.pl new/susedoc-buildbook-0.16/update_spec.pl --- old/susedoc-buildbook-0.15/update_spec.pl 2010-07-15 13:54:08.000000000 +0200 +++ new/susedoc-buildbook-0.16/update_spec.pl 2010-09-21 09:56:24.000000000 +0200 @@ -156,7 +156,7 @@ # FIXME: the above and below lists of tags should be dynamic, no? if (/^(Requires:\s*)(.*)$/) { - flush_multi($pname, 'requires'); + flush_multi($pname, 'obsoletes'); } if (/^(Provides:\s*)(.*)$/) { flush_multi($pname, 'provides'); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit telepathy-butterfly for openSUSE:Factory
by root＠hilbert.suse.de 23 Sep '10

23 Sep '10

Hello community, here is the log from the commit of package telepathy-butterfly for openSUSE:Factory checked in at Fri Sep 24 00:58:14 CEST 2010. -------- --- telepathy-butterfly/telepathy-butterfly.changes 2010-08-15 12:32:12.000000000 +0200 +++ /mounts/work_src_done/STABLE/telepathy-butterfly/telepathy-butterfly.changes 2010-09-11 19:48:34.000000000 +0200 @@ -1,0 +2,10 @@ +Sat Sep 11 18:26:18 CEST 2010 - vuntz(a)opensuse.org + +- Update to version 0.5.14: + + fdo#24338: only set remote candidates after accepting the + invitation + + Fix handling of conversations when contact goes offline (needs + papyon 0.5.1) + + Fix detection of capabilities + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- telepathy-butterfly-0.5.13.tar.bz2 New: ---- telepathy-butterfly-0.5.14.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ telepathy-butterfly.spec ++++++ --- /var/tmp/diff_new_pack.neHXOS/_old 2010-09-24 00:58:00.000000000 +0200 +++ /var/tmp/diff_new_pack.neHXOS/_new 2010-09-24 00:58:00.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package telepathy-butterfly (Version 0.5.13) +# spec file for package telepathy-butterfly (Version 0.5.14) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -18,7 +18,7 @@ Name: telepathy-butterfly -Version: 0.5.13 +Version: 0.5.14 Release: 1 License: GPLv2+ Summary: MSN (butterfly) connection manager for Telepathy ++++++ telepathy-butterfly-0.5.13.tar.bz2 -> telepathy-butterfly-0.5.14.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/telepathy-butterfly-0.5.13/ChangeLog new/telepathy-butterfly-0.5.14/ChangeLog --- old/telepathy-butterfly-0.5.13/ChangeLog 2010-08-13 07:23:57.000000000 +0200 +++ new/telepathy-butterfly-0.5.14/ChangeLog 2010-09-11 00:47:53.000000000 +0200 @@ -1,3 +1,87 @@ +commit 05affbb91ef0ca244d45cc32fbb8e10ca72453f9 +Author: Louis-Francis Ratté-Boulianne <louis-francis.ratte-boulianne(a)collabora.co.uk> +Date: 2010-09-10 18:47:31 -0400 + + Change version in configure.ac + +commit 53b3385e62a7aecfffb8e3674d3758148cfdc102 +Author: Louis-Francis Ratté-Boulianne <louis-francis.ratte-boulianne(a)collabora.co.uk> +Date: 2010-09-10 18:44:39 -0400 + + Version 0.5.14 + +commit 679dd0d0e8b3d1708f50057b2cdc3995367a6747 +Author: Louis-Francis Ratté-Boulianne <louis-francis.ratte-boulianne(a)collabora.co.uk> +Date: 2010-09-10 18:43:53 -0400 + + Papyon 0.5.1 is not absolutly needed, butterfly still works with 0.5.0 + +commit a7d2c6866eef23fffa482f56c29eb638092641b3 +Author: Louis-Francis Ratté-Boulianne <louis-francis.ratte-boulianne(a)collabora.co.uk> +Date: 2010-09-10 18:27:42 -0400 + + Fix capabilities detection + +commit eb2f00acba9c4be5ff57061b69df9a9551462659 +Author: Louis-Francis Ratté-Boulianne <louis-francis.ratte-boulianne(a)collabora.co.uk> +Date: 2010-09-10 18:27:18 -0400 + + Give the correct handle when our own avatar is changed remotly + +commit 335dd06a93c4cc8b549a5cbc7f652a06dbbcd9ee +Author: Louis-Francis Ratté-Boulianne <louis-francis.ratte-boulianne(a)collabora.co.uk> +Date: 2010-09-10 18:18:51 -0400 + + Add log message for an error + +commit 4cc71f2ab8df1a80a8fb7fdcfd650afd4ab6f0d6 +Author: Louis-Francis Ratté-Boulianne <louis-francis.ratte-boulianne(a)collabora.co.uk> +Date: 2010-09-10 18:17:00 -0400 + + Clear the conversation when it's closed + +commit 7d523265a0d5d066356ff7285f69f14f6cbc2698 +Author: Louis-Francis Ratté-Boulianne <louis-francis.ratte-boulianne(a)collabora.co.uk> +Date: 2010-09-10 18:14:58 -0400 + + Initialize right interface (ContactEventInterface instead of Conversation...) + +commit 26def946940090176dadb4bba09e0a13553a4d2a +Author: Louis-Francis Ratté-Boulianne <louis-francis.ratte-boulianne(a)collabora.co.uk> +Date: 2010-09-10 18:13:46 -0400 + + Only set remote candidates once the user accepted the call + +commit 65a00f77f4fed2535ff9b593d5f35ba413ef78a7 +Author: Louis-Francis Ratté-Boulianne <louis-francis.ratte-boulianne(a)collabora.co.uk> +Date: 2010-09-10 18:12:30 -0400 + + Send an error when a text message isn't delivered + +commit 0b69104b7f04a62cf3273c2b896fadb971c7b758 +Author: Louis-Francis Ratté-Boulianne <louis-francis.ratte-boulianne(a)collabora.co.uk> +Date: 2010-09-10 18:08:21 -0400 + + Some more debug messages and typo fixes + +commit 870e011fc33c89f90c0b60313db3842449fb3f2f +Author: Louis-Francis Ratté-Boulianne <louis-francis.ratte-boulianne(a)collabora.co.uk> +Date: 2010-08-25 13:14:42 -0400 + + Log butterfly and papyon version at initialization (fdo #29080) + +commit 3c3963add58978cadff73c13f333065d41991006 +Author: Louis-Francis Ratté-Boulianne <louis-francis.ratte-boulianne(a)collabora.co.uk> +Date: 2010-08-23 15:00:11 -0400 + + Remove unused function + +commit 397f50a7018af53cd5fff17fcd4110ce05e5d7f8 +Author: Louis-Francis Ratté-Boulianne <louis-francis.ratte-boulianne(a)collabora.co.uk> +Date: 2010-08-23 15:00:54 -0400 + + Decode utf-8 encoded sender's nick to an unicode string + commit 959805f14d7f2f0b8f2604672b0b4b96c14d65d2 Author: Louis-Francis Ratté-Boulianne <louis-francis.ratte-boulianne(a)collabora.co.uk> Date: 2010-08-13 00:28:58 -0400 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/telepathy-butterfly-0.5.13/NEWS new/telepathy-butterfly-0.5.14/NEWS --- old/telepathy-butterfly-0.5.13/NEWS 2010-08-13 06:32:04.000000000 +0200 +++ new/telepathy-butterfly-0.5.14/NEWS 2010-09-11 00:41:54.000000000 +0200 @@ -1,3 +1,12 @@ +telepathy-butterfly-0.5.14 (2010-09-10) +======================================= + +Fixes: + + * fd.o#24338: only set remote candidates after acception the invitation + * Fix handling of conversations when contact goes offline (needs papyon 0.5.1) + * Fix detection of capabilities + telepathy-butterfly-0.5.13 (2010-08-12) ======================================= diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/telepathy-butterfly-0.5.13/butterfly/avatars.py new/telepathy-butterfly-0.5.14/butterfly/avatars.py --- old/telepathy-butterfly-0.5.13/butterfly/avatars.py 2010-08-13 06:32:04.000000000 +0200 +++ new/telepathy-butterfly-0.5.14/butterfly/avatars.py 2010-09-09 22:46:43.000000000 +0200 @@ -127,8 +127,11 @@ avatar_token = contact.msn_object._data_sha.encode("hex") else: avatar_token = "" - handle = ButterflyHandleFactory(self, 'contact', - contact.account, contact.network_id) + if contact is self.msn_client.profile: + handle = ButterflyHandleFactory(self, 'self') + else: + handle = ButterflyHandleFactory(self, 'contact', + contact.account, contact.network_id) self.AvatarUpdated(handle, avatar_token) # papyon.event.ProfileEventInterface diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/telepathy-butterfly-0.5.13/butterfly/capabilities.py new/telepathy-butterfly-0.5.14/butterfly/capabilities.py --- old/telepathy-butterfly-0.5.13/butterfly/capabilities.py 2010-08-13 06:32:04.000000000 +0200 +++ new/telepathy-butterfly-0.5.14/butterfly/capabilities.py 2010-09-11 00:23:16.000000000 +0200 @@ -131,12 +131,15 @@ if channel_class[telepathy.CHANNEL_INTERFACE + '.ChannelType'] == \ telepathy.CHANNEL_TYPE_STREAMED_MEDIA: video = True - self._video_clients.append(client) - else: - # *Did* it used to support video? - if client in self._video_clients: - self._video_clients.remove(client) + break + if video and client not in self._video_clients: + self._video_clients.append(client) + elif not video and client in self._video_clients: + # *Did* it used to support video? + self._video_clients.remove(client) + + video = (len(self._video_clients) > 0) changed = False # We've got no more clients that support video; remove the cap. @@ -145,7 +148,8 @@ changed = True # We want video. - if video and not self._self_handle.profile.client_id.has_webcam: + if video and (not self._self_handle.profile.client_id.has_webcam or + not self._self_handle.profile.client_id.supports_rtc_video): self._self_handle.profile.client_id.has_webcam = True self._self_handle.profile.client_id.supports_rtc_video = True changed = True diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/telepathy-butterfly-0.5.13/butterfly/channel/im.py new/telepathy-butterfly-0.5.14/butterfly/channel/im.py --- old/telepathy-butterfly-0.5.13/butterfly/channel/im.py 2010-08-13 04:45:38.000000000 +0200 +++ new/telepathy-butterfly-0.5.14/butterfly/channel/im.py 2010-09-11 00:17:04.000000000 +0200 @@ -157,13 +157,20 @@ logger.info('Created new MUC channel to replace this 1-1 one: %s' % \ new_channel._object_path) + # papyon.event.ConversationEventInterface + def on_conversation_closed(self): + logger.info('Conversation closed') + self._offline_contact = self._initial_handle.contact + self._offline_handle = self._initial_handle + self._conversation = None + # papyon.event.ContactEventInterface def on_contact_presence_changed(self, contact): handle = ButterflyHandleFactory(self._conn_ref(), 'contact', contact.account, contact.network_id) # Recreate a conversation if our contact join if self._offline_contact == contact and contact.presence != papyon.Presence.OFFLINE: - logger.info('Contact %s connected, inviting him to the text channel' % unicode(contact)) + logger.info('Contact %s connected, inviting him to the text channel' % unicode(handle)) client = self._conn_ref().msn_client self._conversation = papyon.Conversation(client, [contact]) papyon.event.ConversationEventInterface.__init__(self, self._conversation) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/telepathy-butterfly-0.5.13/butterfly/channel/media.py new/telepathy-butterfly-0.5.14/butterfly/channel/media.py --- old/telepathy-butterfly-0.5.13/butterfly/channel/media.py 2010-08-13 06:32:04.000000000 +0200 +++ new/telepathy-butterfly-0.5.14/butterfly/channel/media.py 2010-09-11 00:07:42.000000000 +0200 @@ -161,6 +161,8 @@ if handle == int(self.GetSelfHandle()): if self.GetSelfHandle() in self._local_pending: self._call.accept() + for handler in self._session_handler.ListStreams(): + handler.send_candidates() def RemoveMembers(self, handles, message): logger.info("Remove members %r: %s" % (handles, message)) @@ -170,6 +172,7 @@ #papyon.event.call.CallEventInterface def on_call_accepted(self): + logger.info("Call accepted") self.on_call_answered(telepathy.MEDIA_STREAM_DIRECTION_BIDIRECTIONAL, 0) #papyon.event.call.CallEventInterface @@ -179,6 +182,8 @@ def on_call_answered(self, direction, pending_send): for handler in self._session_handler.ListStreams(): handler.set_direction(direction, pending_send) + logger.info("Direction changed to %i, %i" % (direction, + pending_send)) self.StreamDirectionChanged(handler.id, direction, pending_send) #papyon.event.call.CallEventInterface diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/telepathy-butterfly-0.5.13/butterfly/channel/text.py new/telepathy-butterfly-0.5.14/butterfly/channel/text.py --- old/telepathy-butterfly-0.5.13/butterfly/channel/text.py 2010-08-13 06:32:04.000000000 +0200 +++ new/telepathy-butterfly-0.5.14/butterfly/channel/text.py 2010-09-03 22:00:28.000000000 +0200 @@ -60,7 +60,7 @@ ButterflyChannel.__init__(self, conn, props) telepathy.server.ChannelInterfaceChatState.__init__(self) ChannelInterfaceMessages.__init__(self) - papyon.event.ConversationEventInterface.__init__(self, conn.msn_client) + papyon.event.ContactEventInterface.__init__(self, conn.msn_client) self._implement_property_get(CHANNEL_INTERFACE_MESSAGES, { 'SupportedContentTypes': lambda: ["text/plain"] , @@ -126,7 +126,7 @@ account, network_id) def _send_typing_notification(self): - # No need to emit ChatStateChanged in this method becuase it will not + # No need to emit ChatStateChanged in this method because it will not # have changed from composing otherwise this source will have been # removed. @@ -172,6 +172,7 @@ }, signature='sv') if sender_nick not in (None, ''): + sender_nick = unicode(sender_nick, "utf-8") headers[dbus.String('sender-nickname')] = dbus.String(sender_nick) body = dbus.Dictionary({dbus.String('content-type'): dbus.String('text/plain'), @@ -290,16 +291,6 @@ self.ChatStateChanged(handle, telepathy.CHANNEL_CHAT_STATE_COMPOSING) # papyon.event.ConversationEventInterface - def on_conversation_message_sent(self, message): - id = self._recv_id - timestamp = int(time.time()) - handle = ButterflyHandleFactory(self._conn_ref(), 'self') - type = telepathy.CHANNEL_TEXT_MESSAGE_TYPE_NORMAL - message = message.content - self._signal_text_received(id, timestamp, handle, type, 0, message) - self._recv_id += 1 - - # papyon.event.ConversationEventInterface def on_conversation_message_received(self, sender, message): id = self._recv_id timestamp = int(time.time()) @@ -319,6 +310,15 @@ handle = self._get_handle(sender.account, sender.network_id) logger.info("User %s sent a nudge" % unicode(handle)) + # papyon.event.ConversationEventInterface + def on_conversation_error(self, error_type, error): + logger.warning("Conversation error %s %s" % (str(error_type), + str(error))) + if error_type == papyon.event.ConversationErrorType.MESSAGE: + timestamp = int(time.time()) + self.SendError(telepathy.CHANNEL_TEXT_SEND_ERROR_UNKNOWN, timestamp, + telepathy.CHANNEL_TEXT_MESSAGE_TYPE_NORMAL, "") + @dbus.service.signal(telepathy.CHANNEL_INTERFACE_MESSAGES, signature='aa{sv}') def MessageReceived(self, message): id = message[0]['pending-message-id'] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/telepathy-butterfly-0.5.13/butterfly/media/session_handler.py new/telepathy-butterfly-0.5.14/butterfly/media/session_handler.py --- old/telepathy-butterfly-0.5.13/butterfly/media/session_handler.py 2010-06-09 20:29:18.000000000 +0200 +++ new/telepathy-butterfly-0.5.14/butterfly/media/session_handler.py 2010-08-26 16:57:50.000000000 +0200 @@ -107,6 +107,9 @@ return handler def NewStream(self, stream=None, handler=None): + if handler is None and stream is None: + logger.error("A stream or a handler must be given to NewStream") + return if handler is None: handler = self.FindStream(stream) if not self._ready: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/telepathy-butterfly-0.5.13/butterfly/media/stream_handler.py new/telepathy-butterfly-0.5.14/butterfly/media/stream_handler.py --- old/telepathy-butterfly-0.5.13/butterfly/media/stream_handler.py 2010-08-13 06:32:04.000000000 +0200 +++ new/telepathy-butterfly-0.5.14/butterfly/media/stream_handler.py 2010-09-11 00:17:44.000000000 +0200 @@ -142,8 +142,6 @@ is_webcam = (self._session.type is MediaSessionType.WEBCAM_SEND or self._session.type is MediaSessionType.WEBCAM_RECV) - if self._remote_candidates: - self.SetRemoteCandidateList(self._remote_candidates) if self._remote_codecs: self.SetRemoteCodecs(self._remote_codecs) @@ -155,6 +153,10 @@ if self.created_locally or is_webcam: self.SetLocalCodecs(codecs) + def send_candidates(self): + if self._remote_candidates and not self.created_locally: + self.SetRemoteCandidateList(self._remote_candidates) + def StreamState(self, state): logger.info("Stream %i state changed to %i" % (self._id, state)) self._state = state diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/telepathy-butterfly-0.5.13/configure new/telepathy-butterfly-0.5.14/configure --- old/telepathy-butterfly-0.5.13/configure 2010-08-13 07:23:52.000000000 +0200 +++ new/telepathy-butterfly-0.5.14/configure 2010-09-11 00:47:51.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.65 for telepathy-butterfly 0.5.13. +# Generated by GNU Autoconf 2.65 for telepathy-butterfly 0.5.14. # # Report bugs to <http://bugs.freedesktop.org/enter_bug.cgi?product=Telepathy&component=butte…>. # @@ -552,8 +552,8 @@ # Identity of this package. PACKAGE_NAME='telepathy-butterfly' PACKAGE_TARNAME='telepathy-butterfly' -PACKAGE_VERSION='0.5.13' -PACKAGE_STRING='telepathy-butterfly 0.5.13' +PACKAGE_VERSION='0.5.14' +PACKAGE_STRING='telepathy-butterfly 0.5.14' PACKAGE_BUGREPORT='http://bugs.freedesktop.org/enter_bug.cgi?product=Telepathy&component=butte…' PACKAGE_URL='' @@ -1180,7 +1180,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures telepathy-butterfly 0.5.13 to adapt to many kinds of systems. +\`configure' configures telepathy-butterfly 0.5.14 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1247,7 +1247,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of telepathy-butterfly 0.5.13:";; + short | recursive ) echo "Configuration of telepathy-butterfly 0.5.14:";; esac cat <<\_ACEOF @@ -1321,7 +1321,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -telepathy-butterfly configure 0.5.13 +telepathy-butterfly configure 0.5.14 generated by GNU Autoconf 2.65 Copyright (C) 2009 Free Software Foundation, Inc. @@ -1338,7 +1338,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by telepathy-butterfly $as_me 0.5.13, which was +It was created by telepathy-butterfly $as_me 0.5.14, which was generated by GNU Autoconf 2.65. Invocation command line was $ $0 $@ @@ -2146,7 +2146,7 @@ # Define the identity of the package. PACKAGE='telepathy-butterfly' - VERSION='0.5.13' + VERSION='0.5.14' cat >>confdefs.h <<_ACEOF @@ -2971,7 +2971,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by telepathy-butterfly $as_me 0.5.13, which was +This file was extended by telepathy-butterfly $as_me 0.5.14, which was generated by GNU Autoconf 2.65. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -3024,7 +3024,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -telepathy-butterfly config.status 0.5.13 +telepathy-butterfly config.status 0.5.14 configured by $0, generated by GNU Autoconf 2.65, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/telepathy-butterfly-0.5.13/configure.ac new/telepathy-butterfly-0.5.14/configure.ac --- old/telepathy-butterfly-0.5.13/configure.ac 2010-08-13 06:32:04.000000000 +0200 +++ new/telepathy-butterfly-0.5.14/configure.ac 2010-09-11 00:47:13.000000000 +0200 @@ -6,7 +6,7 @@ dnl The telepathy-python version number (must actually be numeric at the moment) m4_define(telepathy_butterfly_major_version, 0) m4_define(telepathy_butterfly_minor_version, 5) -m4_define(telepathy_butterfly_micro_version, 13) +m4_define(telepathy_butterfly_micro_version, 14) m4_define(telepathy_butterfly_maybe_datestamp, m4_esyscmd([if test x]telepathy_butterfly_released[ != x1; then date +.%Y%m%d | tr -d '\n\r'; fi])) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/telepathy-butterfly-0.5.13/telepathy-butterfly new/telepathy-butterfly-0.5.14/telepathy-butterfly --- old/telepathy-butterfly-0.5.13/telepathy-butterfly 2010-08-13 06:32:04.000000000 +0200 +++ new/telepathy-butterfly-0.5.14/telepathy-butterfly 2010-09-11 00:42:02.000000000 +0200 @@ -25,6 +25,8 @@ import sys import logging +version = (0, 5, 14) + if sys.version_info < (2, 5): print >> sys.stderr, 'Critical: python >= 2.5 required. Exiting.' sys.exit(1) @@ -104,6 +106,12 @@ logger.warning('Failed to acquire bus name, connection manager already running?') sys.exit(1) + def v2str(version): + return ".".join(map(lambda x: str(x), version)) + logger.info("Starting butterfly %s: telepathy-python %s, papyon %s" % + (v2str(version), v2str(telepathy.version), v2str(papyon.version))) + + mainloop = gobject.MainLoop(is_running=True) gobject.threads_init() ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit wine for openSUSE:Factory
by root＠hilbert.suse.de 23 Sep '10

23 Sep '10

Hello community, here is the log from the commit of package wine for openSUSE:Factory checked in at Fri Sep 24 00:57:51 CEST 2010. -------- --- wine/wine.changes 2010-07-16 21:37:30.000000000 +0200 +++ /mounts/work_src_done/STABLE/wine/wine.changes 2010-09-15 15:25:21.000000000 +0200 @@ -1,0 +2,5 @@ +Wed Sep 15 09:04:56 UTC 2010 - aj(a)suse.de + +- Change BuildRequires for sane-backends devel split. + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ wine.spec ++++++ --- /var/tmp/diff_new_pack.UCqGpA/_old 2010-09-24 00:57:24.000000000 +0200 +++ /var/tmp/diff_new_pack.UCqGpA/_new 2010-09-24 00:57:24.000000000 +0200 @@ -18,12 +18,17 @@ Name: wine -BuildRequires: alsa-devel bison capi4linux-devel cups-devel desktop-file-utils fdupes flex freeglut-devel freetype2-devel giflib-devel gnutls-devel hal-devel libgphoto2-devel libgsm-devel libjpeg-devel liblcms-devel libpng-devel libtiff-devel libv4l-devel libxslt-devel ncurses-devel openal-soft-devel openldap2-devel prelink sane-backends update-desktop-files +BuildRequires: alsa-devel bison capi4linux-devel cups-devel desktop-file-utils fdupes flex freeglut-devel freetype2-devel giflib-devel gnutls-devel hal-devel libgphoto2-devel libgsm-devel libjpeg-devel liblcms-devel libpng-devel libtiff-devel libv4l-devel libxslt-devel ncurses-devel openal-soft-devel openldap2-devel prelink update-desktop-files +%if 0%{?suse_version} > 1130 +BuildRequires: sane-backends-devel +%else +BuildRequires: sane-backends +%endif License: LGPLv2.1+ Group: System/Emulators/PC AutoReqProv: on Version: 1.2 -Release: 1 +Release: 2 Summary: An MS Windows Emulator Url: http://www.winehq.com Source0: wine-%version.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0