gtranslator r3951 - in trunk: plugins/source-code-view plugins/subversion src src/dialogs src/toolbareditor

[psanxiao svn gnome org]

Author: psanxiao
Date: Sat Mar 28 13:31:37 2009
New Revision: 3951
URL: http://svn.gnome.org/viewvc/gtranslator?rev=3951&view=rev

Log:
    	* plugins/source-code-view/viewer.c:
    	* plugins/subversion/checkout-dialog.c:
    	* plugins/subversion/commit-dialog.c:
    	* plugins/subversion/diff-dialog.c:
    	* plugins/subversion/subversion-plugin.c:
    	* plugins/subversion/svn-command.c:
    	* plugins/subversion/update-dialog.c:
    	* src/dialogs/comment-dialog.c:
    	* src/dialogs/header-dialog.c:
    	* src/dialogs/jump-dialog.c:
    	* src/dialogs/preferences-dialog.c:
    	* src/dialogs/profile-dialog.c:
    	* src/notebook.c:
    	* src/toolbareditor/egg-editable-toolbar.c:
    	* src/window.c:
    	Removed deprecated GTK+ symbols

Modified:
   trunk/plugins/source-code-view/viewer.c
   trunk/plugins/subversion/checkout-dialog.c
   trunk/plugins/subversion/commit-dialog.c
   trunk/plugins/subversion/diff-dialog.c
   trunk/plugins/subversion/subversion-plugin.c
   trunk/plugins/subversion/svn-command.c
   trunk/plugins/subversion/update-dialog.c
   trunk/src/dialogs/comment-dialog.c
   trunk/src/dialogs/header-dialog.c
   trunk/src/dialogs/jump-dialog.c
   trunk/src/dialogs/preferences-dialog.c
   trunk/src/dialogs/profile-dialog.c
   trunk/src/notebook.c
   trunk/src/toolbareditor/egg-editable-toolbar.c
   trunk/src/window.c

Modified: trunk/plugins/source-code-view/viewer.c
==============================================================================
--- trunk/plugins/source-code-view/viewer.c	(original)
+++ trunk/plugins/source-code-view/viewer.c	Sat Mar 28 13:31:37 2009
@@ -102,8 +102,11 @@
 	if(!ret)
 	{
 		gtk_widget_show(error_widget);
-		gtk_box_pack_start_defaults (GTK_BOX (GTK_DIALOG (dlg)->vbox),
-					     error_widget);
+		gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dlg)->vbox),
+				    error_widget,
+				    TRUE,
+				    TRUE,
+				    0);
 		
 		return;
 	}

Modified: trunk/plugins/subversion/checkout-dialog.c
==============================================================================
--- trunk/plugins/subversion/checkout-dialog.c	(original)
+++ trunk/plugins/subversion/checkout-dialog.c	Sat Mar 28 13:31:37 2009
@@ -290,8 +290,11 @@
 	if(!ret)
 	{
 		gtk_widget_show (error_widget);
-		gtk_box_pack_start_defaults (GTK_BOX (GTK_DIALOG (dlg)->vbox),
-					     error_widget);
+		gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dlg)->vbox),
+				    error_widget,
+				    TRUE,
+				    TRUE,
+				    0);
 		
 		return;
 	}

Modified: trunk/plugins/subversion/commit-dialog.c
==============================================================================
--- trunk/plugins/subversion/commit-dialog.c	(original)
+++ trunk/plugins/subversion/commit-dialog.c	Sat Mar 28 13:31:37 2009
@@ -602,8 +602,11 @@
 	if(!ret)
 	{
 		gtk_widget_show (error_widget);
-		gtk_box_pack_start_defaults (GTK_BOX (GTK_DIALOG (dlg)->vbox),
-					     error_widget);
+		gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dlg)->vbox),
+				    error_widget,
+				    TRUE,
+				    TRUE,
+				    0);
 		
 		return;
 	}

Modified: trunk/plugins/subversion/diff-dialog.c
==============================================================================
--- trunk/plugins/subversion/diff-dialog.c	(original)
+++ trunk/plugins/subversion/diff-dialog.c	Sat Mar 28 13:31:37 2009
@@ -509,8 +509,11 @@
 	if(!ret)
 	{
 		gtk_widget_show (error_widget);
-		gtk_box_pack_start_defaults (GTK_BOX (GTK_DIALOG (dlg)->vbox),
-					     error_widget);
+		gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dlg)->vbox),
+				    error_widget,
+				    TRUE,
+				    TRUE,
+				    0);
 		
 		return;
 	}

Modified: trunk/plugins/subversion/subversion-plugin.c
==============================================================================
--- trunk/plugins/subversion/subversion-plugin.c	(original)
+++ trunk/plugins/subversion/subversion-plugin.c	Sat Mar 28 13:31:37 2009
@@ -373,8 +373,11 @@
 	if(!ret)
 	{
 		gtk_widget_show (error_widget);
-		gtk_box_pack_start_defaults (GTK_BOX (GTK_DIALOG (plugin->priv->dialog)->vbox),
-					     error_widget);
+		gtk_box_pack_start (GTK_BOX (GTK_DIALOG (plugin->priv->dialog)->vbox),
+				    error_widget,
+				    TRUE,
+				    TRUE,
+				    0);
 		
 		return plugin->priv->dialog;
 	}

Modified: trunk/plugins/subversion/svn-command.c
==============================================================================
--- trunk/plugins/subversion/svn-command.c	(original)
+++ trunk/plugins/subversion/svn-command.c	Sat Mar 28 13:31:37 2009
@@ -124,8 +124,11 @@
 	{
 		GtkWidget *dlg = gtk_dialog_new ();
 		gtk_widget_show (error_widget);
-		gtk_box_pack_start_defaults (GTK_BOX (GTK_DIALOG (dlg)->vbox),
-					     error_widget);
+		gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dlg)->vbox),
+							error_widget,
+							TRUE,
+							TRUE,
+							0);
 		gtk_dialog_run (GTK_DIALOG (dlg));
 		gtk_widget_destroy (dlg);
 		
@@ -211,8 +214,11 @@
 	{
 		GtkWidget *dlg = gtk_dialog_new ();
 		gtk_widget_show (error_widget);
-		gtk_box_pack_start_defaults (GTK_BOX (GTK_DIALOG (dlg)->vbox),
-					     error_widget);
+		gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dlg)->vbox),
+							error_widget,
+							TRUE,
+							TRUE,
+							0);
 		gtk_dialog_run (GTK_DIALOG (dlg));
 		gtk_widget_destroy (dlg);
 		

Modified: trunk/plugins/subversion/update-dialog.c
==============================================================================
--- trunk/plugins/subversion/update-dialog.c	(original)
+++ trunk/plugins/subversion/update-dialog.c	Sat Mar 28 13:31:37 2009
@@ -258,8 +258,11 @@
 	if(!ret)
 	{
 		gtk_widget_show (error_widget);
-		gtk_box_pack_start_defaults (GTK_BOX (GTK_DIALOG (dlg)->vbox),
-					     error_widget);
+		gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dlg)->vbox),
+				    error_widget,
+				    TRUE,
+				    TRUE,
+				    0);
 		
 		return;
 	}

Modified: trunk/src/dialogs/comment-dialog.c
==============================================================================
--- trunk/src/dialogs/comment-dialog.c	(original)
+++ trunk/src/dialogs/comment-dialog.c	Sat Mar 28 13:31:37 2009
@@ -121,8 +121,11 @@
 	if(!ret)
 	{
 		gtk_widget_show(error_widget);
-		gtk_box_pack_start_defaults (GTK_BOX (GTK_DIALOG (dlg)->vbox),
-					     error_widget);
+		gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dlg)->vbox),
+				    error_widget,
+				    TRUE,
+				    TRUE,
+				    0);
 		
 		return;
 	}

Modified: trunk/src/dialogs/header-dialog.c
==============================================================================
--- trunk/src/dialogs/header-dialog.c	(original)
+++ trunk/src/dialogs/header-dialog.c	Sat Mar 28 13:31:37 2009
@@ -290,8 +290,11 @@
 	if(!ret)
 	{
 		gtk_widget_show(error_widget);
-		gtk_box_pack_start_defaults (GTK_BOX (GTK_DIALOG (dlg)->vbox),
-					     error_widget);
+		gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dlg)->vbox),
+				    error_widget,
+				    TRUE,
+				    TRUE,
+				    0);
 		
 		return;
 	}

Modified: trunk/src/dialogs/jump-dialog.c
==============================================================================
--- trunk/src/dialogs/jump-dialog.c	(original)
+++ trunk/src/dialogs/jump-dialog.c	Sat Mar 28 13:31:37 2009
@@ -116,8 +116,11 @@
 	if(!ret)
 	{
 		gtk_widget_show(error_widget);
-		gtk_box_pack_start_defaults (GTK_BOX (GTK_DIALOG (dlg)->vbox),
-					     error_widget);
+		gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dlg)->vbox),
+				    error_widget,
+				    TRUE,
+				    TRUE,
+				    0);
 		
 		return;
 	}

Modified: trunk/src/dialogs/preferences-dialog.c
==============================================================================
--- trunk/src/dialogs/preferences-dialog.c	(original)
+++ trunk/src/dialogs/preferences-dialog.c	Sat Mar 28 13:31:37 2009
@@ -1157,8 +1157,11 @@
 	if(!ret)
 	{
 		gtk_widget_show(error_widget);
-		gtk_box_pack_start_defaults (GTK_BOX (GTK_DIALOG (dlg)->vbox),
-					     error_widget);
+		gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dlg)->vbox),
+				    error_widget,
+				    TRUE,
+				    TRUE,
+				    0);
 		
 		return;
 	}

Modified: trunk/src/dialogs/profile-dialog.c
==============================================================================
--- trunk/src/dialogs/profile-dialog.c	(original)
+++ trunk/src/dialogs/profile-dialog.c	Sat Mar 28 13:31:37 2009
@@ -364,8 +364,11 @@
 	if(!ret)
 	{
 		gtk_widget_show(error_widget);
-		gtk_box_pack_start_defaults (GTK_BOX (GTK_DIALOG (dlg)->vbox),
-					     error_widget);
+		gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dlg)->vbox),
+				    error_widget,
+				    TRUE,
+				    TRUE,
+				    0);
 		
 		return;
 	}

Modified: trunk/src/notebook.c
==============================================================================
--- trunk/src/notebook.c	(original)
+++ trunk/src/notebook.c	Sat Mar 28 13:31:37 2009
@@ -143,7 +143,7 @@
 	rcstyle = gtk_rc_style_new ();
 	rcstyle->xthickness = rcstyle->ythickness = 0;
 	gtk_widget_modify_style (close_button, rcstyle);
-	gtk_rc_style_unref (rcstyle),
+	g_object_unref (G_OBJECT(rcstyle)),
 
 	image = gtk_image_new_from_stock (GTK_STOCK_CLOSE,
 					  GTK_ICON_SIZE_MENU);

Modified: trunk/src/toolbareditor/egg-editable-toolbar.c
==============================================================================
--- trunk/src/toolbareditor/egg-editable-toolbar.c	(original)
+++ trunk/src/toolbareditor/egg-editable-toolbar.c	Sat Mar 28 13:31:37 2009
@@ -200,7 +200,7 @@
   
   gtk_widget_hide (widget);
 
-  action = gtk_widget_get_action (widget);
+  action = gtk_activatable_get_related_action (GTK_ACTIVATABLE (widget));
   if (action == NULL) return;
   
   flags = egg_toolbars_model_get_name_flags (etoolbar->priv->model,
@@ -226,7 +226,7 @@
     {
       gtk_widget_show (widget);
 
-      action = gtk_widget_get_action(widget);
+      action = gtk_activatable_get_related_action(GTK_ACTIVATABLE (widget));
       if (action == NULL) return;
       
       flags = egg_toolbars_model_get_name_flags (etoolbar->priv->model,
@@ -497,7 +497,7 @@
 static void
 configure_item_tooltip (GtkToolItem *item)
 {
-  GtkAction *action = gtk_widget_get_action (GTK_WIDGET (item));
+  GtkAction *action = gtk_activatable_get_related_action (GTK_ACTIVATABLE (item));
   
   if (action != NULL)
     {

Modified: trunk/src/window.c
==============================================================================
--- trunk/src/window.c	(original)
+++ trunk/src/window.c	Sat Mar 28 13:31:37 2009
@@ -498,7 +498,7 @@
 	menuitem = GTK_CHECK_MENU_ITEM (gtk_check_menu_item_new_with_label (title));
 	gtk_widget_show (GTK_WIDGET (menuitem));
 	gtk_check_menu_item_set_active (menuitem, TRUE);
-	gtk_menu_append (GTK_MENU (window->priv->view_menu), GTK_WIDGET (menuitem));
+	gtk_menu_shell_append (GTK_MENU_SHELL (window->priv->view_menu), GTK_WIDGET (menuitem));
 
 	if (locked)
 		g_object_set( G_OBJECT(menuitem), "visible", FALSE, NULL);
@@ -1266,7 +1266,7 @@
 	GtkAction *action;
 	char *message;
 
-	action = gtk_widget_get_action (GTK_WIDGET (proxy));
+	action = gtk_activatable_get_related_action (GTK_ACTIVATABLE (proxy));
 	g_return_if_fail (action != NULL);
 
 	g_object_get (G_OBJECT (action), "tooltip", &message, NULL);