← Back to branch summary

~ubuntu-branches/ubuntu/trusty/gnome-nettool/trusty

« back to all changes in this revision

Viewing changes to src/info.c

  • Committer: Bazaar Package Importer
  • Author(s): Michael Biebl
  • Date: 2011-07-22 04:09:48 UTC
  • mfrom: (12.1.1 experimental)
  • Revision ID: james.westby@ubuntu.com-20110722040948-142z0l2kzkwq199l
Tags: 3.0.0-2
* debian/watch:
  - Switch to .bz2 tarballs.
  - Don't run uupdate.
* Bump debhelper compatibility level to 8. Update Build-Depends accordingly.
* debian/control.in:
  - Remove old Conflicts/Replaces against gnome-network which is no longer
    necessary.
  - Add Vcs-* fields.
* Upload to unstable, remove check-dist.mk include.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/info.c
200
200
        gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (info->combo), renderer, TRUE);
201
201
        gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (info->combo), renderer,
202
202
                                        "pixbuf", 0, NULL);
203
 
        g_object_unref (renderer);
 
203
        /* g_object_unref (renderer); */
204
204
 
205
205
        renderer = gtk_cell_renderer_text_new ();
206
206
        gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (info->combo), renderer, TRUE);
207
207
        gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (info->combo), renderer,
208
208
                                        "markup", 1, NULL);
209
 
        g_object_unref (renderer);
 
209
        /* g_object_unref (renderer); */
210
210
 
211
211
        gtk_combo_box_set_active (GTK_COMBO_BOX (info->combo), 0);
212
212
}
333
333
static void
334
334
info_setup_configure_button (Netinfo *info, gboolean enable)
335
335
{
336
 
        if (!info->network_tool_path)
 
336
        gchar *network_tool_path;
 
337
 
 
338
        network_tool_path = util_find_program_in_path ("nm-connection-editor", NULL);
 
339
        if (!network_tool_path)
 
340
                network_tool_path = util_find_program_in_path ("network-admin", NULL);
 
341
 
 
342
        if (!network_tool_path)
337
343
                gtk_widget_hide (info->configure_button);
338
344
        else {
339
345
                gtk_widget_show (info->configure_button);
340
346
                gtk_widget_set_sensitive (info->configure_button, enable);
 
347
 
 
348
                g_free (network_tool_path);
341
349
        }
342
350
}
343
351