treewide: Replace <name>_cnt by n_<name>s and <name>_cap by allocated_<name>.

[pspp] / src / ui / gui / psppire-dialog-action-comments.c

diff --git a/src/ui/gui/psppire-dialog-action-comments.c b/src/ui/gui/psppire-dialog-action-comments.c
index ca7ad41bfa73182eff89112b714b9f105c86b47f..eeb512d9494eaa3c07cc1a198eeec6de38fa5071 100644 (file)
--- a/src/ui/gui/psppire-dialog-action-comments.c
+++ b/src/ui/gui/psppire-dialog-action-comments.c
@@ -52,7 +52,7 @@ generate_syntax (const PsppireDialogAction *pda)
 
   g_string_append (str, "ADD DOCUMENT\n");
 
-  for (i = 0 ; i < gtk_text_buffer_get_line_count (buffer) ; ++i )
+  for (i = 0 ; i < gtk_text_buffer_get_line_count (buffer) ; ++i)
     {
       struct string tmp;
       GtkTextIter start;
@@ -79,7 +79,7 @@ generate_syntax (const PsppireDialogAction *pda)
   g_string_append (str, " .\n");
 
 
-  if ( gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (cd->check)))
+  if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (cd->check)))
     g_string_append (str, "DISPLAY DOCUMENTS.\n");
 
   text = str->str;
@@ -114,7 +114,7 @@ retrieve_comments (PsppireDialogAction *pda)
 
   gtk_text_buffer_set_text (buffer, "", 0);
 
-  for ( i = 0 ; i < dict_get_document_line_cnt (pda->dict->dict); ++i )
+  for (i = 0 ; i < dict_get_document_n_lines (pda->dict->dict); ++i)
     add_line_to_buffer (buffer, dict_get_document_line (pda->dict->dict, i));
 }
 
@@ -139,7 +139,7 @@ set_column_number (GtkTextBuffer *textbuffer,
   GtkLabel *label = data;
   gchar *text ;
 
-  text = g_strdup_printf ( _("Column Number: %d"),
+  text = g_strdup_printf (_("Column Number: %d"),
                           1 + gtk_text_iter_get_line_offset (iter));
 
   gtk_label_set_text (label, text);
@@ -156,7 +156,7 @@ wrap_line (GtkTextBuffer *buffer,
 {
   gint chars = gtk_text_iter_get_chars_in_line (iter);
 
-  if ( chars > DOC_LINE_LENGTH )
+  if (chars > DOC_LINE_LENGTH)
     {
       GtkTextIter line_fold = *iter;
 
@@ -172,7 +172,7 @@ psppire_dialog_action_comments_activate (PsppireDialogAction *pda, GVariant *par
 {
   PsppireDialogActionComments *act = PSPPIRE_DIALOG_ACTION_COMMENTS (pda);
 
-  GtkBuilder *xml = builder_new ( "comments.ui");
+  GtkBuilder *xml = builder_new ("comments.ui");
 
   pda->dialog = get_widget_assert (xml, "comments-dialog");
   act->textview = get_widget_assert (xml, "comments-textview1");
@@ -183,24 +183,13 @@ psppire_dialog_action_comments_activate (PsppireDialogAction *pda, GVariant *par
   g_signal_connect_swapped (pda->dialog, "show", G_CALLBACK (retrieve_comments), pda);
 
   {
-    PangoContext * context ;
-    PangoLayout *  layout ;
-    PangoRectangle rect;
-
-
     /* Since we're going to truncate lines to 80 chars,
        we need a monospaced font otherwise it'll look silly */
-    PangoFontDescription *font_desc =
-      pango_font_description_from_string ("monospace");
     {
       GtkStyleContext *style = gtk_widget_get_style_context (GTK_WIDGET (act->textview));
       GtkCssProvider *cssp = gtk_css_provider_new ();
 
-      gchar *str = pango_font_description_to_string (font_desc);
-      gchar *css =
-       g_strdup_printf ("* {font: %s}", str);
-      g_free (str);
-
+      const gchar *css = "* {font-family: monospace}";
       GError *err = NULL;
       gtk_css_provider_load_from_data (cssp, css, -1, &err);
       if (err)
@@ -208,32 +197,12 @@ psppire_dialog_action_comments_activate (PsppireDialogAction *pda, GVariant *par
          g_warning ("Failed to load font css \"%s\": %s", css, err->message);
          g_error_free (err);
        }
-      g_free (css);
 
       gtk_style_context_add_provider (style,
                                      GTK_STYLE_PROVIDER (cssp),
                                      GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
       g_object_unref (cssp);
     }
-
-    /* And let's just make sure that a complete line fits into the
-       widget's width */
-    context = gtk_widget_create_pango_context (act->textview);
-    layout = pango_layout_new (context);
-
-    pango_layout_set_text (layout, "M", 1);
-
-    pango_layout_set_font_description (layout, font_desc);
-
-    pango_layout_get_extents (layout, NULL, &rect);
-
-    g_object_set (act->textview, "width-request",
-                 PANGO_PIXELS (rect.width) * DOC_LINE_LENGTH + 20, NULL);
-
-    g_object_unref (G_OBJECT (layout));
-    g_object_unref (G_OBJECT (context));
-
-    pango_font_description_free (font_desc);
   }
   GtkTextIter iter;
   g_signal_connect (buffer, "mark-set",