Re: [virt-tools-list] [PATCH virt-viewer v2 0/2] Changes to ovirt-foreign menu
On Thu, Jun 23, 2016 at 7:15 PM, Eduardo Lima (Etrunko) wrote: > In this version: > - Rebase to latest master > - Better commit messages > - Additional debug message if returning NULL in patch 2 > > Eduardo Lima (Etrunko) (2): > Get ovirt foreign menu item from UI file > Use more accurate debug messages for foreign menu > > src/ovirt-foreign-menu.c| 3 ++- > src/remote-viewer.c | 23 +++ > src/resources/ui/virt-viewer.ui | 8 > 3 files changed, 21 insertions(+), 13 deletions(-) > > -- > 2.5.5 > > ___ > virt-tools-list mailing list > virt-tools-list@redhat.com > https://www.redhat.com/mailman/listinfo/virt-tools-list Both patches look good. Acked-by: Fabiano Fidêncio Please, wait till Christophe's Ack before pushing, as he did the first round of review. Best Regards, -- Fabiano Fidêncio ___ virt-tools-list mailing list virt-tools-list@redhat.com https://www.redhat.com/mailman/listinfo/virt-tools-list
[virt-tools-list] [PATCH virt-viewer v2 1/2] Get ovirt foreign menu item from UI file
Currently the menu item is created manually, while this patch changes it to be
retrieved from the UI file, and decides if it needs to be shown or hidden if the
ISO list is received from ovirt.
This a preparation for a upcoming UI change that will present the ISO list in a
separate dialog, instead of a submenu.
Signed-off-by: Eduardo Lima (Etrunko)
---
src/remote-viewer.c | 23 +++
src/resources/ui/virt-viewer.ui | 8
2 files changed, 19 insertions(+), 12 deletions(-)
diff --git a/src/remote-viewer.c b/src/remote-viewer.c
index 71723cf..6d29bf2 100644
--- a/src/remote-viewer.c
+++ b/src/remote-viewer.c
@@ -738,29 +738,28 @@ ovirt_foreign_menu_update(GtkApplication *gtkapp,
GtkWindow *gtkwin, G_GNUC_UNUS
VirtViewerWindow *win = g_object_get_data(G_OBJECT(gtkwin),
"virt-viewer-window");
GtkWidget *menu = g_object_get_data(G_OBJECT(win), "foreign-menu");
GtkWidget *submenu;
-GtkMenuShell *shell =
GTK_MENU_SHELL(gtk_builder_get_object(virt_viewer_window_get_builder(win),
"top-menu"));
if (app->priv->ovirt_foreign_menu == NULL) {
/* nothing to do */
return;
}
-if (menu == NULL) {
-menu = gtk_menu_item_new_with_label(_("_Change CD"));
-gtk_menu_item_set_use_underline(GTK_MENU_ITEM(menu), TRUE);
-gtk_menu_shell_append(shell, menu);
-g_object_set_data_full(G_OBJECT(win), "foreign-menu",
- g_object_ref(menu),
- (GDestroyNotify)gtk_widget_destroy);
-}
submenu = ovirt_foreign_menu_get_gtk_menu(app->priv->ovirt_foreign_menu);
-if (submenu != NULL) {
-gtk_menu_item_set_submenu(GTK_MENU_ITEM(menu), submenu);
-} else {
+if (submenu == NULL) {
/* No items to show, no point in showing the menu */
+if (menu != NULL)
+ gtk_widget_set_visible(menu, FALSE);
g_object_set_data(G_OBJECT(win), "foreign-menu", NULL);
+return;
+}
+
+if (menu == NULL) {
+menu =
GTK_WIDGET(gtk_builder_get_object(virt_viewer_window_get_builder(win),
"menu-change-cd"));
+g_object_set_data(G_OBJECT(win), "foreign-menu", menu);
+gtk_widget_set_visible(menu, TRUE);
}
+gtk_menu_item_set_submenu(GTK_MENU_ITEM(menu), submenu);
gtk_widget_show_all(menu);
}
diff --git a/src/resources/ui/virt-viewer.ui b/src/resources/ui/virt-viewer.ui
index 5f767d1..6e3c5ad 100644
--- a/src/resources/ui/virt-viewer.ui
+++ b/src/resources/ui/virt-viewer.ui
@@ -247,6 +247,14 @@
+
+
+False
+False
+_Change
CD
+True
+
+
False
--
2.5.5
___
virt-tools-list mailing list
virt-tools-list@redhat.com
https://www.redhat.com/mailman/listinfo/virt-tools-list
[virt-tools-list] [PATCH virt-viewer v2 2/2] Use more accurate debug messages for foreign menu
Signed-off-by: Eduardo Lima (Etrunko)
---
src/ovirt-foreign-menu.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/ovirt-foreign-menu.c b/src/ovirt-foreign-menu.c
index 9b552eb..2d286fb 100644
--- a/src/ovirt-foreign-menu.c
+++ b/src/ovirt-foreign-menu.c
@@ -465,10 +465,11 @@ GtkWidget
*ovirt_foreign_menu_get_gtk_menu(OvirtForeignMenu *foreign_menu)
GList *it;
char *current_iso;
-g_debug("Creating GtkMenu for foreign menu");
if (foreign_menu->priv->iso_names == NULL) {
+g_debug("ISO list is empty, no menu to show");
return NULL;
}
+g_debug("Creating GtkMenu for foreign menu");
current_iso = ovirt_foreign_menu_get_current_iso_name(foreign_menu);
gtk_menu = gtk_menu_new();
for (it = foreign_menu->priv->iso_names; it != NULL; it = it->next) {
--
2.5.5
___
virt-tools-list mailing list
virt-tools-list@redhat.com
https://www.redhat.com/mailman/listinfo/virt-tools-list
[virt-tools-list] [PATCH virt-viewer v2 0/2] Changes to ovirt-foreign menu
In this version: - Rebase to latest master - Better commit messages - Additional debug message if returning NULL in patch 2 Eduardo Lima (Etrunko) (2): Get ovirt foreign menu item from UI file Use more accurate debug messages for foreign menu src/ovirt-foreign-menu.c| 3 ++- src/remote-viewer.c | 23 +++ src/resources/ui/virt-viewer.ui | 8 3 files changed, 21 insertions(+), 13 deletions(-) -- 2.5.5 ___ virt-tools-list mailing list virt-tools-list@redhat.com https://www.redhat.com/mailman/listinfo/virt-tools-list
Re: [virt-tools-list] [PATCH v2] Avoid creating ovirt foreign menu item manually
On 06/23/2016 01:35 PM, Christophe Fergeau wrote:
> This looks fine to me, however I'd rephrase the shortlog (or add to the
> long log) that we get the Change CD menu from the UI file rather than
> manually creating it. Before looking at the commit, I was not sure what
> this was about.
Okay fixed.
>
> Christophe
>
> On Thu, Jun 23, 2016 at 11:23:11AM -0300, Eduardo Lima (Etrunko) wrote:
>> This patch is a preparation for a upcoming UI change that will present
>> the ISO list in a separate dialog, instead of a submenu.
>>
>> Signed-off-by: Eduardo Lima (Etrunko)
>> ---
>> src/remote-viewer.c | 23 +++
>> src/resources/ui/virt-viewer.ui | 8
>> 2 files changed, 19 insertions(+), 12 deletions(-)
>>
>> diff --git a/src/remote-viewer.c b/src/remote-viewer.c
>> index 71723cf..6d29bf2 100644
>> --- a/src/remote-viewer.c
>> +++ b/src/remote-viewer.c
>> @@ -738,29 +738,28 @@ ovirt_foreign_menu_update(GtkApplication *gtkapp,
>> GtkWindow *gtkwin, G_GNUC_UNUS
>> VirtViewerWindow *win = g_object_get_data(G_OBJECT(gtkwin),
>> "virt-viewer-window");
>> GtkWidget *menu = g_object_get_data(G_OBJECT(win), "foreign-menu");
>> GtkWidget *submenu;
>> -GtkMenuShell *shell =
>> GTK_MENU_SHELL(gtk_builder_get_object(virt_viewer_window_get_builder(win),
>> "top-menu"));
>>
>> if (app->priv->ovirt_foreign_menu == NULL) {
>> /* nothing to do */
>> return;
>> }
>> -if (menu == NULL) {
>> -menu = gtk_menu_item_new_with_label(_("_Change CD"));
>> -gtk_menu_item_set_use_underline(GTK_MENU_ITEM(menu), TRUE);
>> -gtk_menu_shell_append(shell, menu);
>> -g_object_set_data_full(G_OBJECT(win), "foreign-menu",
>> - g_object_ref(menu),
>> - (GDestroyNotify)gtk_widget_destroy);
>> -}
>>
>> submenu =
>> ovirt_foreign_menu_get_gtk_menu(app->priv->ovirt_foreign_menu);
>> -if (submenu != NULL) {
>> -gtk_menu_item_set_submenu(GTK_MENU_ITEM(menu), submenu);
>> -} else {
>> +if (submenu == NULL) {
>> /* No items to show, no point in showing the menu */
>> +if (menu != NULL)
>> + gtk_widget_set_visible(menu, FALSE);
>> g_object_set_data(G_OBJECT(win), "foreign-menu", NULL);
>> +return;
>> +}
>> +
>> +if (menu == NULL) {
>> +menu =
>> GTK_WIDGET(gtk_builder_get_object(virt_viewer_window_get_builder(win),
>> "menu-change-cd"));
>> +g_object_set_data(G_OBJECT(win), "foreign-menu", menu);
>> +gtk_widget_set_visible(menu, TRUE);
>> }
>>
>> +gtk_menu_item_set_submenu(GTK_MENU_ITEM(menu), submenu);
>> gtk_widget_show_all(menu);
>> }
>>
>> diff --git a/src/resources/ui/virt-viewer.ui
>> b/src/resources/ui/virt-viewer.ui
>> index 830a451..219e0af 100644
>> --- a/src/resources/ui/virt-viewer.ui
>> +++ b/src/resources/ui/virt-viewer.ui
>> @@ -243,6 +243,14 @@
>>
>>
>>
>> +
>> +
>> +False
>> +False
>> +_Change
>> CD
>> +True
>> +
>> +
>>
>>
>> False
>> --
>> 2.5.5
>>
>> ___
>> virt-tools-list mailing list
>> virt-tools-list@redhat.com
>> https://www.redhat.com/mailman/listinfo/virt-tools-list
--
Eduardo de Barros Lima (Etrunko)
Software Engineer - RedHat
etru...@redhat.com
___
virt-tools-list mailing list
virt-tools-list@redhat.com
https://www.redhat.com/mailman/listinfo/virt-tools-list
Re: [virt-tools-list] [PATCH 2/2] Avoid unecessary debug message if returning NULL
On 06/23/2016 01:36 PM, Christophe Fergeau wrote:
> On Thu, Jun 23, 2016 at 10:13:25AM -0300, Eduardo Lima (Etrunko) wrote:
>> Signed-off-by: Eduardo Lima (Etrunko)
>> ---
>> src/ovirt-foreign-menu.c | 2 +-
>> 1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/src/ovirt-foreign-menu.c b/src/ovirt-foreign-menu.c
>> index 9b552eb..959804d 100644
>> --- a/src/ovirt-foreign-menu.c
>> +++ b/src/ovirt-foreign-menu.c
>> @@ -465,10 +465,10 @@ GtkWidget
>> *ovirt_foreign_menu_get_gtk_menu(OvirtForeignMenu *foreign_menu)
>> GList *it;
>> char *current_iso;
>>
>> -g_debug("Creating GtkMenu for foreign menu");
>> if (foreign_menu->priv->iso_names == NULL) {
>> return NULL;
>> }
>> +g_debug("Creating GtkMenu for foreign menu");
>> current_iso = ovirt_foreign_menu_get_current_iso_name(foreign_menu);
>> gtk_menu = gtk_menu_new();
>> for (it = foreign_menu->priv->iso_names; it != NULL; it = it->next) {
>
> Fine with me. Actually it might be more useful to have a log when the
> Change CD menu does not show up because the iso name list is empty
> rather than having a log when something is going to be shown. So maybe
> add an additional g_debug() when NULL is returned?
Sure, does not hurt.
--
Eduardo de Barros Lima (Etrunko)
Software Engineer - RedHat
etru...@redhat.com
___
virt-tools-list mailing list
virt-tools-list@redhat.com
https://www.redhat.com/mailman/listinfo/virt-tools-list
Re: [virt-tools-list] [PATCH 2/2] package: Add appdata metadata for Gnome Software
On Thu, Jun 23, 2016 at 4:53 PM, Lukáš Venhoda wrote:
> Adds metadata to be used with Gnome Software.
> Includes name, summary, description and three screenshots of remote-viewer.
> Adds the new file to PO files, and adds instalation of appdata file.
I'd remove this last line from the commit message.
> ---
> data/Makefile.am | 9 +++--
> data/remote-viewer.appdata.xml.in | 28
> po/POTFILES.in| 1 +
> virt-viewer.spec.in | 1 +
> 4 files changed, 37 insertions(+), 2 deletions(-)
> create mode 100644 data/remote-viewer.appdata.xml.in
>
> diff --git a/data/Makefile.am b/data/Makefile.am
> index 821c171..55718d9 100644
> --- a/data/Makefile.am
> +++ b/data/Makefile.am
> @@ -76,6 +76,11 @@ mimedir = $(datadir)/mime/packages
> mime_DATA = virt-viewer-mime.xml
> @INTLTOOL_XML_RULE@
>
> +appdatadir = $(datadir)/appdata
> +APPDATAFILES = remote-viewer.appdata.xml.in
I'm thinking whether we should provide a virt-viewer.appdata.xml.in as well.
What do you think, Lukaš?
> +appdata_DATA = $(APPDATAFILES:.xml.in=.xml)
> +@INTLTOOL_XML_RULE@
> +
> install-data-hook:
> if ENABLE_UPDATE_MIMEDB
> @if $(AM_V_P); then set -x; else echo " INSTALL
> update-mime-database"; fi; \
> @@ -88,8 +93,8 @@ if ENABLE_UPDATE_MIMEDB
> $(UPDATE_MIME_DATABASE) "$(DESTDIR)$(datadir)/mime";
> endif
>
> -CLEANFILES += $(mime_DATA) $(desktop_DATA)
> -EXTRA_DIST += $(MIMEFILES) $(DESKTOPFILES)
> +CLEANFILES += $(mime_DATA) $(desktop_DATA) $(appdata_DATA)
> +EXTRA_DIST += $(MIMEFILES) $(DESKTOPFILES) $(APPDATAFILES)
>
> endif
>
> diff --git a/data/remote-viewer.appdata.xml.in
> b/data/remote-viewer.appdata.xml.in
> new file mode 100644
> index 000..5aa2ff3
> --- /dev/null
> +++ b/data/remote-viewer.appdata.xml.in
> @@ -0,0 +1,28 @@
> +
> +
> + remote-viewer.desktop
> + CC0-1.0
> + GPL-2.0+
> + <_name>Remote Viewer
> + <_summary>Remotely access virtual machines
> +
> + <_p>
> +Remote Viewer provides a graphical viewer for the guest OS
> +display. At this time is supports guest OS using the VNC
"(...) At this time it supports (...)" (replace is -> it).
> +or SPICE protocols. Further protocols may be supported in
> +the future as user demand dictates. The viewer can connect
> +directly to both local and remotely hosted guest OS, optionally
> +using SSL/TLS encryption.
Out of curiosity, where this description comes from?
> +
> +
> +
> + type="default">http://www.spice-space.org/static/images/remote_viewer_youtube.png
> +
> http://www.spice-space.org/static/images/remote_viewer_usbredir.png
> +
> http://www.spice-space.org/static/images/remote_viewer_shared_folder.png
> +
> +
> + virt-viewer
> +
> + http://www.spice-space.org/
The homepage for virt-viewer is: https://virt-manager.org/ and not
http://www.spice-space.org
> + virt-tools-list_at_redhat.com
> +
> diff --git a/po/POTFILES.in b/po/POTFILES.in
> index b25306d..6775f53 100644
> --- a/po/POTFILES.in
> +++ b/po/POTFILES.in
> @@ -1,3 +1,4 @@
> +data/remote-viewer.appdata.xml.in
> data/remote-viewer.desktop.in
> data/virt-viewer-mime.xml.in
> src/remote-viewer-main.c
> diff --git a/virt-viewer.spec.in b/virt-viewer.spec.in
> index ed0b14d..4fb649c 100644
> --- a/virt-viewer.spec.in
> +++ b/virt-viewer.spec.in
> @@ -127,6 +127,7 @@ fi
> %{_datadir}/icons/hicolor/*/apps/*
> %{_datadir}/icons/hicolor/*/devices/*
> %{_datadir}/applications/remote-viewer.desktop
> +%{_datadir}/appdata/remote-viewer.appdata.xml
> %{_datadir}/mime/packages/virt-viewer-mime.xml
> %ghost %{_libexecdir}/spice-xpi-client
> %{_libexecdir}/spice-xpi-client-remote-viewer
> --
> 2.5.5
>
> ___
> virt-tools-list mailing list
> virt-tools-list@redhat.com
> https://www.redhat.com/mailman/listinfo/virt-tools-list
Reviewed-by: Fabiano Fidêncio
--
Fabiano Fidêncio
___
virt-tools-list mailing list
virt-tools-list@redhat.com
https://www.redhat.com/mailman/listinfo/virt-tools-list
Re: [virt-tools-list] [PATCH 2/2] Avoid unecessary debug message if returning NULL
On Thu, Jun 23, 2016 at 10:13:25AM -0300, Eduardo Lima (Etrunko) wrote:
> Signed-off-by: Eduardo Lima (Etrunko)
> ---
> src/ovirt-foreign-menu.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/src/ovirt-foreign-menu.c b/src/ovirt-foreign-menu.c
> index 9b552eb..959804d 100644
> --- a/src/ovirt-foreign-menu.c
> +++ b/src/ovirt-foreign-menu.c
> @@ -465,10 +465,10 @@ GtkWidget
> *ovirt_foreign_menu_get_gtk_menu(OvirtForeignMenu *foreign_menu)
> GList *it;
> char *current_iso;
>
> -g_debug("Creating GtkMenu for foreign menu");
> if (foreign_menu->priv->iso_names == NULL) {
> return NULL;
> }
> +g_debug("Creating GtkMenu for foreign menu");
> current_iso = ovirt_foreign_menu_get_current_iso_name(foreign_menu);
> gtk_menu = gtk_menu_new();
> for (it = foreign_menu->priv->iso_names; it != NULL; it = it->next) {
Fine with me. Actually it might be more useful to have a log when the
Change CD menu does not show up because the iso name list is empty
rather than having a log when something is going to be shown. So maybe
add an additional g_debug() when NULL is returned?
Christophe
> --
> 2.5.5
>
> ___
> virt-tools-list mailing list
> virt-tools-list@redhat.com
> https://www.redhat.com/mailman/listinfo/virt-tools-list
signature.asc
Description: PGP signature
___
virt-tools-list mailing list
virt-tools-list@redhat.com
https://www.redhat.com/mailman/listinfo/virt-tools-list
Re: [virt-tools-list] [PATCH v2] Avoid creating ovirt foreign menu item manually
This looks fine to me, however I'd rephrase the shortlog (or add to the
long log) that we get the Change CD menu from the UI file rather than
manually creating it. Before looking at the commit, I was not sure what
this was about.
Christophe
On Thu, Jun 23, 2016 at 11:23:11AM -0300, Eduardo Lima (Etrunko) wrote:
> This patch is a preparation for a upcoming UI change that will present
> the ISO list in a separate dialog, instead of a submenu.
>
> Signed-off-by: Eduardo Lima (Etrunko)
> ---
> src/remote-viewer.c | 23 +++
> src/resources/ui/virt-viewer.ui | 8
> 2 files changed, 19 insertions(+), 12 deletions(-)
>
> diff --git a/src/remote-viewer.c b/src/remote-viewer.c
> index 71723cf..6d29bf2 100644
> --- a/src/remote-viewer.c
> +++ b/src/remote-viewer.c
> @@ -738,29 +738,28 @@ ovirt_foreign_menu_update(GtkApplication *gtkapp,
> GtkWindow *gtkwin, G_GNUC_UNUS
> VirtViewerWindow *win = g_object_get_data(G_OBJECT(gtkwin),
> "virt-viewer-window");
> GtkWidget *menu = g_object_get_data(G_OBJECT(win), "foreign-menu");
> GtkWidget *submenu;
> -GtkMenuShell *shell =
> GTK_MENU_SHELL(gtk_builder_get_object(virt_viewer_window_get_builder(win),
> "top-menu"));
>
> if (app->priv->ovirt_foreign_menu == NULL) {
> /* nothing to do */
> return;
> }
> -if (menu == NULL) {
> -menu = gtk_menu_item_new_with_label(_("_Change CD"));
> -gtk_menu_item_set_use_underline(GTK_MENU_ITEM(menu), TRUE);
> -gtk_menu_shell_append(shell, menu);
> -g_object_set_data_full(G_OBJECT(win), "foreign-menu",
> - g_object_ref(menu),
> - (GDestroyNotify)gtk_widget_destroy);
> -}
>
> submenu = ovirt_foreign_menu_get_gtk_menu(app->priv->ovirt_foreign_menu);
> -if (submenu != NULL) {
> -gtk_menu_item_set_submenu(GTK_MENU_ITEM(menu), submenu);
> -} else {
> +if (submenu == NULL) {
> /* No items to show, no point in showing the menu */
> +if (menu != NULL)
> + gtk_widget_set_visible(menu, FALSE);
> g_object_set_data(G_OBJECT(win), "foreign-menu", NULL);
> +return;
> +}
> +
> +if (menu == NULL) {
> +menu =
> GTK_WIDGET(gtk_builder_get_object(virt_viewer_window_get_builder(win),
> "menu-change-cd"));
> +g_object_set_data(G_OBJECT(win), "foreign-menu", menu);
> +gtk_widget_set_visible(menu, TRUE);
> }
>
> +gtk_menu_item_set_submenu(GTK_MENU_ITEM(menu), submenu);
> gtk_widget_show_all(menu);
> }
>
> diff --git a/src/resources/ui/virt-viewer.ui b/src/resources/ui/virt-viewer.ui
> index 830a451..219e0af 100644
> --- a/src/resources/ui/virt-viewer.ui
> +++ b/src/resources/ui/virt-viewer.ui
> @@ -243,6 +243,14 @@
>
>
>
> +
> +
> +False
> +False
> +_Change
> CD
> +True
> +
> +
>
>
> False
> --
> 2.5.5
>
> ___
> virt-tools-list mailing list
> virt-tools-list@redhat.com
> https://www.redhat.com/mailman/listinfo/virt-tools-list
signature.asc
Description: PGP signature
___
virt-tools-list mailing list
virt-tools-list@redhat.com
https://www.redhat.com/mailman/listinfo/virt-tools-list
Re: [virt-tools-list] [PATCH 1/2] package: Add Provides remote-viewer
Hey!
On Thu, Jun 23, 2016 at 4:53 PM, Lukáš Venhoda wrote:
> Enables usage of dnf install remote-viewer and dnf remove remote-viewer
> for the virt-viewer package
> ---
> virt-viewer.spec.in | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/virt-viewer.spec.in b/virt-viewer.spec.in
> index f3661d2..ed0b14d 100644
> --- a/virt-viewer.spec.in
> +++ b/virt-viewer.spec.in
> @@ -53,6 +53,8 @@ BuildRequires: intltool
> BuildRequires: pkgconfig(govirt-1.0) >= @GOVIRT_REQUIRED@
> %endif
>
> +Provides: remote-viewer
> +
> %if 0%{?fedora} >= 20
> Obsoletes: spice-client < 0.12.3-2
> %endif
> --
> 2.5.5
>
> ___
> virt-tools-list mailing list
> virt-tools-list@redhat.com
> https://www.redhat.com/mailman/listinfo/virt-tools-list
Patch seems fine and the idea is okay, but I really would like to hear
from Daniel here as he has been maintaining virt-viewer since the
beginning and may have some reason for not doing this change before.
Also, considering we will get it in, it _must_ be applied to the
fedora package's spec file as well.
Best Regards,
--
Fabiano Fidêncio
___
virt-tools-list mailing list
virt-tools-list@redhat.com
https://www.redhat.com/mailman/listinfo/virt-tools-list
Re: [virt-tools-list] [PATCH 1/2] package: Add Provides remote-viewer
Hi Lukas,
I tested it and it works nicely,
On Thu, 2016-06-23 at 16:53 +0200, Lukáš Venhoda wrote:
> Enables usage of dnf install remote-viewer and dnf remove remote-viewer
> for the virt-viewer package
Acked-by: Pavel Grunt
Thanks,
Pavel
> ---
> virt-viewer.spec.in | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/virt-viewer.spec.in b/virt-viewer.spec.in
> index f3661d2..ed0b14d 100644
> --- a/virt-viewer.spec.in
> +++ b/virt-viewer.spec.in
> @@ -53,6 +53,8 @@ BuildRequires: intltool
> BuildRequires: pkgconfig(govirt-1.0) >= @GOVIRT_REQUIRED@
> %endif
>
> +Provides: remote-viewer
> +
> %if 0%{?fedora} >= 20
> Obsoletes: spice-client < 0.12.3-2
> %endif
___
virt-tools-list mailing list
virt-tools-list@redhat.com
https://www.redhat.com/mailman/listinfo/virt-tools-list
Re: [virt-tools-list] [virt-viewer] mingw, spec: Bump msitools version
On 06/22/2016 07:59 AM, Fabiano Fidêncio wrote: > Fedora 24 has GLib 2.48.0, which brings a new dependency: PCRE. > The new dependency is already added to the wxi file (in msitools) and a > new msitools build including the fix is already done [0]. > > Let's just bump the version in our spec file and make sure we will be > using the msitools which includes the fix. > > [0]: https://bodhi.fedoraproject.org/updates/FEDORA-2016-a7a2db6109 > --- > mingw-virt-viewer.spec.in | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/mingw-virt-viewer.spec.in b/mingw-virt-viewer.spec.in > index 3109f5f..06f1992 100644 > --- a/mingw-virt-viewer.spec.in > +++ b/mingw-virt-viewer.spec.in > @@ -65,7 +65,7 @@ BuildRequires: icoutils > BuildRequires: dos2unix > BuildRequires: hicolor-icon-theme > BuildRequires: hwdata > -BuildRequires: msitools >= 0.95-4 > +BuildRequires: msitools >= 0.95-5 > > BuildArch: noarch > > Acked-by: Eduardo Lima (Etrunko) -- Eduardo de Barros Lima (Etrunko) Software Engineer - RedHat etru...@redhat.com ___ virt-tools-list mailing list virt-tools-list@redhat.com https://www.redhat.com/mailman/listinfo/virt-tools-list
[virt-tools-list] [PATCH 1/2] package: Add Provides remote-viewer
Enables usage of dnf install remote-viewer and dnf remove remote-viewer
for the virt-viewer package
---
virt-viewer.spec.in | 2 ++
1 file changed, 2 insertions(+)
diff --git a/virt-viewer.spec.in b/virt-viewer.spec.in
index f3661d2..ed0b14d 100644
--- a/virt-viewer.spec.in
+++ b/virt-viewer.spec.in
@@ -53,6 +53,8 @@ BuildRequires: intltool
BuildRequires: pkgconfig(govirt-1.0) >= @GOVIRT_REQUIRED@
%endif
+Provides: remote-viewer
+
%if 0%{?fedora} >= 20
Obsoletes: spice-client < 0.12.3-2
%endif
--
2.5.5
___
virt-tools-list mailing list
virt-tools-list@redhat.com
https://www.redhat.com/mailman/listinfo/virt-tools-list
[virt-tools-list] [PATCH 2/2] package: Add appdata metadata for Gnome Software
Adds metadata to be used with Gnome Software.
Includes name, summary, description and three screenshots of remote-viewer.
Adds the new file to PO files, and adds instalation of appdata file.
---
data/Makefile.am | 9 +++--
data/remote-viewer.appdata.xml.in | 28
po/POTFILES.in| 1 +
virt-viewer.spec.in | 1 +
4 files changed, 37 insertions(+), 2 deletions(-)
create mode 100644 data/remote-viewer.appdata.xml.in
diff --git a/data/Makefile.am b/data/Makefile.am
index 821c171..55718d9 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -76,6 +76,11 @@ mimedir = $(datadir)/mime/packages
mime_DATA = virt-viewer-mime.xml
@INTLTOOL_XML_RULE@
+appdatadir = $(datadir)/appdata
+APPDATAFILES = remote-viewer.appdata.xml.in
+appdata_DATA = $(APPDATAFILES:.xml.in=.xml)
+@INTLTOOL_XML_RULE@
+
install-data-hook:
if ENABLE_UPDATE_MIMEDB
@if $(AM_V_P); then set -x; else echo " INSTALL
update-mime-database"; fi; \
@@ -88,8 +93,8 @@ if ENABLE_UPDATE_MIMEDB
$(UPDATE_MIME_DATABASE) "$(DESTDIR)$(datadir)/mime";
endif
-CLEANFILES += $(mime_DATA) $(desktop_DATA)
-EXTRA_DIST += $(MIMEFILES) $(DESKTOPFILES)
+CLEANFILES += $(mime_DATA) $(desktop_DATA) $(appdata_DATA)
+EXTRA_DIST += $(MIMEFILES) $(DESKTOPFILES) $(APPDATAFILES)
endif
diff --git a/data/remote-viewer.appdata.xml.in
b/data/remote-viewer.appdata.xml.in
new file mode 100644
index 000..5aa2ff3
--- /dev/null
+++ b/data/remote-viewer.appdata.xml.in
@@ -0,0 +1,28 @@
+
+
+ remote-viewer.desktop
+ CC0-1.0
+ GPL-2.0+
+ <_name>Remote Viewer
+ <_summary>Remotely access virtual machines
+
+ <_p>
+Remote Viewer provides a graphical viewer for the guest OS
+display. At this time is supports guest OS using the VNC
+or SPICE protocols. Further protocols may be supported in
+the future as user demand dictates. The viewer can connect
+directly to both local and remotely hosted guest OS, optionally
+using SSL/TLS encryption.
+
+
+
+ http://www.spice-space.org/static/images/remote_viewer_youtube.png
+
http://www.spice-space.org/static/images/remote_viewer_usbredir.png
+
http://www.spice-space.org/static/images/remote_viewer_shared_folder.png
+
+
+ virt-viewer
+
+ http://www.spice-space.org/
+ virt-tools-list_at_redhat.com
+
diff --git a/po/POTFILES.in b/po/POTFILES.in
index b25306d..6775f53 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,3 +1,4 @@
+data/remote-viewer.appdata.xml.in
data/remote-viewer.desktop.in
data/virt-viewer-mime.xml.in
src/remote-viewer-main.c
diff --git a/virt-viewer.spec.in b/virt-viewer.spec.in
index ed0b14d..4fb649c 100644
--- a/virt-viewer.spec.in
+++ b/virt-viewer.spec.in
@@ -127,6 +127,7 @@ fi
%{_datadir}/icons/hicolor/*/apps/*
%{_datadir}/icons/hicolor/*/devices/*
%{_datadir}/applications/remote-viewer.desktop
+%{_datadir}/appdata/remote-viewer.appdata.xml
%{_datadir}/mime/packages/virt-viewer-mime.xml
%ghost %{_libexecdir}/spice-xpi-client
%{_libexecdir}/spice-xpi-client-remote-viewer
--
2.5.5
___
virt-tools-list mailing list
virt-tools-list@redhat.com
https://www.redhat.com/mailman/listinfo/virt-tools-list
[virt-tools-list] [PATCH v2] Avoid creating ovirt foreign menu item manually
This patch is a preparation for a upcoming UI change that will present
the ISO list in a separate dialog, instead of a submenu.
Signed-off-by: Eduardo Lima (Etrunko)
---
src/remote-viewer.c | 23 +++
src/resources/ui/virt-viewer.ui | 8
2 files changed, 19 insertions(+), 12 deletions(-)
diff --git a/src/remote-viewer.c b/src/remote-viewer.c
index 71723cf..6d29bf2 100644
--- a/src/remote-viewer.c
+++ b/src/remote-viewer.c
@@ -738,29 +738,28 @@ ovirt_foreign_menu_update(GtkApplication *gtkapp,
GtkWindow *gtkwin, G_GNUC_UNUS
VirtViewerWindow *win = g_object_get_data(G_OBJECT(gtkwin),
"virt-viewer-window");
GtkWidget *menu = g_object_get_data(G_OBJECT(win), "foreign-menu");
GtkWidget *submenu;
-GtkMenuShell *shell =
GTK_MENU_SHELL(gtk_builder_get_object(virt_viewer_window_get_builder(win),
"top-menu"));
if (app->priv->ovirt_foreign_menu == NULL) {
/* nothing to do */
return;
}
-if (menu == NULL) {
-menu = gtk_menu_item_new_with_label(_("_Change CD"));
-gtk_menu_item_set_use_underline(GTK_MENU_ITEM(menu), TRUE);
-gtk_menu_shell_append(shell, menu);
-g_object_set_data_full(G_OBJECT(win), "foreign-menu",
- g_object_ref(menu),
- (GDestroyNotify)gtk_widget_destroy);
-}
submenu = ovirt_foreign_menu_get_gtk_menu(app->priv->ovirt_foreign_menu);
-if (submenu != NULL) {
-gtk_menu_item_set_submenu(GTK_MENU_ITEM(menu), submenu);
-} else {
+if (submenu == NULL) {
/* No items to show, no point in showing the menu */
+if (menu != NULL)
+ gtk_widget_set_visible(menu, FALSE);
g_object_set_data(G_OBJECT(win), "foreign-menu", NULL);
+return;
+}
+
+if (menu == NULL) {
+menu =
GTK_WIDGET(gtk_builder_get_object(virt_viewer_window_get_builder(win),
"menu-change-cd"));
+g_object_set_data(G_OBJECT(win), "foreign-menu", menu);
+gtk_widget_set_visible(menu, TRUE);
}
+gtk_menu_item_set_submenu(GTK_MENU_ITEM(menu), submenu);
gtk_widget_show_all(menu);
}
diff --git a/src/resources/ui/virt-viewer.ui b/src/resources/ui/virt-viewer.ui
index 830a451..219e0af 100644
--- a/src/resources/ui/virt-viewer.ui
+++ b/src/resources/ui/virt-viewer.ui
@@ -243,6 +243,14 @@
+
+
+False
+False
+_Change CD
+True
+
+
False
--
2.5.5
___
virt-tools-list mailing list
virt-tools-list@redhat.com
https://www.redhat.com/mailman/listinfo/virt-tools-list
Re: [virt-tools-list] [PATCH virt-viewer 4/4] Fix missing field initializers
On 06/23/2016 10:26 AM, Pavel Grunt wrote:
> On Thu, 2016-06-23 at 10:15 -0300, Eduardo Lima (Etrunko) wrote:
>> On 06/22/2016 05:16 PM, Pavel Grunt wrote:
>>> On Wed, 2016-06-22 at 14:59 -0300, Eduardo Lima (Etrunko) wrote:
This is not actually necessary as of C99. You only need to initialize
any field of a structure to get all other fields initialized too.
>>>
>>> yes, I was just annoyed by the warning..
>>
>>
>> Interesting, can you share what was exactly the warning message? Clang
>> as a modern compiler should be able to handle this case.
>>
>
> virt-viewer-window.c:1164:31: warning: missing field 'accel_mods' initializer
> [-Wmissing-field-initializers]
> GtkAccelKey key = { 0 };
>
> maybe it is needed to pass something like "--std=c99" to the compiler
>
I suspect it is because accel_mods is a enum (GdkModifierType) and the
compiler would not know a default value for that one.
--
Eduardo de Barros Lima (Etrunko)
Software Engineer - RedHat
etru...@redhat.com
___
virt-tools-list mailing list
virt-tools-list@redhat.com
https://www.redhat.com/mailman/listinfo/virt-tools-list
Re: [virt-tools-list] [PATCH virt-viewer 4/4] Fix missing field initializers
On Thu, 2016-06-23 at 10:15 -0300, Eduardo Lima (Etrunko) wrote:
> On 06/22/2016 05:16 PM, Pavel Grunt wrote:
> > On Wed, 2016-06-22 at 14:59 -0300, Eduardo Lima (Etrunko) wrote:
> > > This is not actually necessary as of C99. You only need to initialize
> > > any field of a structure to get all other fields initialized too.
> >
> > yes, I was just annoyed by the warning..
>
>
> Interesting, can you share what was exactly the warning message? Clang
> as a modern compiler should be able to handle this case.
>
virt-viewer-window.c:1164:31: warning: missing field 'accel_mods' initializer
[-Wmissing-field-initializers]
GtkAccelKey key = { 0 };
maybe it is needed to pass something like "--std=c99" to the compiler
Pavel
___
virt-tools-list mailing list
virt-tools-list@redhat.com
https://www.redhat.com/mailman/listinfo/virt-tools-list
Re: [virt-tools-list] [PATCH virt-viewer 4/4] Fix missing field initializers
On 06/22/2016 05:16 PM, Pavel Grunt wrote: > On Wed, 2016-06-22 at 14:59 -0300, Eduardo Lima (Etrunko) wrote: >> This is not actually necessary as of C99. You only need to initialize >> any field of a structure to get all other fields initialized too. > > yes, I was just annoyed by the warning.. Interesting, can you share what was exactly the warning message? Clang as a modern compiler should be able to handle this case. -- Eduardo de Barros Lima (Etrunko) Software Engineer - RedHat etru...@redhat.com ___ virt-tools-list mailing list virt-tools-list@redhat.com https://www.redhat.com/mailman/listinfo/virt-tools-list
[virt-tools-list] [PATCH 2/2] Avoid unecessary debug message if returning NULL
Signed-off-by: Eduardo Lima (Etrunko)
---
src/ovirt-foreign-menu.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/ovirt-foreign-menu.c b/src/ovirt-foreign-menu.c
index 9b552eb..959804d 100644
--- a/src/ovirt-foreign-menu.c
+++ b/src/ovirt-foreign-menu.c
@@ -465,10 +465,10 @@ GtkWidget
*ovirt_foreign_menu_get_gtk_menu(OvirtForeignMenu *foreign_menu)
GList *it;
char *current_iso;
-g_debug("Creating GtkMenu for foreign menu");
if (foreign_menu->priv->iso_names == NULL) {
return NULL;
}
+g_debug("Creating GtkMenu for foreign menu");
current_iso = ovirt_foreign_menu_get_current_iso_name(foreign_menu);
gtk_menu = gtk_menu_new();
for (it = foreign_menu->priv->iso_names; it != NULL; it = it->next) {
--
2.5.5
___
virt-tools-list mailing list
virt-tools-list@redhat.com
https://www.redhat.com/mailman/listinfo/virt-tools-list
[virt-tools-list] [PATCH 1/2] Avoid creating ovirt foreign menu item manually
This patch is a preparation for a upcoming UI change that will present
the ISO list in a separate dialog, instead of a submenu.
Signed-off-by: Eduardo Lima (Etrunko)
---
src/remote-viewer.c | 26 --
src/resources/ui/virt-viewer.ui | 8
2 files changed, 20 insertions(+), 14 deletions(-)
diff --git a/src/remote-viewer.c b/src/remote-viewer.c
index 71723cf..16c9d22 100644
--- a/src/remote-viewer.c
+++ b/src/remote-viewer.c
@@ -737,30 +737,28 @@ ovirt_foreign_menu_update(GtkApplication *gtkapp,
GtkWindow *gtkwin, G_GNUC_UNUS
RemoteViewer *app = REMOTE_VIEWER(gtkapp);
VirtViewerWindow *win = g_object_get_data(G_OBJECT(gtkwin),
"virt-viewer-window");
GtkWidget *menu = g_object_get_data(G_OBJECT(win), "foreign-menu");
-GtkWidget *submenu;
-GtkMenuShell *shell =
GTK_MENU_SHELL(gtk_builder_get_object(virt_viewer_window_get_builder(win),
"top-menu"));
+GtkWidget *submenu =
ovirt_foreign_menu_get_gtk_menu(app->priv->ovirt_foreign_menu);
if (app->priv->ovirt_foreign_menu == NULL) {
/* nothing to do */
return;
}
-if (menu == NULL) {
-menu = gtk_menu_item_new_with_label(_("_Change CD"));
-gtk_menu_item_set_use_underline(GTK_MENU_ITEM(menu), TRUE);
-gtk_menu_shell_append(shell, menu);
-g_object_set_data_full(G_OBJECT(win), "foreign-menu",
- g_object_ref(menu),
- (GDestroyNotify)gtk_widget_destroy);
-}
-submenu = ovirt_foreign_menu_get_gtk_menu(app->priv->ovirt_foreign_menu);
-if (submenu != NULL) {
-gtk_menu_item_set_submenu(GTK_MENU_ITEM(menu), submenu);
-} else {
+if (submenu == NULL) {
/* No items to show, no point in showing the menu */
+if (menu != NULL)
+ gtk_widget_set_visible(menu, FALSE);
g_object_set_data(G_OBJECT(win), "foreign-menu", NULL);
+return;
+}
+
+if (menu == NULL) {
+menu =
GTK_WIDGET(gtk_builder_get_object(virt_viewer_window_get_builder(win),
"menu-change-cd"));
+g_object_set_data(G_OBJECT(win), "foreign-menu", menu);
+gtk_widget_set_visible(menu, TRUE);
}
+gtk_menu_item_set_submenu(GTK_MENU_ITEM(menu), submenu);
gtk_widget_show_all(menu);
}
diff --git a/src/resources/ui/virt-viewer.ui b/src/resources/ui/virt-viewer.ui
index 830a451..219e0af 100644
--- a/src/resources/ui/virt-viewer.ui
+++ b/src/resources/ui/virt-viewer.ui
@@ -243,6 +243,14 @@
+
+
+False
+False
+_Change CD
+True
+
+
False
--
2.5.5
___
virt-tools-list mailing list
virt-tools-list@redhat.com
https://www.redhat.com/mailman/listinfo/virt-tools-list
