Merge branch 'master' of github.com:v1cont/yad

README.md

-# Yet Another Dialog
+Yet Another Dialog
 ====================
 
 Program allows you to display GTK+ dialog boxes from command line or 
@@ -13,12 +13,12 @@ Mailing list: http://groups.google.com/group/yad-common
 Some miscellaneous stuff can be found in data directory including notify-send script
 and simple zenity-compatible wrapper 
 
-# Building git version
-======================
+Building git version
+----------------------
 
 Get git version with command
 
-svn checkout svn://svn.code.sf.net/p/yad-dialog/code/trunk yad-dialog-code
+git clone https://github.com/v1cont/yad.git yad-dialog-code
 
 Before run the standard ./configure && make && make install procedure
 you need to generate build scripts. This can be done by running command

configure.ac

@@ -114,7 +114,7 @@ AC_ARG_ENABLE([sourceview],
 	[AS_HELP_STRING([--enable-sourceview],
 			[Build YAD with GtkSourceView support (default - no)])],
 	[with_sourceview=$enableval], [with_sourceview=no])
-if test x$with_spell = xyes; then
+if test x$with_sourceview = xyes; then
     PKG_CHECK_MODULES([SOURCEVIEW], [$SOURCEVIEW], [have_sourceview=yes], [have_sourceview=no])
 else
     have_sourceview=no

src/browser.c

@@ -144,7 +144,11 @@ select_icon (GtkTreeSelection * sel, IconBrowserData * data)
   g_string_free (sizes, TRUE);
 
   if (info)
+#if !GTK_CHECK_VERSION(3,0,0)
+    gtk_icon_info_free(info);
+#else
     g_object_unref (info);
+#endif
 }
 
 static void

src/list.c

@@ -888,7 +888,7 @@ popup_menu_cb (GtkWidget * w, GdkEventButton * ev, gpointer data)
 
           gtk_widget_show (menu);
         }
-#if GTK_CHECK_VERSION(3,0,0)
+#if GTK_CHECK_VERSION(3,22,0)
       gtk_menu_popup_at_pointer (GTK_MENU (menu), NULL);
 #else
       gtk_menu_popup (GTK_MENU (menu), NULL, NULL, NULL, NULL, ev->button, ev->time);
@@ -1162,7 +1162,7 @@ print_col (GtkTreeModel * model, GtkTreeIter * iter, gint num)
             g_free (buf);
           }
         else
-          g_printf ("%s", val);
+          g_printf ("%s", val ? val : "");
         break;
       }
     }

src/notebook.c

@@ -70,11 +70,6 @@ notebook_create_widget (GtkWidget * dlg)
       gtk_container_child_set( GTK_CONTAINER (w), a, "tab-expand", options.notebook_data.expand, NULL);
     }
 
-  /* set active tab */
-  if (options.notebook_data.active <= 0)
-    options.notebook_data.active = 1;
-  gtk_notebook_set_current_page (GTK_NOTEBOOK (w), options.notebook_data.active - 1);
-
   return w;
 }
 
@@ -98,6 +93,10 @@ notebook_swallow_childs (void)
       if (tabs[i].pid != -1)
         gtk_socket_add_id (GTK_SOCKET (s), tabs[i].xid);
     }
+
+  /* set active tab */
+  if (options.notebook_data.active > 0)
+    gtk_notebook_set_current_page (GTK_NOTEBOOK (notebook), options.notebook_data.active - 1);
 }
 
 void

src/picture.c

@@ -224,7 +224,7 @@ button_handler (GtkWidget *w, GdkEventButton *ev, gpointer data)
 {
   if (ev->button == 3)
     {
-#if GTK_CHECK_VERSION(3,0,0)
+#if GTK_CHECK_VERSION(3,22,0)
       gtk_menu_popup_at_pointer (GTK_MENU (popup_menu), NULL);
 #else
       gtk_menu_popup (GTK_MENU (popup_menu), NULL, NULL, NULL, NULL, ev->button, ev->time);