gtranslator r3721 - in trunk/src: . toolbareditor

[icq svn gnome org]

Author: icq
Date: Mon Sep 22 09:44:51 2008
New Revision: 3721
URL: http://svn.gnome.org/viewvc/gtranslator?rev=3721&view=rev

Log:
2008-08-23  Ignacio Casal Quinteiro  <nacho resa gmail com>

	* toolbareditor/egg-editable-toolbar.c
	(toolbar_visibility_refresh), (new_separator_pixbuf):
	* toolbareditor/egg-editable-toolbar.h:
	* toolbareditor/egg-toolbar-editor.c
	(egg_toolbar_editor_set_model):
	* toolbareditor/egg-toolbar-editor.h:
	* toolbareditor/egg-toolbars-model.c:
	* toolbareditor/egg-toolbars-model.h:
	* toolbareditor/eggtreemultidnd.c:
	* toolbareditor/eggtreemultidnd.h:
	Synchornized from server.

Modified:
   trunk/src/ChangeLog
   trunk/src/toolbareditor/egg-editable-toolbar.c
   trunk/src/toolbareditor/egg-editable-toolbar.h
   trunk/src/toolbareditor/egg-toolbar-editor.c
   trunk/src/toolbareditor/egg-toolbar-editor.h
   trunk/src/toolbareditor/egg-toolbars-model.c
   trunk/src/toolbareditor/egg-toolbars-model.h
   trunk/src/toolbareditor/eggtreemultidnd.c
   trunk/src/toolbareditor/eggtreemultidnd.h

Modified: trunk/src/toolbareditor/egg-editable-toolbar.c
==============================================================================
--- trunk/src/toolbareditor/egg-editable-toolbar.c	(original)
+++ trunk/src/toolbareditor/egg-editable-toolbar.c	Mon Sep 22 09:44:51 2008
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  *
- *  $Id: egg-editable-toolbar.c 826 2007-08-16 08:05:50Z carlosgc $
+ *  $Id: egg-editable-toolbar.c 891 2008-08-08 21:14:52Z friemann $
  */
 
 #include "config.h"
@@ -25,26 +25,7 @@
 #include "egg-toolbars-model.h"
 #include "egg-toolbar-editor.h"
 
-#include <gtk/gtkvseparator.h>
-#include <gtk/gtkiconfactory.h>
-#include <gtk/gtkwindow.h>
-#include <gtk/gtkmain.h>
-#include <gtk/gtkdnd.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtkimage.h>
-#include <gtk/gtktoggleaction.h>
-#include <gtk/gtkcheckmenuitem.h>
-#include <gtk/gtkimagemenuitem.h>
-#include <gtk/gtkseparatormenuitem.h>
-#include <gtk/gtkmenu.h>
-#include <gtk/gtkstock.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkbutton.h>
-#include <gtk/gtktoolbar.h>
-#include <gtk/gtktoolitem.h>
-#include <gtk/gtktoolbutton.h>
-#include <gtk/gtkseparatortoolitem.h>
-#include <gtk/gtkicontheme.h>
+#include <gtk/gtk.h>
 #include <glib/gi18n.h>
 #include <string.h>
 
@@ -935,7 +916,7 @@
        * produce duplicates, but don't worry about it. If your language
        * normally has a mnemonic at the start, please use the _. If not,
        * please remove. */
-      action_label = g_strdup_printf (_("Show \"_%s\""), tmp);
+      action_label = g_strdup_printf (_("Show â_%sâ"), tmp);
       g_free (tmp);
       
       sprintf(action_name, "ToolbarToggle%d", i);
@@ -1827,7 +1808,7 @@
 }
 
 static GdkPixbuf *
-new_separator_pixbuf ()
+new_separator_pixbuf (void)
 {
   GtkWidget *separator;
   GdkPixbuf *pixbuf;

Modified: trunk/src/toolbareditor/egg-editable-toolbar.h
==============================================================================
--- trunk/src/toolbareditor/egg-editable-toolbar.h	(original)
+++ trunk/src/toolbareditor/egg-editable-toolbar.h	Mon Sep 22 09:44:51 2008
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  *
- *  $Id: egg-editable-toolbar.h 813 2007-07-01 12:58:48Z jhaitsma $
+ *  $Id: egg-editable-toolbar.h 891 2008-08-08 21:14:52Z friemann $
  */
 
 #ifndef EGG_EDITABLE_TOOLBAR_H
@@ -24,12 +24,7 @@
 
 #include "egg-toolbars-model.h"
 
-#include <gtk/gtkuimanager.h>
-#include <gtk/gtkselection.h>
-#include <gtk/gtkvbox.h>
-#include <gtk/gtktoolitem.h>
-#include <gtk/gtktoolbar.h>
-#include <gtk/gtkmenu.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 

Modified: trunk/src/toolbareditor/egg-toolbar-editor.c
==============================================================================
--- trunk/src/toolbareditor/egg-toolbar-editor.c	(original)
+++ trunk/src/toolbareditor/egg-toolbar-editor.c	Mon Sep 22 09:44:51 2008
@@ -15,7 +15,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  *
- *  $Id: egg-toolbar-editor.c 832 2007-11-03 22:14:56Z friemann $
+ *  $Id: egg-toolbar-editor.c 891 2008-08-08 21:14:52Z friemann $
  */
 
 #include "config.h"
@@ -25,14 +25,6 @@
 
 #include <string.h>
 #include <libxml/tree.h>
-#include <gtk/gtkimage.h>
-#include <gtk/gtkeventbox.h>
-#include <gtk/gtkdnd.h>
-#include <gtk/gtkscrolledwindow.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtktable.h>
-#include <gtk/gtkstock.h>
-#include <gtk/gtkhbox.h>
 #include <gtk/gtk.h>
 #include <glib/gi18n.h>
 
@@ -174,10 +166,12 @@
 egg_toolbar_editor_set_model (EggToolbarEditor *t,
 			      EggToolbarsModel *model)
 {
+  EggToolbarEditorPrivate *priv;
+
   g_return_if_fail (EGG_IS_TOOLBAR_EDITOR (t));
   g_return_if_fail (model != NULL);
 
-  EggToolbarEditorPrivate *priv = t->priv;
+  priv = t->priv;
 
   if (priv->model)
     {

Modified: trunk/src/toolbareditor/egg-toolbar-editor.h
==============================================================================
--- trunk/src/toolbareditor/egg-toolbar-editor.h	(original)
+++ trunk/src/toolbareditor/egg-toolbar-editor.h	Mon Sep 22 09:44:51 2008
@@ -19,8 +19,7 @@
 #ifndef EGG_TOOLBAR_EDITOR_H
 #define EGG_TOOLBAR_EDITOR_H
 
-#include <gtk/gtkvbox.h>
-#include <gtk/gtkuimanager.h>
+#include <gtk/gtk.h>
 
 #include "egg-toolbars-model.h"
 

Modified: trunk/src/toolbareditor/egg-toolbars-model.c
==============================================================================
--- trunk/src/toolbareditor/egg-toolbars-model.c	(original)
+++ trunk/src/toolbareditor/egg-toolbars-model.c	Mon Sep 22 09:44:51 2008
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  *
- *  $Id: egg-toolbars-model.c 815 2007-07-02 15:02:15Z friemann $
+ *  $Id: egg-toolbars-model.c 891 2008-08-08 21:14:52Z friemann $
  */
 
 #include "config.h"
@@ -28,7 +28,7 @@
 #include <unistd.h>
 #include <string.h>
 #include <libxml/tree.h>
-#include <gdk/gdkproperty.h>
+#include <gdk/gdk.h>
 
 static void egg_toolbars_model_finalize   (GObject               *object);
 

Modified: trunk/src/toolbareditor/egg-toolbars-model.h
==============================================================================
--- trunk/src/toolbareditor/egg-toolbars-model.h	(original)
+++ trunk/src/toolbareditor/egg-toolbars-model.h	Mon Sep 22 09:44:51 2008
@@ -15,7 +15,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  * 
- *  $Id: egg-toolbars-model.h 813 2007-07-01 12:58:48Z jhaitsma $
+ *  $Id: egg-toolbars-model.h 891 2008-08-08 21:14:52Z friemann $
  */
 
 #ifndef EGG_TOOLBARS_MODEL_H
@@ -23,7 +23,7 @@
 
 #include <glib.h>
 #include <glib-object.h>
-#include <gdk/gdktypes.h>
+#include <gdk/gdk.h>
 
 G_BEGIN_DECLS
 

Modified: trunk/src/toolbareditor/eggtreemultidnd.c
==============================================================================
--- trunk/src/toolbareditor/eggtreemultidnd.c	(original)
+++ trunk/src/toolbareditor/eggtreemultidnd.c	Mon Sep 22 09:44:51 2008
@@ -18,10 +18,7 @@
  */
 
 #include <string.h>
-#include <gtk/gtktreeselection.h>
-#include <gtk/gtksignal.h>
-#include <gtk/gtkwidget.h>
-#include <gtk/gtkmain.h>
+#include <gtk/gtk.h>
 #include "eggtreemultidnd.h"
 
 #define EGG_TREE_MULTI_DND_STRING "EggTreeMultiDndString"

Modified: trunk/src/toolbareditor/eggtreemultidnd.h
==============================================================================
--- trunk/src/toolbareditor/eggtreemultidnd.h	(original)
+++ trunk/src/toolbareditor/eggtreemultidnd.h	Mon Sep 22 09:44:51 2008
@@ -20,9 +20,7 @@
 #ifndef __EGG_TREE_MULTI_DND_H__
 #define __EGG_TREE_MULTI_DND_H__
 
-#include <gtk/gtktreemodel.h>
-#include <gtk/gtktreeview.h>
-#include <gtk/gtkdnd.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS