Skip to contentSkip to conversation

Upgrade to Gtk+3

PATCH Superseded Jussi Kukkonen 2 participants 4 messages Apr 29, 2016 – May 2, 2016

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

cover Upgrade to Gtk+3

This one is a trivial port.

This patchset is part of the quest to make Sato compatible with GTK+3. Complete WIP collection of patches can be found in jku/matchbox-wip branch at git://git.yoctoproject.org/poky-contrib

The following changes since commit 3ed74dfb7c57be088a5ab36e446c0ccde9fa1028:

2008-09-25 Ross Burton <[email protected]> (2008-09-25 15:52:01 +0000)

are available in the git repository at:

git://github.com/jku/matchbox-config-gtk gtk3
https://github.com/jku/matchbox-config-gtk/tree/gtk3

Jussi Kukkonen (1):
Port to Gtk+3

 appearance/mb-appearance.c | 4 ++--
 configure.ac               | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)
Signature · 1 line
2.8.1
#1 lore raw

PATCH 1/1 Port to Gtk+3

---
 appearance/mb-appearance.c | 4 ++--
 configure.ac               | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)
appearance/mb-appearance.c +2 -2
index 34640b4..6dfe98e 100644
@@ -381,14 +381,14 @@ main (int argc, char **argv) {
   gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (theme_store), COL_NAME, GTK_SORT_ASCENDING);
 
   dialog = gtk_dialog_new_with_buttons (_("Appearance"), NULL, 
-                                        GTK_DIALOG_NO_SEPARATOR,
+                                        0,
                                         GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE,
                                         NULL);
   g_signal_connect (dialog, "response", G_CALLBACK (gtk_main_quit), NULL);
 
   gtk_window_set_resizable (GTK_WINDOW (dialog), FALSE);
 
-  box = GTK_BOX (GTK_DIALOG (dialog)->vbox);
+  box = GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog)));
   gtk_box_set_spacing (box, 6);
   gtk_container_set_border_width (GTK_CONTAINER (dialog), 6);
 
configure.ac +1 -1
index b6d6034..882e319 100644
@@ -7,7 +7,7 @@ AC_ISC_POSIX
 AC_PROG_CC
 AC_STDC_HEADERS
 
-PKG_CHECK_MODULES(GTK, gtk+-2.0)
+PKG_CHECK_MODULES(GTK, gtk+-3.0)
 PKG_CHECK_MODULES(GCONF, gconf-2.0)
 
 CFLAGS="$CFLAGS -Wall"
Signature · 1 line
2.8.1
#2 lore raw

Re: [matchbox-config-gtk][PATCH 1/1] Port to Gtk+3

Hi,

mb-appearance.c: In function 'new_frame':
mb-appearance.c:352:3: warning: 'gtk_alignment_get_type' is deprecated [-Wdeprecated-declarations]
*align = g_object_new (GTK_TYPE_ALIGNMENT,
^
In file included from /usr/include/gtk-3.0/gtk/gtk.h:248:0,
from mb-appearance.c:28:
/usr/include/gtk-3.0/gtk/deprecated/gtkalignment.h:77:12: note: declared here

 GType      gtk_alignment_get_type   (void) G_GNUC_CONST;
            ^

mb-appearance.c: In function 'main':
mb-appearance.c:385:41: warning: 'GtkStock' is deprecated [-Wdeprecated-declarations]
GTK_STOCK_CLOSE,
GTK_RESPONSE_CLOSE,

                                         ^

Should be simple to fix?

Ross

Quoted 51 lines · Jussi Kukkonen
---
 appearance/mb-appearance.c | 4 ++--
 configure.ac               | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)
appearance/mb-appearance.c +2 -2
index 34640b4..6dfe98e 100644
@@ -381,14 +381,14 @@ main (int argc, char **argv) {
   gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (theme_store),
 COL_NAME, GTK_SORT_ASCENDING);
 
   dialog = gtk_dialog_new_with_buttons (_("Appearance"), NULL,
-                                        GTK_DIALOG_NO_SEPARATOR,
+                                        0,
                                         GTK_STOCK_CLOSE,
 GTK_RESPONSE_CLOSE,
                                         NULL);
   g_signal_connect (dialog, "response", G_CALLBACK (gtk_main_quit), NULL);
 
   gtk_window_set_resizable (GTK_WINDOW (dialog), FALSE);
 
-  box = GTK_BOX (GTK_DIALOG (dialog)->vbox);
+  box = GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog)));
   gtk_box_set_spacing (box, 6);
   gtk_container_set_border_width (GTK_CONTAINER (dialog), 6);
configure.ac +1 -2
index b6d6034..882e319 100644
@@ -7,7 +7,7 @@ AC_ISC_POSIX
 AC_PROG_CC
 AC_STDC_HEADERS
 
-PKG_CHECK_MODULES(GTK, gtk+-2.0)
+PKG_CHECK_MODULES(GTK, gtk+-3.0)
 PKG_CHECK_MODULES(GCONF, gconf-2.0)
 
 CFLAGS="$CFLAGS -Wall"
--

2.8.1

--
_______________________________________________
yocto mailing list
[email protected]
https://lists.yoctoproject.org/listinfo/yocto

#3 lore raw

Re: [matchbox-config-gtk][PATCH 1/1] Port to Gtk+3

Quoted 13 lines · Ross

Hi,

mb-appearance.c: In function 'new_frame':
mb-appearance.c:352:3: warning: 'gtk_alignment_get_type' is deprecated [-Wdeprecated-declarations]
*align = g_object_new (GTK_TYPE_ALIGNMENT,
^
In file included from /usr/include/gtk-3.0/gtk/gtk.h:248:0,
from mb-appearance.c:28:
/usr/include/gtk-3.0/gtk/deprecated/gtkalignment.h:77:12: note: declared here

 GType      gtk_alignment_get_type   (void) G_GNUC_CONST;
            ^
Quoted 8 lines

mb-appearance.c: In function 'main':
mb-appearance.c:385:41: warning: 'GtkStock' is deprecated [-Wdeprecated-declarations]
GTK_STOCK_CLOSE,
GTK_RESPONSE_CLOSE,

                                         ^

Should be simple to fix?

I was sure I handled these already ... but no, sorry about that. I pushed a commit into the same branch to fix the above issues:

git://github.com/jku/matchbox-config-gtk gtk3
https://github.com/jku/matchbox-config-gtk/tree/gtk3

Jussi